Branch: master

d775ace9 2014-10-13 00:13:23 Timothy Pearson
Bring up, down, top, and bottom icons into XDG compliance
M smb4k/configdlg/smb4tdeconfigdialog.cpp
M smb4k/dialogs/smb4kpreviewdialog.cpp
M smb4k/dialogs/smb4ksynchronizationdialog.cpp
M smb4k/iconview/smb4ksharesiconview_part.cpp
M smb4k/listview/smb4kshareslistview_part.cpp
M smb4k/smb4ksystemtray.cpp
diff --git a/smb4k/configdlg/smb4tdeconfigdialog.cpp b/smb4k/configdlg/smb4tdeconfigdialog.cpp
index d61dec4..b45d7fd 100644
--- a/smb4k/configdlg/smb4tdeconfigdialog.cpp
+++ b/smb4k/configdlg/smb4tdeconfigdialog.cpp
@@ -164,7 +164,7 @@
   addPage( share_options, i18n( "Shares" ), "hdd_mount" );
   addPage( auth_options, i18n( "Authentication" ), "identity" );
   addPage( samba_options, i18n( "Samba" ), "samba" );
-  addPage( rsync_options, i18n( "Synchronization" ), "bottom" );
+  addPage( rsync_options, i18n( "Synchronization" ), "go-bottom" );
   addPage( super_user_options, i18n( "Super User" ), "penguin" );
 
   // Stuff that's not managed by TDEConfig XT is loaded by
diff --git a/smb4k/dialogs/smb4kpreviewdialog.cpp b/smb4k/dialogs/smb4kpreviewdialog.cpp
index 7607956..4186151 100644
--- a/smb4k/dialogs/smb4kpreviewdialog.cpp
+++ b/smb4k/dialogs/smb4kpreviewdialog.cpp
@@ -109,7 +109,7 @@
   m_toolbar->insertButton( "reload", Reload, true, i18n( "Reload" ), 0 );
   m_toolbar->insertButton( "back", Back, false, i18n( "Back" ), 1 );
   m_toolbar->insertButton( "forward", Forward, false, i18n( "Forward" ), 2 );
-  m_toolbar->insertButton( "up", Up, false, i18n( "Up" ), 3 );
+  m_toolbar->insertButton( "go-up", Up, false, i18n( "Up" ), 3 );
 
   m_combo = new KComboBox( false, m_toolbar, 0 );
   m_combo->listBox()->setHScrollBarMode( TQScrollView::Auto );
diff --git a/smb4k/dialogs/smb4ksynchronizationdialog.cpp b/smb4k/dialogs/smb4ksynchronizationdialog.cpp
index 5850a76..8cb85cf 100644
--- a/smb4k/dialogs/smb4ksynchronizationdialog.cpp
+++ b/smb4k/dialogs/smb4ksynchronizationdialog.cpp
@@ -49,7 +49,7 @@
 {
   setWFlags( TQt::WDestructiveClose );
 
-  setButtonGuiItem( User1, KGuiItem( i18n( "Synchronize" ), "bottom", i18n( "Synchronize the destination with the source" ) ) );
+  setButtonGuiItem( User1, KGuiItem( i18n( "Synchronize" ), "go-bottom", i18n( "Synchronize the destination with the source" ) ) );
   setButtonGuiItem( User2, KGuiItem( i18n( "Swap Paths" ), TQString(), i18n( "Swap source and destination" ) ) );
 
   TQFrame *frame = plainPage();
diff --git a/smb4k/iconview/smb4ksharesiconview_part.cpp b/smb4k/iconview/smb4ksharesiconview_part.cpp
index 3ad60df..eaf0e73 100644
--- a/smb4k/iconview/smb4ksharesiconview_part.cpp
+++ b/smb4k/iconview/smb4ksharesiconview_part.cpp
@@ -116,7 +116,7 @@
   TDEAction *all =       new TDEAction( i18n( "U&nmount All" ), "gear", TDEShortcut( CTRL+Key_N ),
                                     this, TQT_SLOT( slotUnmountAllShares() ),
                                     actionCollection(), "unmount_all_action" );
-  TDEAction *sync =      new TDEAction( i18n( "S&ynchronize" ), "bottom", TDEShortcut( CTRL+Key_Y ),
+  TDEAction *sync =      new TDEAction( i18n( "S&ynchronize" ), "go-bottom", TDEShortcut( CTRL+Key_Y ),
                                     this, TQT_SLOT( slotSynchronize() ),
                                     actionCollection(), "synchronize_action" );
   TDEAction *konsole =   new TDEAction( i18n( "Open with Konso&le" ), "terminal", TDEShortcut( CTRL+Key_L ),
diff --git a/smb4k/listview/smb4kshareslistview_part.cpp b/smb4k/listview/smb4kshareslistview_part.cpp
index c1acd6d..4bb7dde 100644
--- a/smb4k/listview/smb4kshareslistview_part.cpp
+++ b/smb4k/listview/smb4kshareslistview_part.cpp
@@ -119,7 +119,7 @@
   TDEAction *all =       new TDEAction( i18n( "U&nmount All" ), "gear", TDEShortcut( CTRL+Key_N ),
                                     this, TQT_SLOT( slotUnmountAllShares() ),
                                     actionCollection(), "unmount_all_action" );
-  TDEAction *sync =      new TDEAction( i18n( "S&ynchronize" ), "bottom", TDEShortcut( CTRL+Key_Y ),
+  TDEAction *sync =      new TDEAction( i18n( "S&ynchronize" ), "go-bottom", TDEShortcut( CTRL+Key_Y ),
                                     this, TQT_SLOT( slotSynchronize() ),
                                     actionCollection(), "synchronize_action" );
   TDEAction *konsole =   new TDEAction( i18n( "Open with Konso&le" ), "terminal", TDEShortcut( CTRL+Key_L ),
diff --git a/smb4k/smb4ksystemtray.cpp b/smb4k/smb4ksystemtray.cpp
index 3c6bd59..88f103a 100644
--- a/smb4k/smb4ksystemtray.cpp
+++ b/smb4k/smb4ksystemtray.cpp
@@ -796,7 +796,7 @@
         force_umount->setGroup( "ShareActions" );
         force_umount->setEnabled( Smb4KSettings::useForceUnmount() );
 #endif
-        TDEAction *synchronize =  new TDEAction( i18n( "S&ynchronize" ), "bottom", TDEShortcut::null(), TQT_TQOBJECT(this),
+        TDEAction *synchronize =  new TDEAction( i18n( "S&ynchronize" ), "go-bottom", TDEShortcut::null(), TQT_TQOBJECT(this),
                                 TQT_SLOT( slotSynchronize() ), actionCollection(), "st_[synchronize]_"+(*it)->canonicalPath() );
         synchronize->setGroup( "ShareActions" );
         synchronize->setEnabled( !Smb4KSettings::rsync().isEmpty() );