| 064f8056 | 2014-10-13 00:14:55 | Timothy Pearson |
Bring up, down, top, and bottom icons into XDG compliance |
||
|
M kate/app/kateexternaltools.cpp M kate/app/katemdi.cpp M kcontrol/tdeio/kmanualproxydlg.cpp M kicker/taskmanager/taskrmbmenu.cpp M konqueror/konq_mainwindow.cc M tdeioslave/info/info.cc M tdeprint/tdeprintfax/conffilters.cpp M tdeprint/tdeprintfax/tdeprintfax.cpp M twin/useractions.cpp |
||
diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp
index e0057fb..f23ef39 100644
--- a/kate/app/kateexternaltools.cpp
+++ b/kate/app/kateexternaltools.cpp
@@ -581,11 +581,11 @@
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 a6c657e..27035d4 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -475,10 +475,10 @@
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 288fff8..01d2b58 100644
--- a/kcontrol/tdeio/kmanualproxydlg.cpp
+++ b/kcontrol/tdeio/kmanualproxydlg.cpp
@@ -49,7 +49,7 @@
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 f92719f..08fe078 100644
--- a/kicker/taskmanager/taskrmbmenu.cpp
+++ b/kicker/taskmanager/taskrmbmenu.cpp
@@ -210,12 +210,12 @@
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 a55ec9b..9a89cc8 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -3825,7 +3825,7 @@
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 6ef78ad..83b41da 100644
--- a/tdeioslave/info/info.cc
+++ b/tdeioslave/info/info.cc
@@ -92,7 +92,7 @@
// 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 64ce6ee..372074a 100644
--- a/tdeprint/tdeprintfax/conffilters.cpp
+++ b/tdeprint/tdeprintfax/conffilters.cpp
@@ -54,9 +54,9 @@
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 f896677..794ca51 100644
--- a/tdeprint/tdeprintfax/tdeprintfax.cpp
+++ b/tdeprint/tdeprintfax/tdeprintfax.cpp
@@ -70,12 +70,12 @@
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 e786529..fbf1be5 100644
--- a/twin/useractions.cpp
+++ b/twin/useractions.cpp
@@ -58,9 +58,9 @@
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 );
|
||