| 8c7d69fa | 2015-03-04 16:40:48 | Timothy Pearson |
Rename most device icons to comply with XDG standards (cherry picked from commit 75b96c6c243be29943890e2e9eea153fe9237199) |
||
|
M smb4k/browser/smb4knetworkbrowser_part.cpp M smb4k/configdlg/smb4tdeconfigdialog.cpp M smb4k/iconview/smb4ksharesiconview_part.cpp M smb4k/iconview/smb4ksharesiconviewitem.cpp M smb4k/listview/smb4kshareslistview_part.cpp M smb4k/listview/smb4kshareslistviewitem.cpp M smb4k/smb4k.cpp M smb4k/smb4ksystemtray.cpp |
||
diff --git a/smb4k/browser/smb4knetworkbrowser_part.cpp b/smb4k/browser/smb4knetworkbrowser_part.cpp
index fe55a29..fda0808 100644
--- a/smb4k/browser/smb4knetworkbrowser_part.cpp
+++ b/smb4k/browser/smb4knetworkbrowser_part.cpp
@@ -166,7 +166,7 @@
TDEAction *print = new TDEAction( i18n( "&Print File" ), "printer1", TDEShortcut( CTRL+Key_P ),
this, TQT_SLOT( slotPrint() ),
actionCollection(), "print_action" );
- TDEAction *mount = new TDEAction( i18n( "&Mount" ), "hdd_mount", TDEShortcut( CTRL+Key_M ),
+ TDEAction *mount = new TDEAction( i18n( "&Mount" ), "drive-harddisk-mounted", TDEShortcut( CTRL+Key_M ),
this, TQT_SLOT( slotMount() ),
actionCollection(), "mount_action" );
@@ -200,7 +200,7 @@
// is also needed:
if ( m_mode == KonqPlugin )
{
- TDEAction *unmount = new TDEAction( i18n( "&Unmount" ), "hdd_unmount", TDEShortcut( CTRL+Key_U ),
+ TDEAction *unmount = new TDEAction( i18n( "&Unmount" ), "drive-harddisk", TDEShortcut( CTRL+Key_U ),
this, TQT_SLOT( slotUnmount() ),
actionCollection(), "konq_umount_action" );
diff --git a/smb4k/configdlg/smb4tdeconfigdialog.cpp b/smb4k/configdlg/smb4tdeconfigdialog.cpp
index b45d7fd..9dbd436 100644
--- a/smb4k/configdlg/smb4tdeconfigdialog.cpp
+++ b/smb4k/configdlg/smb4tdeconfigdialog.cpp
@@ -161,7 +161,7 @@
// Now add the pages to the configuration dialog
addPage( interface_options, i18n( "User Interface" ), "view_choose" );
addPage( network_options, i18n( "Network" ), "network" );
- addPage( share_options, i18n( "Shares" ), "hdd_mount" );
+ addPage( share_options, i18n( "Shares" ), "drive-harddisk-mounted" );
addPage( auth_options, i18n( "Authentication" ), "identity" );
addPage( samba_options, i18n( "Samba" ), "samba" );
addPage( rsync_options, i18n( "Synchronization" ), "go-bottom" );
diff --git a/smb4k/iconview/smb4ksharesiconview_part.cpp b/smb4k/iconview/smb4ksharesiconview_part.cpp
index eaf0e73..51686ae 100644
--- a/smb4k/iconview/smb4ksharesiconview_part.cpp
+++ b/smb4k/iconview/smb4ksharesiconview_part.cpp
@@ -105,11 +105,11 @@
void Smb4KSharesIconViewPart::setupActions()
{
// Create the actions:
- TDEAction *unmount = new TDEAction( i18n( "&Unmount" ), "hdd_unmount", TDEShortcut( CTRL+Key_U ),
+ TDEAction *unmount = new TDEAction( i18n( "&Unmount" ), "drive-harddisk", TDEShortcut( CTRL+Key_U ),
this, TQT_SLOT( slotUnmountShare() ),
actionCollection(), "unmount_action" );
#ifdef __linux__
- TDEAction *force = new TDEAction( i18n( "&Force Unmounting" ), "hdd_unmount", TDEShortcut( CTRL+Key_F ),
+ TDEAction *force = new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk", TDEShortcut( CTRL+Key_F ),
this, TQT_SLOT( slotForceUnmountShare() ),
actionCollection(), "force_unmount_action" );
#endif
@@ -138,7 +138,7 @@
// Insert the actions into the menu:
m_menu = new TDEActionMenu( this, "SharesIconViewMenu" );
- m_menu->popupMenu()->insertTitle( SmallIcon( "hdd_mount" ), i18n( "Shares" ), 0 );
+ m_menu->popupMenu()->insertTitle( SmallIcon( "drive-harddisk-mounted" ), i18n( "Shares" ), 0 );
m_menu->insert( unmount, -1 );
#ifdef __linux__
m_menu->insert( force, -1 );
@@ -224,12 +224,12 @@
{
if ( item )
{
- m_menu->popupMenu()->changeTitle( 0, SmallIcon( "hdd_mount" ),
+ m_menu->popupMenu()->changeTitle( 0, SmallIcon( "drive-harddisk-mounted" ),
static_cast<Smb4KSharesIconViewItem *>( item )->shareObject()->name() );
}
else
{
- m_menu->popupMenu()->changeTitle( 0, SmallIcon( "hdd_mount" ), i18n( "Shares" ) );
+ m_menu->popupMenu()->changeTitle( 0, SmallIcon( "drive-harddisk-mounted" ), i18n( "Shares" ) );
}
m_menu->popupMenu()->exec( pos, 0 );
diff --git a/smb4k/iconview/smb4ksharesiconviewitem.cpp b/smb4k/iconview/smb4ksharesiconviewitem.cpp
index 1424f85..7a91f3d 100644
--- a/smb4k/iconview/smb4ksharesiconviewitem.cpp
+++ b/smb4k/iconview/smb4ksharesiconviewitem.cpp
@@ -94,7 +94,7 @@
{
TQImage over = m_loader->loadIcon( "button_cancel", TDEIcon::Desktop,
0, icon_state, 0L, false ).convertToImage();
- TQImage src = m_loader->loadIcon( "hdd_mount", TDEIcon::Desktop,
+ TQImage src = m_loader->loadIcon( "drive-harddisk-mounted", TDEIcon::Desktop,
0, icon_state, 0L, false ).convertToImage();
TDEIconEffect e;
@@ -105,7 +105,7 @@
}
else
{
- m_pixmap = m_loader->loadIcon( "hdd_mount", TDEIcon::Desktop,
+ m_pixmap = m_loader->loadIcon( "drive-harddisk-mounted", TDEIcon::Desktop,
0, icon_state, 0L, false );
}
diff --git a/smb4k/listview/smb4kshareslistview_part.cpp b/smb4k/listview/smb4kshareslistview_part.cpp
index 4bb7dde..967cfec 100644
--- a/smb4k/listview/smb4kshareslistview_part.cpp
+++ b/smb4k/listview/smb4kshareslistview_part.cpp
@@ -108,11 +108,11 @@
void Smb4KSharesListViewPart::setupActions()
{
// Create the actions:
- TDEAction *unmount = new TDEAction( i18n( "&Unmount" ), "hdd_unmount", TDEShortcut( CTRL+Key_U ),
+ TDEAction *unmount = new TDEAction( i18n( "&Unmount" ), "drive-harddisk", TDEShortcut( CTRL+Key_U ),
this, TQT_SLOT( slotUnmountShare() ),
actionCollection(), "unmount_action" );
#ifdef __linux__
- TDEAction *force = new TDEAction( i18n( "&Force Unmounting" ), "hdd_unmount", TDEShortcut( CTRL+Key_F ),
+ TDEAction *force = new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk", TDEShortcut( CTRL+Key_F ),
this, TQT_SLOT( slotForceUnmountShare() ),
actionCollection(), "force_unmount_action" );
#endif
@@ -141,7 +141,7 @@
// Insert the actions into the menu:
m_menu = new TDEActionMenu( this, "SharesListViewMenu" );
- m_menu->popupMenu()->insertTitle( SmallIcon( "hdd_mount" ), i18n( "Shares" ), 0 );
+ m_menu->popupMenu()->insertTitle( SmallIcon( "drive-harddisk-mounted" ), i18n( "Shares" ), 0 );
m_menu->insert( unmount, -1 );
#ifdef __linux__
m_menu->insert( force, -1 );
@@ -338,12 +338,12 @@
{
if ( item )
{
- m_menu->popupMenu()->changeTitle( 0, SmallIcon( "hdd_mount" ),
+ m_menu->popupMenu()->changeTitle( 0, SmallIcon( "drive-harddisk-mounted" ),
static_cast<Smb4KSharesListViewItem *>( item )->shareObject()->name() );
}
else
{
- m_menu->popupMenu()->changeTitle( 0, SmallIcon( "hdd_mount" ), i18n( "Shares" ) );
+ m_menu->popupMenu()->changeTitle( 0, SmallIcon( "drive-harddisk-mounted" ), i18n( "Shares" ) );
}
m_menu->popupMenu()->exec( pos, 0 );
diff --git a/smb4k/listview/smb4kshareslistviewitem.cpp b/smb4k/listview/smb4kshareslistviewitem.cpp
index c7616a5..1b8e23e 100644
--- a/smb4k/listview/smb4kshareslistviewitem.cpp
+++ b/smb4k/listview/smb4kshareslistviewitem.cpp
@@ -73,12 +73,12 @@
{
TQImage over = m_loader->loadIcon( "button_cancel", TDEIcon::Small,
0, icon_state, 0L, false ).convertToImage();
- TQImage src = m_loader->loadIcon( "hdd_mount", TDEIcon::Small,
+ TQImage src = m_loader->loadIcon( "drive-harddisk-mounted", TDEIcon::Small,
0, icon_state, 0L, false ).convertToImage();
TQImage over_desk = m_loader->loadIcon( "button_cancel", TDEIcon::Desktop,
0, icon_state, 0L, false ).convertToImage();
- TQImage src_desk = m_loader->loadIcon( "hdd_mount", TDEIcon::Desktop,
+ TQImage src_desk = m_loader->loadIcon( "drive-harddisk-mounted", TDEIcon::Desktop,
0, icon_state, 0L, false ).convertToImage();
TDEIconEffect e;
@@ -92,10 +92,10 @@
}
else
{
- pix = m_loader->loadIcon( "hdd_mount", TDEIcon::Small,
+ pix = m_loader->loadIcon( "drive-harddisk-mounted", TDEIcon::Small,
0, icon_state, 0L, false );
- m_desktop_pixmap = m_loader->loadIcon( "hdd_mount", TDEIcon::Desktop,
+ m_desktop_pixmap = m_loader->loadIcon( "drive-harddisk-mounted", TDEIcon::Desktop,
0, icon_state, 0L, false );
}
diff --git a/smb4k/smb4k.cpp b/smb4k/smb4k.cpp
index 576dcf6..f94f89e 100644
--- a/smb4k/smb4k.cpp
+++ b/smb4k/smb4k.cpp
@@ -252,7 +252,7 @@
if ( m_shares_part )
{
- KDockWidget *main = createDockWidget( "SharesView", SmallIcon( "hdd_mount" ), 0L );
+ KDockWidget *main = createDockWidget( "SharesView", SmallIcon( "drive-harddisk-mounted" ), 0L );
main->setWidget( m_shares_part->widget() );
main->setDockSite( KDockWidget::DockCorner );
main->setEnableDocking( KDockWidget::DockNone );
@@ -407,7 +407,7 @@
if ( m_shares_part )
{
- KDockWidget *main = createDockWidget( "SharesView", SmallIcon( "hdd_mount" ), this );
+ KDockWidget *main = createDockWidget( "SharesView", SmallIcon( "drive-harddisk-mounted" ), this );
main->setWidget( m_shares_part->widget() );
main->setDockSite( KDockWidget::DockCorner );
main->setEnableDocking( KDockWidget::DockNone );
diff --git a/smb4k/smb4ksystemtray.cpp b/smb4k/smb4ksystemtray.cpp
index 88f103a..75b418f 100644
--- a/smb4k/smb4ksystemtray.cpp
+++ b/smb4k/smb4ksystemtray.cpp
@@ -64,7 +64,7 @@
actionCollection()->setHighlightingEnabled( true );
// Set up the context menu (skeleton):
- m_shares_menu = new TDEActionMenu( i18n( "Mounted Shares" ), "hdd_mount",
+ m_shares_menu = new TDEActionMenu( i18n( "Mounted Shares" ), "drive-harddisk-mounted",
actionCollection(), "st_mounted_shares_action_menu" );
m_bookmarks_menu = new TDEActionMenu( i18n( "Bookmarks" ), "bookmark_folder",
actionCollection(), "st_bookmark_action_menu" );
@@ -763,7 +763,7 @@
{
TQImage over = loader.loadIcon( "button_cancel", TDEIcon::Small,
0, icon_state, 0L, false ).convertToImage();
- TQImage src = loader.loadIcon( "hdd_mount", TDEIcon::Small,
+ TQImage src = loader.loadIcon( "drive-harddisk-mounted", TDEIcon::Small,
0, icon_state, 0L, false ).convertToImage();
TDEIconEffect e;
@@ -774,7 +774,7 @@
}
else
{
- pix = loader.loadIcon( "hdd_mount", TDEIcon::Small,
+ pix = loader.loadIcon( "drive-harddisk-mounted", TDEIcon::Small,
0, icon_state, 0L, false );
}
@@ -787,11 +787,11 @@
// Define the actions that can be performed on a share from within
// the system tray widget:
- TDEAction *umount = new TDEAction( i18n( "&Unmount" ), "hdd_unmount", TDEShortcut::null(), TQT_TQOBJECT(this),
+ TDEAction *umount = new TDEAction( i18n( "&Unmount" ), "drive-harddisk", TDEShortcut::null(), TQT_TQOBJECT(this),
TQT_SLOT( slotUnmountShare() ), actionCollection(), "st_[unmount]_"+(*it)->canonicalPath() );
umount->setGroup( "ShareActions" );
#ifdef __linux__
- TDEAction *force_umount = new TDEAction( i18n( "&Force Unmounting" ), "hdd_unmount", TDEShortcut::null(), TQT_TQOBJECT(this),
+ TDEAction *force_umount = new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk", TDEShortcut::null(), TQT_TQOBJECT(this),
TQT_SLOT( slotForceUnmountShare() ), actionCollection(), "st_[force]_"+(*it)->canonicalPath() );
force_umount->setGroup( "ShareActions" );
force_umount->setEnabled( Smb4KSettings::useForceUnmount() );
@@ -851,7 +851,7 @@
TQImage over = loader.loadIcon( "button_cancel", TDEIcon::Small,
0, icon_state, 0L, false ).convertToImage();
- TQImage src = loader.loadIcon( "hdd_mount", TDEIcon::Small,
+ TQImage src = loader.loadIcon( "drive-harddisk-mounted", TDEIcon::Small,
0, icon_state, 0L, false ).convertToImage();
TDEIconEffect e;
|
||