| a8203cf7 | 2015-03-26 12:26:24 | Timothy Pearson |
Bring system icon into XDG compliance |
||
|
M kcontrol/smserver/kcmsmserver.desktop M kdesktop/init/System.desktop M kicker/applets/lockout/lockout.desktop M kicker/applets/naughty/naughtyapplet.desktop M kicker/applets/systemtray/systemtrayapplet.desktop M kicker/kicker/ui/k_new_mnu.cpp M kicker/menuext/system/systemmenu.desktop M konqueror/about/konq_aboutpage.cc M konqueror/konq_mainwindow.cc M konqueror/shellcmdplugin/kshellcmdplugin.desktop M konqueror/sidebar/trees/init/services/media.desktop M konqueror/sidebar/trees/init/system.desktop M tdeioslave/cgi/kcmcgi/kcmcgi.desktop M tdeioslave/media/media.protocol M tdeioslave/media/mimetypes/mycomputer.desktop M tdeioslave/media/tdecmodule/media.desktop M tdeioslave/system/entries/media.desktop M tdeioslave/system/system.protocol M tdeioslave/system/systemimpl.cpp |
||
diff --git a/kcontrol/smserver/kcmsmserver.desktop b/kcontrol/smserver/kcmsmserver.desktop
index cafdeb0..a727945 100644
--- a/kcontrol/smserver/kcmsmserver.desktop
+++ b/kcontrol/smserver/kcmsmserver.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=system-log-out
+Icon=computer-log-out
Type=Application
X-DocPath=kcontrol/kcmsmserver/index.html
Exec=tdecmshell kcmsmserver
diff --git a/kdesktop/init/System.desktop b/kdesktop/init/System.desktop
index 509f1f1..7c9f2a9 100644
--- a/kdesktop/init/System.desktop
+++ b/kdesktop/init/System.desktop
@@ -144,6 +144,6 @@
GenericName[zh_CN]=������������
GenericName[zh_TW]=������������
URL=system:/
-Icon=system
+Icon=computer
Type=Link
OnlyShowIn=TDE;
diff --git a/kicker/applets/lockout/lockout.desktop b/kicker/applets/lockout/lockout.desktop
index 26490e9..7aa420e 100644
--- a/kicker/applets/lockout/lockout.desktop
+++ b/kicker/applets/lockout/lockout.desktop
@@ -121,5 +121,5 @@
Comment[wa]=Radjout des botons po serer l' waitro��le a cl�� et dislodj�� del session
Comment[zh_CN]=������������������������������������������
Comment[zh_TW]=������������������������������������������������������
-Icon=system-log-out
+Icon=computer-log-out
X-TDE-Library=lockout_panelapplet
diff --git a/kicker/applets/naughty/naughtyapplet.desktop b/kicker/applets/naughty/naughtyapplet.desktop
index 39238dd..ea6eb68 100644
--- a/kicker/applets/naughty/naughtyapplet.desktop
+++ b/kicker/applets/naughty/naughtyapplet.desktop
@@ -126,6 +126,6 @@
Comment[wa]=Trove et arest��ye les schet��s processus k' eploy��t trop di tins CPU
Comment[zh_CN]=��������������������������� CPU ���������������
Comment[zh_TW]=��������������������������� CPU ���������������������
-Icon=system-runprocesscatcher
+Icon=computer-runprocesscatcher
X-TDE-Library=naughty_panelapplet
X-TDE-UniqueApplet=true
diff --git a/kicker/applets/systemtray/systemtrayapplet.desktop b/kicker/applets/systemtray/systemtrayapplet.desktop
index a2882b9..8d107e5 100644
--- a/kicker/applets/systemtray/systemtrayapplet.desktop
+++ b/kicker/applets/systemtray/systemtrayapplet.desktop
@@ -153,6 +153,6 @@
Comment[zh_CN]=���������������������
Comment[zh_TW]=��������� (system tray) ���������������
Comment[zu]=I-applet yewindi lemininingwane yetreyi lesistimu
-Icon=systemtray
+Icon=computertray
X-TDE-Library=systemtray_panelapplet
X-TDE-UniqueApplet=true
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index a564116..8d12961 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -265,7 +265,7 @@
if (KickerSettings::kickoffTabBarFormat() != KickerSettings::LabelOnly) {
m_tabs[FavoriteTab]->setIconSet(BarIcon("bookmark", tab_icon_size));
m_tabs[HistoryTab]->setIconSet(BarIcon("recently_used", tab_icon_size));
- m_tabs[ComputerTab]->setIconSet(BarIcon("system", tab_icon_size));
+ m_tabs[ComputerTab]->setIconSet(BarIcon("computer", tab_icon_size));
m_tabs[ApplicationsTab]->setIconSet(BarIcon("player_playlist", tab_icon_size));
m_tabs[LeaveTab]->setIconSet(BarIcon("leave", tab_icon_size));
}
diff --git a/kicker/menuext/system/systemmenu.desktop b/kicker/menuext/system/systemmenu.desktop
index e6d977c..cfd5106 100644
--- a/kicker/menuext/system/systemmenu.desktop
+++ b/kicker/menuext/system/systemmenu.desktop
@@ -122,6 +122,6 @@
Comment[wa]=Dress��ye des imp��rtant��s plaeces do sistinmes
Comment[zh_CN]=���������������������������
Comment[zh_TW]=������������������������
-Icon=system
+Icon=computer
X-TDE-Library=kickermenu_systemmenu
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index a94f2d5..cb2149f 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -101,7 +101,7 @@
TDEIconLoader *iconloader = TDEGlobal::iconLoader();
int iconSize = iconloader->currentSize(TDEIcon::Desktop);
TQString home_icon_path = iconloader->iconPath("kfm_home", TDEIcon::Desktop );
- TQString storage_icon_path = iconloader->iconPath("system", TDEIcon::Desktop );
+ TQString storage_icon_path = iconloader->iconPath("computer", TDEIcon::Desktop );
TQString remote_icon_path = iconloader->iconPath("network", TDEIcon::Desktop );
TQString wastebin_icon_path = iconloader->iconPath("trashcan_full", TDEIcon::Desktop );
TQString applications_icon_path = iconloader->iconPath("kmenu", TDEIcon::Desktop );
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 4725327..7a8c4fd 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -3852,9 +3852,9 @@
connect( m_paHome, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this),
TQT_SLOT( slotHome(TDEAction::ActivationReason, TQt::ButtonState) ) );
- (void) new TDEAction( i18n( "S&ystem" ), "system", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" );
+ (void) new TDEAction( i18n( "S&ystem" ), "computer", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" );
(void) new TDEAction( i18n( "App&lications" ), "kmenu", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoApplications() ), actionCollection(), "go_applications" );
- (void) new TDEAction( i18n( "&Storage Media" ), "system", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" );
+ (void) new TDEAction( i18n( "&Storage Media" ), "computer", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" );
(void) new TDEAction( i18n( "&Network Folders" ), "network", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" );
(void) new TDEAction( i18n( "Sett&ings" ), "kcontrol", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSettings() ), actionCollection(), "go_settings" );
//(void) new TDEAction( i18n( "Sidebar Configuration" ), 0, this, TQT_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" );
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.desktop b/konqueror/shellcmdplugin/kshellcmdplugin.desktop
index 09c263a..9d7f7cb 100644
--- a/konqueror/shellcmdplugin/kshellcmdplugin.desktop
+++ b/konqueror/shellcmdplugin/kshellcmdplugin.desktop
@@ -10,7 +10,7 @@
X-TDE-PluginInfo-License=GPL
X-TDE-PluginInfo-EnabledByDefault=true
X-TDE-ParentApp=konqueror
-Icon=system-run
+Icon=computer-run
Name=Shell Command Plugin
Name[af]=Opdrag tolk inprop module
Name[ar]=�������� ������ ��������������
diff --git a/konqueror/sidebar/trees/init/services/media.desktop b/konqueror/sidebar/trees/init/services/media.desktop
index 1a7a85c..a74a01f 100644
--- a/konqueror/sidebar/trees/init/services/media.desktop
+++ b/konqueror/sidebar/trees/init/services/media.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Link
URL=media:/
-Icon=system
+Icon=computer
Name=Storage Media
Name[af]=Stoor Media
Name[ar]=���������� ��������������
diff --git a/konqueror/sidebar/trees/init/system.desktop b/konqueror/sidebar/trees/init/system.desktop
index 9e87b04..a3260e0 100644
--- a/konqueror/sidebar/trees/init/system.desktop
+++ b/konqueror/sidebar/trees/init/system.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Link
URL=system:/
-Icon=system
+Icon=computer
Name=System
Name[af]=Stelsel
Name[ar]=������������
diff --git a/tdeioslave/cgi/kcmcgi/kcmcgi.desktop b/tdeioslave/cgi/kcmcgi/kcmcgi.desktop
index 986d06c..5209583 100644
--- a/tdeioslave/cgi/kcmcgi/kcmcgi.desktop
+++ b/tdeioslave/cgi/kcmcgi/kcmcgi.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=system-run
+Icon=computer-run
Type=Application
Exec=tdecmshell kcmcgi
X-DocPath=kcontrol/kcmcgi/index.html
diff --git a/tdeioslave/media/media.protocol b/tdeioslave/media/media.protocol
index 9a2ff82..45dcd7a 100644
--- a/tdeioslave/media/media.protocol
+++ b/tdeioslave/media/media.protocol
@@ -10,7 +10,7 @@
deleting=true
linking=true
moving=true
-Icon=system
+Icon=computer
maxInstances=4
X-DocPath=tdeioslave/media/index.html
Class=:local
diff --git a/tdeioslave/media/mimetypes/mycomputer.desktop b/tdeioslave/media/mimetypes/mycomputer.desktop
index 886d95a..7e36089 100644
--- a/tdeioslave/media/mimetypes/mycomputer.desktop
+++ b/tdeioslave/media/mimetypes/mycomputer.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=system
+Icon=computer
Type=MimeType
MimeType=media/builtin-mycomputer
Comment=My Computer
diff --git a/tdeioslave/media/tdecmodule/media.desktop b/tdeioslave/media/tdecmodule/media.desktop
index 0076038..badfc48 100644
--- a/tdeioslave/media/tdecmodule/media.desktop
+++ b/tdeioslave/media/tdecmodule/media.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
X-DocPath=kcontrol/media/index.html
-Icon=system
+Icon=computer
Exec=tdecmshell media
X-TDE-Library=media
X-TDE-FactoryName=media
diff --git a/tdeioslave/system/entries/media.desktop b/tdeioslave/system/entries/media.desktop
index 8ad8392..107ea95 100644
--- a/tdeioslave/system/entries/media.desktop
+++ b/tdeioslave/system/entries/media.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Link
URL=media:/
-Icon=system
+Icon=computer
Name=Storage Media
Name[af]=Stoor Media
Name[ar]=���������� ��������������
diff --git a/tdeioslave/system/system.protocol b/tdeioslave/system/system.protocol
index a32fd45..62eea06 100644
--- a/tdeioslave/system/system.protocol
+++ b/tdeioslave/system/system.protocol
@@ -10,7 +10,7 @@
deleting=true
linking=true
moving=true
-Icon=system
+Icon=computer
maxInstances=4
X-DocPath=tdeioslave/system/index.html
Class=:local
diff --git a/tdeioslave/system/systemimpl.cpp b/tdeioslave/system/systemimpl.cpp
index 2cd8226..21a9da7 100644
--- a/tdeioslave/system/systemimpl.cpp
+++ b/tdeioslave/system/systemimpl.cpp
@@ -204,7 +204,7 @@
addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR);
addAtom(entry, TDEIO::UDS_ACCESS, 0555);
addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/system_directory");
- addAtom(entry, TDEIO::UDS_ICON_NAME, 0, "system");
+ addAtom(entry, TDEIO::UDS_ICON_NAME, 0, "computer");
}
TQString SystemImpl::readPathINL(TQString filename)
|
||