From e4da373e49c1f6fd31115f8e23465227ca4308b6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 13 Oct 2014 00:15:57 -0500 Subject: [PATCH] Bring up, down, top, and bottom icons into XDG compliance --- ...-action-bottom.png => cr16-action-go-bottom.png} | Bin ...cr16-action-down.png => cr16-action-go-down.png} | Bin .../{cr16-action-top.png => cr16-action-go-top.png} | Bin .../{cr16-action-up.png => cr16-action-go-up.png} | Bin ...-action-bottom.png => cr22-action-go-bottom.png} | Bin ...cr22-action-down.png => cr22-action-go-down.png} | Bin .../{cr22-action-top.png => cr22-action-go-top.png} | Bin .../{cr22-action-up.png => cr22-action-go-up.png} | Bin ...-action-bottom.png => cr32-action-go-bottom.png} | Bin ...cr32-action-down.png => cr32-action-go-down.png} | Bin .../{cr32-action-top.png => cr32-action-go-top.png} | Bin .../{cr32-action-up.png => cr32-action-go-up.png} | Bin ...cr48-action-down.png => cr48-action-go-down.png} | Bin .../{cr48-action-up.png => cr48-action-go-up.png} | Bin tdeprint/cups/kmcupsjobmanager.cpp | 4 ++-- tdeprint/kpfilterpage.cpp | 4 ++-- tdeprint/kprintdialog.cpp | 4 ++-- tdeprint/management/kmconfigfonts.cpp | 4 ++-- tdeprint/management/kxmlcommanddlg.cpp | 4 ++-- tdeprint/tdefilelist.cpp | 4 ++-- tderandr/randr.cpp | 4 ++-- tdeui/kedittoolbar.cpp | 4 ++-- tdeui/kstdaction_p.h | 2 +- tdeui/tdeactionselector.cpp | 4 ++-- 24 files changed, 19 insertions(+), 19 deletions(-) rename pics/crystalsvg/{cr16-action-bottom.png => cr16-action-go-bottom.png} (100%) rename pics/crystalsvg/{cr16-action-down.png => cr16-action-go-down.png} (100%) rename pics/crystalsvg/{cr16-action-top.png => cr16-action-go-top.png} (100%) rename pics/crystalsvg/{cr16-action-up.png => cr16-action-go-up.png} (100%) rename pics/crystalsvg/{cr22-action-bottom.png => cr22-action-go-bottom.png} (100%) rename pics/crystalsvg/{cr22-action-down.png => cr22-action-go-down.png} (100%) rename pics/crystalsvg/{cr22-action-top.png => cr22-action-go-top.png} (100%) rename pics/crystalsvg/{cr22-action-up.png => cr22-action-go-up.png} (100%) rename pics/crystalsvg/{cr32-action-bottom.png => cr32-action-go-bottom.png} (100%) rename pics/crystalsvg/{cr32-action-down.png => cr32-action-go-down.png} (100%) rename pics/crystalsvg/{cr32-action-top.png => cr32-action-go-top.png} (100%) rename pics/crystalsvg/{cr32-action-up.png => cr32-action-go-up.png} (100%) rename pics/crystalsvg/{cr48-action-down.png => cr48-action-go-down.png} (100%) rename pics/crystalsvg/{cr48-action-up.png => cr48-action-go-up.png} (100%) diff --git a/pics/crystalsvg/cr16-action-bottom.png b/pics/crystalsvg/cr16-action-go-bottom.png similarity index 100% rename from pics/crystalsvg/cr16-action-bottom.png rename to pics/crystalsvg/cr16-action-go-bottom.png diff --git a/pics/crystalsvg/cr16-action-down.png b/pics/crystalsvg/cr16-action-go-down.png similarity index 100% rename from pics/crystalsvg/cr16-action-down.png rename to pics/crystalsvg/cr16-action-go-down.png diff --git a/pics/crystalsvg/cr16-action-top.png b/pics/crystalsvg/cr16-action-go-top.png similarity index 100% rename from pics/crystalsvg/cr16-action-top.png rename to pics/crystalsvg/cr16-action-go-top.png diff --git a/pics/crystalsvg/cr16-action-up.png b/pics/crystalsvg/cr16-action-go-up.png similarity index 100% rename from pics/crystalsvg/cr16-action-up.png rename to pics/crystalsvg/cr16-action-go-up.png diff --git a/pics/crystalsvg/cr22-action-bottom.png b/pics/crystalsvg/cr22-action-go-bottom.png similarity index 100% rename from pics/crystalsvg/cr22-action-bottom.png rename to pics/crystalsvg/cr22-action-go-bottom.png diff --git a/pics/crystalsvg/cr22-action-down.png b/pics/crystalsvg/cr22-action-go-down.png similarity index 100% rename from pics/crystalsvg/cr22-action-down.png rename to pics/crystalsvg/cr22-action-go-down.png diff --git a/pics/crystalsvg/cr22-action-top.png b/pics/crystalsvg/cr22-action-go-top.png similarity index 100% rename from pics/crystalsvg/cr22-action-top.png rename to pics/crystalsvg/cr22-action-go-top.png diff --git a/pics/crystalsvg/cr22-action-up.png b/pics/crystalsvg/cr22-action-go-up.png similarity index 100% rename from pics/crystalsvg/cr22-action-up.png rename to pics/crystalsvg/cr22-action-go-up.png diff --git a/pics/crystalsvg/cr32-action-bottom.png b/pics/crystalsvg/cr32-action-go-bottom.png similarity index 100% rename from pics/crystalsvg/cr32-action-bottom.png rename to pics/crystalsvg/cr32-action-go-bottom.png diff --git a/pics/crystalsvg/cr32-action-down.png b/pics/crystalsvg/cr32-action-go-down.png similarity index 100% rename from pics/crystalsvg/cr32-action-down.png rename to pics/crystalsvg/cr32-action-go-down.png diff --git a/pics/crystalsvg/cr32-action-top.png b/pics/crystalsvg/cr32-action-go-top.png similarity index 100% rename from pics/crystalsvg/cr32-action-top.png rename to pics/crystalsvg/cr32-action-go-top.png diff --git a/pics/crystalsvg/cr32-action-up.png b/pics/crystalsvg/cr32-action-go-up.png similarity index 100% rename from pics/crystalsvg/cr32-action-up.png rename to pics/crystalsvg/cr32-action-go-up.png diff --git a/pics/crystalsvg/cr48-action-down.png b/pics/crystalsvg/cr48-action-go-down.png similarity index 100% rename from pics/crystalsvg/cr48-action-down.png rename to pics/crystalsvg/cr48-action-go-down.png diff --git a/pics/crystalsvg/cr48-action-up.png b/pics/crystalsvg/cr48-action-go-up.png similarity index 100% rename from pics/crystalsvg/cr48-action-up.png rename to pics/crystalsvg/cr48-action-go-up.png diff --git a/tdeprint/cups/kmcupsjobmanager.cpp b/tdeprint/cups/kmcupsjobmanager.cpp index fa208e551..e2c8b02c4 100644 --- a/tdeprint/cups/kmcupsjobmanager.cpp +++ b/tdeprint/cups/kmcupsjobmanager.cpp @@ -359,9 +359,9 @@ TQValueList KMCupsJobManager::createPluginActions(TDEActionCollectio list << (act = new PluginAction(0, i18n("&Job IPP Report"), "tdeprint_report", 0, coll, "plugin_ipp")); act->setGroup("plugin"); - list << (act = new PluginAction(1, i18n("&Increase Priority"), "up", 0, coll, "plugin_prioup")); + list << (act = new PluginAction(1, i18n("&Increase Priority"), "go-up", 0, coll, "plugin_prioup")); act->setGroup("plugin"); - list << (act = new PluginAction(2, i18n("&Decrease Priority"), "down", 0, coll, "plugin_priodown")); + list << (act = new PluginAction(2, i18n("&Decrease Priority"), "go-down", 0, coll, "plugin_priodown")); act->setGroup("plugin"); list << (act = new PluginAction(3, i18n("&Edit Attributes..."), "edit", 0, coll, "plugin_editjob")); act->setGroup("plugin"); diff --git a/tdeprint/kpfilterpage.cpp b/tdeprint/kpfilterpage.cpp index 6f46085ee..768e4b475 100644 --- a/tdeprint/kpfilterpage.cpp +++ b/tdeprint/kpfilterpage.cpp @@ -147,12 +147,12 @@ KPFilterPage::KPFilterPage(TQWidget *parent, const char *name) m_up = new TQToolButton(this); TQWhatsThis::add(m_up, whatsThisMoveFilterUpButton); - m_up->setIconSet(BarIconSet("up")); + m_up->setIconSet(BarIconSet("go-up")); TQToolTip::add(m_up, i18n("Move filter up")); m_down = new TQToolButton(this); TQWhatsThis::add(m_down, whatsThisMoveFilterDownButton); - m_down->setIconSet(BarIconSet("down")); + m_down->setIconSet(BarIconSet("go-down")); TQToolTip::add(m_down, i18n("Move filter down")); m_configure = new TQToolButton(this); diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp index afe775c57..f63dfd11b 100644 --- a/tdeprint/kprintdialog.cpp +++ b/tdeprint/kprintdialog.cpp @@ -870,7 +870,7 @@ void KPrintDialog::expandDialog(bool on) if (d->b_systemEnabled) d->m_plugin->show(); } - d->m_extbtn->setIconSet(SmallIconSet("up")); + d->m_extbtn->setIconSet(SmallIconSet("go-up")); d->m_extbtn->setText(i18n("&Options <<")); d->m_reduced = false; } @@ -883,7 +883,7 @@ void KPrintDialog::expandDialog(bool on) if (d->b_systemEnabled) d->m_plugin->hide(); } - d->m_extbtn->setIconSet(SmallIconSet("down")); + d->m_extbtn->setIconSet(SmallIconSet("go-down")); d->m_extbtn->setText(i18n("&Options >>")); d->m_reduced = true; } diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp index 35466cb42..e93c30276 100644 --- a/tdeprint/management/kmconfigfonts.cpp +++ b/tdeprint/management/kmconfigfonts.cpp @@ -54,8 +54,8 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name) m_fontpath->setSorting(-1); m_addpath = new KURLRequester(box2); m_addpath->setMode(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly); - m_up = new KPushButton(KGuiItem(i18n("&Up"), "up"), box2); - m_down = new KPushButton(KGuiItem(i18n("&Down"), "down"), box2); + m_up = new KPushButton(KGuiItem(i18n("&Up"), "go-up"), box2); + m_down = new KPushButton(KGuiItem(i18n("&Down"), "go-down"), box2); m_add = new KPushButton(KGuiItem(i18n("&Add"), "add"), box2); m_remove = new KPushButton(KGuiItem(i18n("&Remove"), "editdelete"), box2); TQLabel *lab0 = new TQLabel(i18n("Additional director&y:"), box2); diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp index 9b165e432..f6865a659 100644 --- a/tdeprint/management/kxmlcommanddlg.cpp +++ b/tdeprint/management/kxmlcommanddlg.cpp @@ -97,9 +97,9 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam m_delopt = new TQToolButton(this); m_delopt->setIconSet(SmallIconSet("editdelete")); m_up = new TQToolButton(this); - m_up->setIconSet(SmallIconSet("up")); + m_up->setIconSet(SmallIconSet("go-up")); m_down = new TQToolButton(this); - m_down->setIconSet(SmallIconSet("down")); + m_down->setIconSet(SmallIconSet("go-down")); m_dummy = new TQWidget(this); m_desc = new TQLineEdit(m_dummy); m_name = new TQLineEdit(m_dummy); diff --git a/tdeprint/tdefilelist.cpp b/tdeprint/tdefilelist.cpp index bf2fb3d12..607fab296 100644 --- a/tdeprint/tdefilelist.cpp +++ b/tdeprint/tdefilelist.cpp @@ -130,14 +130,14 @@ KFileList::KFileList(TQWidget *parent, const char *name) m_open->setEnabled(false); m_up = new TQToolButton(this); - m_up->setIconSet(SmallIconSet("up")); + m_up->setIconSet(SmallIconSet("go-up")); connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUp())); TQToolTip::add(m_up, i18n("Move up")); TQWhatsThis::add(m_up, whatsThisMoveFileUpButton); m_up->setEnabled(false); m_down = new TQToolButton(this); - m_down->setIconSet(SmallIconSet("down")); + m_down->setIconSet(SmallIconSet("go-down")); connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDown())); TQToolTip::add(m_down, i18n("Move down")); TQWhatsThis::add(m_down, whatsThisMoveFileDownButton); diff --git a/tderandr/randr.cpp b/tderandr/randr.cpp index 81b328918..c72dcd651 100644 --- a/tderandr/randr.cpp +++ b/tderandr/randr.cpp @@ -403,11 +403,11 @@ KDE_EXPORT TQPixmap RandRScreen::rotationIcon(int rotation) const switch (rotation) { case RR_Rotate_0: - return SmallIcon("up"); + return SmallIcon("go-up"); case RR_Rotate_90: return SmallIcon("back"); case RR_Rotate_180: - return SmallIcon("down"); + return SmallIcon("go-down"); case RR_Rotate_270: return SmallIcon("forward"); case RR_Reflect_X: diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp index 992f12f1e..bfb575c79 100644 --- a/tdeui/kedittoolbar.cpp +++ b/tdeui/kedittoolbar.cpp @@ -827,7 +827,7 @@ void KEditToolbarWidget::setupLayout() TQIconSet iconSet; m_upAction = new TQToolButton(this); - iconSet = SmallIconSet( "up" ); + iconSet = SmallIconSet( "go-up" ); m_upAction->setIconSet( iconSet ); m_upAction->setEnabled(false); m_upAction->setAutoRepeat(true); @@ -846,7 +846,7 @@ void KEditToolbarWidget::setupLayout() connect(m_removeAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveButton())); m_downAction = new TQToolButton(this); - iconSet = SmallIconSet( "down" ); + iconSet = SmallIconSet( "go-down" ); m_downAction->setIconSet( iconSet ); m_downAction->setEnabled(false); m_downAction->setAutoRepeat(true); diff --git a/tdeui/kstdaction_p.h b/tdeui/kstdaction_p.h index eb205339e..6a119b2c8 100644 --- a/tdeui/kstdaction_p.h +++ b/tdeui/kstdaction_p.h @@ -74,7 +74,7 @@ static const KStdActionInfo g_rgActionInfo[] = // KDE4: give Redisplay the shortcut TDEStdAccel::AccelReload { Redisplay, TDEStdAccel::AccelNone, "view_redisplay", I18N_NOOP("&Redisplay"), 0, "reload" }, - { Up, TDEStdAccel::Up, "go_up", I18N_NOOP("&Up"), 0, "up" }, + { Up, TDEStdAccel::Up, "go_up", I18N_NOOP("&Up"), 0, "go-up" }, // The following three have special i18n() needs for sLabel { Back, TDEStdAccel::Back, "go_back", 0, 0, "back" }, { Forward, TDEStdAccel::Forward, "go_forward", 0, 0, "forward" }, diff --git a/tdeui/tdeactionselector.cpp b/tdeui/tdeactionselector.cpp index c3c7329b8..9583775c4 100644 --- a/tdeui/tdeactionselector.cpp +++ b/tdeui/tdeactionselector.cpp @@ -54,8 +54,8 @@ TDEActionSelector::TDEActionSelector( TQWidget *parent, const char *name ) d->iconSize = SmallIcon; d->addIcon = TQApplication::reverseLayout()? "back" : "forward"; d->removeIcon = TQApplication::reverseLayout()? "forward" : "back"; - d->upIcon = "up"; - d->downIcon = "down"; + d->upIcon = "go-up"; + d->downIcon = "go-down"; d->availableInsertionPolicy = Sorted; d->selectedInsertionPolicy = BelowCurrent; d->showUpDownButtons = true;