Branch: master

fe942d39 2014-10-13 00:12:58 Timothy Pearson
Bring up, down, top, and bottom icons into XDG compliance
M krusader/BookMan/kraddbookmarkdlg.cpp
M krusader/DiskUsage/diskusagegui.cpp
M krusader/DiskUsage/dulines.cpp
M krusader/DiskUsage/dulistview.cpp
M krusader/Panel/krbriefviewitem.cpp
M krusader/Panel/krdetailedviewitem.cpp
M krusader/krusader.cpp
diff --git a/krusader/BookMan/kraddbookmarkdlg.cpp b/krusader/BookMan/kraddbookmarkdlg.cpp
index 7f685a3..89efbde 100644
--- a/krusader/BookMan/kraddbookmarkdlg.cpp
+++ b/krusader/BookMan/kraddbookmarkdlg.cpp
@@ -44,7 +44,7 @@
 	_folder->setReadOnly(true);
 
 	_createInBtn = new TQToolButton(page);
-	_createInBtn->setPixmap(krLoader->loadIcon("down", TDEIcon::Small));
+	_createInBtn->setPixmap(krLoader->loadIcon("go-down", TDEIcon::Small));
 	_createInBtn->setToggleButton(true);
 	connect(_createInBtn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggleCreateIn(bool )));
 	layout->addWidget(_createInBtn, 2, 2);
@@ -55,7 +55,7 @@
 }
 
 void KrAddBookmarkDlg::toggleCreateIn(bool show) {
-	_createInBtn->setPixmap(krLoader->loadIcon(show ? "up" :"down", TDEIcon::Small));
+	_createInBtn->setPixmap(krLoader->loadIcon(show ? "go-up" :"go-down", TDEIcon::Small));
 	showButton(KDialogBase::User1, show);
 	setDetails(show);
 }
diff --git a/krusader/DiskUsage/diskusagegui.cpp b/krusader/DiskUsage/diskusagegui.cpp
index f588ea8..b4814ca 100644
--- a/krusader/DiskUsage/diskusagegui.cpp
+++ b/krusader/DiskUsage/diskusagegui.cpp
@@ -64,7 +64,7 @@
   TQToolTip::add( btnRefresh, i18n( "Refresh" ) );
 
   btnDirUp = new TQToolButton( duTools, "btnDirUp" );
-  btnDirUp->setIconSet( TQIconSet(krLoader->loadIcon("up",TDEIcon::Desktop)) );
+  btnDirUp->setIconSet( TQIconSet(krLoader->loadIcon("go-up",TDEIcon::Desktop)) );
   TQToolTip::add( btnDirUp, i18n( "Parent directory" ) );
   
   TQWidget * separatorWidget = new TQWidget( duTools, "separatorWidget" );
diff --git a/krusader/DiskUsage/dulines.cpp b/krusader/DiskUsage/dulines.cpp
index ec0ebc0..5708ffa 100644
--- a/krusader/DiskUsage/dulines.cpp
+++ b/krusader/DiskUsage/dulines.cpp
@@ -279,7 +279,7 @@
   if( ! ( dirEntry->parent() == 0 ) )
   {
     lastItem = new TQListViewItem( this, ".." );
-    lastItem->setPixmap( 0, FL_LOADICON( "up" ) );
+    lastItem->setPixmap( 0, FL_LOADICON( "go-up" ) );
     lastItem->setSelectable( false );
   }
           
diff --git a/krusader/DiskUsage/dulistview.cpp b/krusader/DiskUsage/dulistview.cpp
index ef88139..386a1a5 100644
--- a/krusader/DiskUsage/dulistview.cpp
+++ b/krusader/DiskUsage/dulistview.cpp
@@ -118,7 +118,7 @@
   if( parent == 0 && ! ( dirEntry->parent() == 0 ) )
   {
     lastItem = new TQListViewItem( this, ".." );
-    lastItem->setPixmap( 0, FL_LOADICON( "up" ) );
+    lastItem->setPixmap( 0, FL_LOADICON( "go-up" ) );
     lastItem->setSelectable( false );
   }
           
diff --git a/krusader/Panel/krbriefviewitem.cpp b/krusader/Panel/krbriefviewitem.cpp
index 7981f11..8bcdca9 100644
--- a/krusader/Panel/krbriefviewitem.cpp
+++ b/krusader/Panel/krbriefviewitem.cpp
@@ -38,7 +38,7 @@
 		
 		setText("..");
 		if ( PROPS->displayIcons )
-			setPixmap( FL_LOADICON( "up" ) );
+			setPixmap( FL_LOADICON( "go-up" ) );
 		setSelectable( false );
 		setDragEnabled( false );
 		setDropEnabled( false );
diff --git a/krusader/Panel/krdetailedviewitem.cpp b/krusader/Panel/krdetailedviewitem.cpp
index 9ef3183..1c1c5e9 100644
--- a/krusader/Panel/krdetailedviewitem.cpp
+++ b/krusader/Panel/krdetailedviewitem.cpp
@@ -77,7 +77,7 @@
 		setText(COLUMN(Name), "..");
 		setText(COLUMN(Size), i18n("<DIR>") );
       if ( PROPS->displayIcons )
-         setPixmap( COLUMN(Name), FL_LOADICON( "up" ) );
+         setPixmap( COLUMN(Name), FL_LOADICON( "go-up" ) );
       setSelectable( false );
 #ifdef FASTER
 		initiated = true;
diff --git a/krusader/krusader.cpp b/krusader/krusader.cpp
index 836526c..c076b5b 100644
--- a/krusader/krusader.cpp
+++ b/krusader/krusader.cpp
@@ -589,7 +589,7 @@
    actCmdlinePopup = new TDEAction( i18n( "popup cmdline" ), 0, CTRL + Key_Slash, SLOTS,
                                   TQT_SLOT( cmdlinePopup() ), actionCollection(), "cmdline popup" );
    /* Shortcut disabled because of the Terminal Emulator bug. */
-   actDirUp = new TDEAction( i18n( "Up" ), "up", CTRL+Key_PageUp /*Key_Backspace*/, SLOTS, TQT_SLOT( dirUp() ), actionCollection(), "dirUp" );
+   actDirUp = new TDEAction( i18n( "Up" ), "go-up", CTRL+Key_PageUp /*Key_Backspace*/, SLOTS, TQT_SLOT( dirUp() ), actionCollection(), "dirUp" );
    new TDEAction( i18n( "&New Text File..." ), "filenew", SHIFT + Key_F4, SLOTS, TQT_SLOT( editDlg() ), actionCollection(), "edit_new_file" );
    new TDEAction( i18n( "Start &Root Mode Krusader" ), "krusader_root", ALT + Key_K, SLOTS, TQT_SLOT( rootKrusader() ), actionCollection(), "root krusader" );
 
@@ -703,7 +703,7 @@
                                   SLOTS, TQT_SLOT( startKonfigurator() ), actionCollection(), "konfigurator" );
    actBack = new TDEAction( i18n( "Back" ), "back", 0,
                           SLOTS, TQT_SLOT( back() ), actionCollection(), "back" );
-   actRoot = new TDEAction( i18n( "Root" ), "top", CTRL + Key_Backspace,
+   actRoot = new TDEAction( i18n( "Root" ), "go-top", CTRL + Key_Backspace,
                           SLOTS, TQT_SLOT( root() ), actionCollection(), "root" );
    actSavePosition = new TDEAction( i18n( "Save &Position" ), 0,
                                   TQT_TQOBJECT(krApp), TQT_SLOT( savePosition() ), actionCollection(), "save position" );