TDE
/
smb4k
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/smb4k
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename most device icons to comply with XDG standards

Browse Source 
(cherry picked from commit 75b96c6c24)
r14.0.x
Timothy Pearson 10 years ago committed by Slávek Banko
parent fd96e58334
commit 8c7d69faa0
8 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File

4
smb4k/browser/smb4knetworkbrowser_part.cpp
Unescape View File

@ -166,7 +166,7 @@ void Smb4KNetworkBrowserPart::setupActions()
TDEAction *print = new TDEAction( i18n( "&Print File" ), "printer1", TDEShortcut( CTRL+Key_P ), TDEAction *print = new TDEAction( i18n( "&Print File" ), "printer1", TDEShortcut( CTRL+Key_P ),
this, TQT_SLOT( slotPrint() ), this, TQT_SLOT( slotPrint() ),
actionCollection(), "print_action" ); 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() ), this, TQT_SLOT( slotMount() ),
actionCollection(), "mount_action" ); actionCollection(), "mount_action" );
@ -200,7 +200,7 @@ void Smb4KNetworkBrowserPart::setupActions()
// is also needed: // is also needed:
if ( m_mode == KonqPlugin ) 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() ), this, TQT_SLOT( slotUnmount() ),
actionCollection(), "konq_umount_action" ); actionCollection(), "konq_umount_action" );

2
smb4k/configdlg/smb4tdeconfigdialog.cpp
Unescape View File

@ -161,7 +161,7 @@ Smb4TDEConfigDialog::Smb4TDEConfigDialog( Smb4KSettings *settings, TQWidget *par
// Now add the pages to the configuration dialog // Now add the pages to the configuration dialog
addPage( interface_options, i18n( "User Interface" ), "view_choose" ); addPage( interface_options, i18n( "User Interface" ), "view_choose" );
addPage( network_options, i18n( "Network" ), "network" ); 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( auth_options, i18n( "Authentication" ), "identity" );
addPage( samba_options, i18n( "Samba" ), "samba" ); addPage( samba_options, i18n( "Samba" ), "samba" );
addPage( rsync_options, i18n( "Synchronization" ), "go-bottom" ); addPage( rsync_options, i18n( "Synchronization" ), "go-bottom" );

10
smb4k/iconview/smb4ksharesiconview_part.cpp
Unescape View File

@ -105,11 +105,11 @@ Smb4KSharesIconViewPart::~Smb4KSharesIconViewPart()
void Smb4KSharesIconViewPart::setupActions() void Smb4KSharesIconViewPart::setupActions()
{ {
// Create the actions: // 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() ), this, TQT_SLOT( slotUnmountShare() ),
actionCollection(), "unmount_action" ); actionCollection(), "unmount_action" );
#ifdef __linux__ #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() ), this, TQT_SLOT( slotForceUnmountShare() ),
actionCollection(), "force_unmount_action" ); actionCollection(), "force_unmount_action" );
#endif #endif
@ -138,7 +138,7 @@ void Smb4KSharesIconViewPart::setupActions()
// Insert the actions into the menu: // Insert the actions into the menu:
m_menu = new TDEActionMenu( this, "SharesIconViewMenu" ); 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 ); m_menu->insert( unmount, -1 );
#ifdef __linux__ #ifdef __linux__
m_menu->insert( force, -1 ); m_menu->insert( force, -1 );
@ -224,12 +224,12 @@ void Smb4KSharesIconViewPart::slotContextMenuRequested( TQIconViewItem *item, co
{ {
if ( item ) 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() ); static_cast<Smb4KSharesIconViewItem *>( item )->shareObject()->name() );
} }
else 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 ); m_menu->popupMenu()->exec( pos, 0 );

4
smb4k/iconview/smb4ksharesiconviewitem.cpp
Unescape View File

@ -94,7 +94,7 @@ void Smb4KSharesIconViewItem::setupItem( const Smb4KShare &share, bool mountpoin
{ {
TQImage over = m_loader->loadIcon( "button_cancel", TDEIcon::Desktop, TQImage over = m_loader->loadIcon( "button_cancel", TDEIcon::Desktop,
0, icon_state, 0L, false ).convertToImage(); 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(); 0, icon_state, 0L, false ).convertToImage();
TDEIconEffect e; TDEIconEffect e;
@ -105,7 +105,7 @@ void Smb4KSharesIconViewItem::setupItem( const Smb4KShare &share, bool mountpoin
} }
else 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 ); 0, icon_state, 0L, false );
} }

10
smb4k/listview/smb4kshareslistview_part.cpp
Unescape View File

@ -108,11 +108,11 @@ Smb4KSharesListViewPart::~Smb4KSharesListViewPart()
void Smb4KSharesListViewPart::setupActions() void Smb4KSharesListViewPart::setupActions()
{ {
// Create the actions: // 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() ), this, TQT_SLOT( slotUnmountShare() ),
actionCollection(), "unmount_action" ); actionCollection(), "unmount_action" );
#ifdef __linux__ #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() ), this, TQT_SLOT( slotForceUnmountShare() ),
actionCollection(), "force_unmount_action" ); actionCollection(), "force_unmount_action" );
#endif #endif
@ -141,7 +141,7 @@ void Smb4KSharesListViewPart::setupActions()
// Insert the actions into the menu: // Insert the actions into the menu:
m_menu = new TDEActionMenu( this, "SharesListViewMenu" ); 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 ); m_menu->insert( unmount, -1 );
#ifdef __linux__ #ifdef __linux__
m_menu->insert( force, -1 ); m_menu->insert( force, -1 );
@ -338,12 +338,12 @@ void Smb4KSharesListViewPart::slotContextMenuRequested( TQListViewItem *item, co
{ {
if ( item ) 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() ); static_cast<Smb4KSharesListViewItem *>( item )->shareObject()->name() );
} }
else 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 ); m_menu->popupMenu()->exec( pos, 0 );

8
smb4k/listview/smb4kshareslistviewitem.cpp
Unescape View File

@ -73,12 +73,12 @@ void Smb4KSharesListViewItem::setupItem( const Smb4KShare &share, bool mountpoin
{ {
TQImage over = m_loader->loadIcon( "button_cancel", TDEIcon::Small, TQImage over = m_loader->loadIcon( "button_cancel", TDEIcon::Small,
0, icon_state, 0L, false ).convertToImage(); 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(); 0, icon_state, 0L, false ).convertToImage();
TQImage over_desk = m_loader->loadIcon( "button_cancel", TDEIcon::Desktop, TQImage over_desk = m_loader->loadIcon( "button_cancel", TDEIcon::Desktop,
0, icon_state, 0L, false ).convertToImage(); 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(); 0, icon_state, 0L, false ).convertToImage();
TDEIconEffect e; TDEIconEffect e;
@ -92,10 +92,10 @@ void Smb4KSharesListViewItem::setupItem( const Smb4KShare &share, bool mountpoin
} }
else else
{ {
pix = m_loader->loadIcon( "hdd_mount", TDEIcon::Small, pix = m_loader->loadIcon( "drive-harddisk-mounted", TDEIcon::Small,
0, icon_state, 0L, false ); 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 ); 0, icon_state, 0L, false );
} }

4
smb4k/smb4k.cpp
Unescape View File

@ -252,7 +252,7 @@ void Smb4KApp::setupView()
if ( m_shares_part ) 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->setWidget( m_shares_part->widget() );
main->setDockSite( KDockWidget::DockCorner ); main->setDockSite( KDockWidget::DockCorner );
main->setEnableDocking( KDockWidget::DockNone ); main->setEnableDocking( KDockWidget::DockNone );
@ -407,7 +407,7 @@ void Smb4KApp::changeSharesView()
if ( m_shares_part ) 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->setWidget( m_shares_part->widget() );
main->setDockSite( KDockWidget::DockCorner ); main->setDockSite( KDockWidget::DockCorner );
main->setEnableDocking( KDockWidget::DockNone ); main->setEnableDocking( KDockWidget::DockNone );

12
smb4k/smb4ksystemtray.cpp
Unescape View File

@ -64,7 +64,7 @@ Smb4KSystemTray::Smb4KSystemTray( TQWidget *parent, const char *name )
actionCollection()->setHighlightingEnabled( true ); actionCollection()->setHighlightingEnabled( true );
// Set up the context menu (skeleton): // 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" ); actionCollection(), "st_mounted_shares_action_menu" );
m_bookmarks_menu = new TDEActionMenu( i18n( "Bookmarks" ), "bookmark_folder", m_bookmarks_menu = new TDEActionMenu( i18n( "Bookmarks" ), "bookmark_folder",
actionCollection(), "st_bookmark_action_menu" ); actionCollection(), "st_bookmark_action_menu" );
@ -763,7 +763,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
{ {
TQImage over = loader.loadIcon( "button_cancel", TDEIcon::Small, TQImage over = loader.loadIcon( "button_cancel", TDEIcon::Small,
0, icon_state, 0L, false ).convertToImage(); 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(); 0, icon_state, 0L, false ).convertToImage();
TDEIconEffect e; TDEIconEffect e;
@ -774,7 +774,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
} }
else else
{ {
pix = loader.loadIcon( "hdd_mount", TDEIcon::Small, pix = loader.loadIcon( "drive-harddisk-mounted", TDEIcon::Small,
0, icon_state, 0L, false ); 0, icon_state, 0L, false );
} }
@ -787,11 +787,11 @@ void Smb4KSystemTray::slotSetupSharesMenu()
// Define the actions that can be performed on a share from within // Define the actions that can be performed on a share from within
// the system tray widget: // 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() ); TQT_SLOT( slotUnmountShare() ), actionCollection(), "st_[unmount]_"+(*it)->canonicalPath() );
umount->setGroup( "ShareActions" ); umount->setGroup( "ShareActions" );
#ifdef __linux__ #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() ); TQT_SLOT( slotForceUnmountShare() ), actionCollection(), "st_[force]_"+(*it)->canonicalPath() );
force_umount->setGroup( "ShareActions" ); force_umount->setGroup( "ShareActions" );
force_umount->setEnabled( Smb4KSettings::useForceUnmount() ); force_umount->setEnabled( Smb4KSettings::useForceUnmount() );
@ -851,7 +851,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
TQImage over = loader.loadIcon( "button_cancel", TDEIcon::Small, TQImage over = loader.loadIcon( "button_cancel", TDEIcon::Small,
0, icon_state, 0L, false ).convertToImage(); 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(); 0, icon_state, 0L, false ).convertToImage();
TDEIconEffect e; TDEIconEffect e;

Write Preview
Loading…
Cancel
Save