| 50b6f1f6 | 2014-10-22 14:24:26 | Timothy Pearson |
Fix exec icon location and bring it into XDG compliance |
||
|
M kcontrol/icons/iconthemes.cpp M kdcop/kdcopwindow.cpp M kdesktop/init/Templates/Program.desktop M kdesktop/init/Templates/linkProgram.desktop M kdesktop/minicli.cpp M kdesktop/startupid.cpp M kicker/applets/run/runapplet.desktop M kicker/kicker/buttons/exec.desktop M kicker/kicker/buttons/nontdeappbutton.h M kicker/kicker/buttons/servicebutton.h M kicker/kicker/core/container_button.h M kicker/kicker/ui/browser_mnu.cpp M kicker/kicker/ui/exe_dlg.cpp M kicker/kicker/ui/service_mnu.cpp M klipper/configdialog.cpp M ksplashml/themeengine/objkstheme.cpp M twin/useractions.cpp |
||
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index c75bf5f..826f630 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -62,7 +62,7 @@
TQHBoxLayout *lh2=new TQHBoxLayout( m_preview );
m_previewExec=new TQLabel(m_preview);
- m_previewExec->setPixmap(DesktopIcon("exec"));
+ m_previewExec->setPixmap(DesktopIcon("application-x-executable"));
m_previewFolder=new TQLabel(m_preview);
m_previewFolder->setPixmap(DesktopIcon("folder"));
m_previewDocument=new TQLabel(m_preview);
diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp
index 6cf2457..92e2268 100644
--- a/kdcop/kdcopwindow.cpp
+++ b/kdcop/kdcopwindow.cpp
@@ -114,7 +114,7 @@
{
setExpandable(true);
setText(0, TQString::fromUtf8(app_));
- setPixmap(0, TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "exec" ), TDEIcon::Small ));
+ setPixmap(0, TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "application-x-executable" ), TDEIcon::Small ));
/* Get the icon: we use the icon from a mainwindow in that class.
@@ -323,7 +323,7 @@
new TDEAction
(
i18n("&Execute"),
- "exec",
+ "application-x-executable",
CTRL + Key_E,
TQT_TQOBJECT(this),
TQT_SLOT(slotCallFunction()),
diff --git a/kdesktop/init/Templates/Program.desktop b/kdesktop/init/Templates/Program.desktop
index 263e1a1..9333f3a 100644
--- a/kdesktop/init/Templates/Program.desktop
+++ b/kdesktop/init/Templates/Program.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Exec=
-Icon=exec
+Icon=application-x-executable
Path=
Terminal=false
Type=Application
diff --git a/kdesktop/init/Templates/linkProgram.desktop b/kdesktop/init/Templates/linkProgram.desktop
index 867e9e3..9f31f45 100644
--- a/kdesktop/init/Templates/linkProgram.desktop
+++ b/kdesktop/init/Templates/linkProgram.desktop
@@ -148,6 +148,6 @@
Comment[zh_CN]=������������������������
Comment[zh_TW]=������������������������
Comment[zu]=Isixhumanisi esisha esiya kumyaleli
-Icon=exec
+Icon=application-x-executable
Type=Link
URL=.source/Program.desktop
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index c8149ad..45816da 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -849,7 +849,7 @@
m_iconName = TQString::fromLatin1("kmenu");
TQPixmap icon;
- if ((m_iconName == "exec") && (m_filterData->iconName() == "exec")) {
+ if ((m_iconName == "application-x-executable") && (m_filterData->iconName() == "application-x-executable")) {
TQPixmap potentialIcon = m_filterData->customIconPixmap();
if (!potentialIcon.isNull()) {
icon = potentialIcon;
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index 6dd89b1..4027b7e 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -182,7 +182,7 @@
TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( icon_P, TDEIcon::Small, 0,
TDEIcon::DefaultState, 0, true ); // return null pixmap if not found
if( icon_pixmap.isNull())
- icon_pixmap = SmallIcon( "exec" );
+ icon_pixmap = SmallIcon( "application-x-executable" );
if( startup_widget == NULL )
{
startup_widget = new TQWidget( NULL, NULL, WX11BypassWM );
diff --git a/kicker/applets/run/runapplet.desktop b/kicker/applets/run/runapplet.desktop
index a2d8318..903788f 100644
--- a/kicker/applets/run/runapplet.desktop
+++ b/kicker/applets/run/runapplet.desktop
@@ -125,6 +125,6 @@
Comment[wa]=Lanc�� ene comande seule sins termin��
Comment[zh_CN]=���������������������������������������������
Comment[zh_TW]=���������������������������������������������
-Icon=exec
+Icon=application-x-executable
X-TDE-Library=run_panelapplet
X-TDE-UniqueApplet=true
diff --git a/kicker/kicker/buttons/exec.desktop b/kicker/kicker/buttons/exec.desktop
index 522ba45..85047e0 100644
--- a/kicker/kicker/buttons/exec.desktop
+++ b/kicker/kicker/buttons/exec.desktop
@@ -121,5 +121,5 @@
Comment[wa]=On enondeu po les programes ki n' sont n��n dins l' dress��ye TDE
Comment[zh_CN]=������������ TDE ������������������
Comment[zh_TW]=������������ TDE ���������������������������
-Icon=exec
+Icon=application-x-executable
X-TDE-Library=ExecButton
diff --git a/kicker/kicker/buttons/nontdeappbutton.h b/kicker/kicker/buttons/nontdeappbutton.h
index 0bc3cd9..94c7cb5 100644
--- a/kicker/kicker/buttons/nontdeappbutton.h
+++ b/kicker/kicker/buttons/nontdeappbutton.h
@@ -75,7 +75,7 @@
// reimplemented from PanelButton
virtual TQString tileName() { return "URL"; }
- TQString defaultIcon() const { return "exec"; };
+ TQString defaultIcon() const { return "application-x-executable"; };
// handle drag and drop actions
virtual void dropEvent(TQDropEvent *ev);
diff --git a/kicker/kicker/buttons/servicebutton.h b/kicker/kicker/buttons/servicebutton.h
index 9d17d1f..ac551ad 100644
--- a/kicker/kicker/buttons/servicebutton.h
+++ b/kicker/kicker/buttons/servicebutton.h
@@ -56,7 +56,7 @@
virtual void startDrag();
virtual void dropEvent(TQDropEvent *);
virtual void dragEnterEvent(TQDragEnterEvent *);
- TQString defaultIcon() const { return "exec"; };
+ TQString defaultIcon() const { return "application-x-executable"; };
bool checkForBackingFile();
KService::Ptr _service;
diff --git a/kicker/kicker/core/container_button.h b/kicker/kicker/core/container_button.h
index 9ef4a22..bc24272 100644
--- a/kicker/kicker/core/container_button.h
+++ b/kicker/kicker/core/container_button.h
@@ -176,7 +176,7 @@
const TQString &cmdLine, bool inTerm,
TQPopupMenu* opMenu, TQWidget* parent = 0);
TQString appletType() const { return "ExecButton"; }
- virtual TQString icon() const { return "exec"; }
+ virtual TQString icon() const { return "application-x-executable"; }
virtual TQString visibleName() const { return i18n("Non-TDE Application"); }
};
diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp
index aa0c1fa..6432a1c 100644
--- a/kicker/kicker/ui/browser_mnu.cpp
+++ b/kicker/kicker/ui/browser_mnu.cpp
@@ -548,7 +548,7 @@
_icons->insert("kfm", SmallIcon("kfm"));
_icons->insert("terminal", SmallIcon("terminal"));
_icons->insert("txt", SmallIcon("text-plain"));
- _icons->insert("exec", SmallIcon("exec"));
+ _icons->insert("exec", SmallIcon("application-x-executable"));
_icons->insert("chardevice", SmallIcon("chardevice"));
}
diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp
index 24c42c9..07caa2b 100644
--- a/kicker/kicker/ui/exe_dlg.cpp
+++ b/kicker/kicker/ui/exe_dlg.cpp
@@ -50,7 +50,7 @@
const TQString &cmd, bool inTerm,
TQWidget *parent, const char *name)
: KDialogBase(parent, name, false, i18n("Non-TDE Application Configuration"), Ok|Cancel, Ok, true),
- m_icon(icon.isEmpty() ? "exec" : icon),
+ m_icon(icon.isEmpty() ? "application-x-executable" : icon),
m_iconChanged(false)
{
setCaption(i18n("Non-TDE Application Configuration"));
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 8d79494..b7e0697 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -377,7 +377,7 @@
if (relPath_ == "")
{
- insertItem(KickerLib::menuIconSet("exec"), i18n("Add Non-TDE Application"),
+ insertItem(KickerLib::menuIconSet("application-x-executable"), i18n("Add Non-TDE Application"),
this, TQT_SLOT(addNonKDEApp()));
}
diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp
index 8f22070..66fce6f 100644
--- a/klipper/configdialog.cpp
+++ b/klipper/configdialog.cpp
@@ -260,7 +260,7 @@
ActionListIterator it( *list );
const TQPixmap& doc = SmallIcon( "misc" );
- const TQPixmap& exec = SmallIcon( "exec" );
+ const TQPixmap& exec = SmallIcon( "application-x-executable" );
for ( action = it.current(); action; action = ++it ) {
item = new TQListViewItem( listView, after,
@@ -341,7 +341,7 @@
TQListViewItem *cmdItem = new TQListViewItem( p, item,
i18n("Click here to set the command to be executed"),
i18n("<new command>") );
- cmdItem->setPixmap( 0, SmallIcon( "exec" ) );
+ cmdItem->setPixmap( 0, SmallIcon( "application-x-executable" ) );
}
else if ( id == rmCmd )
delete item;
@@ -355,7 +355,7 @@
return;
ClipCommand command( item->text(0), item->text(1) );
item->setPixmap( 0, SmallIcon( command.pixmap.isEmpty() ?
- "exec" : command.pixmap ) );
+ "application-x-executable" : command.pixmap ) );
}
void ActionWidget::slotAddAction()
diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp
index 4f6e7cf..9de9900 100644
--- a/ksplashml/themeengine/objkstheme.cpp
+++ b/ksplashml/themeengine/objkstheme.cpp
@@ -116,7 +116,7 @@
m_icons.clear();
m_icons.append( cfg->readEntry( "Icon1", "filetypes" ) );
- m_icons.append( cfg->readEntry( "Icon2", "exec" ) );
+ m_icons.append( cfg->readEntry( "Icon2", "application-x-executable" ) );
m_icons.append( cfg->readEntry( "Icon3", "key_bindings" ) );
m_icons.append( cfg->readEntry( "Icon4", "window_list" ) );
m_icons.append( cfg->readEntry( "Icon5", "desktop" ) );
diff --git a/twin/useractions.cpp b/twin/useractions.cpp
index 25a6f03..85e76e4 100644
--- a/twin/useractions.cpp
+++ b/twin/useractions.cpp
@@ -70,7 +70,7 @@
i18n("Window &Shortcut...")+'\t'+keys->shortcut("Setup Window Shortcut").seq(0).toString(), Options::SetupWindowShortcutOp );
advanced_popup->insertSeparator();
advanced_popup->insertItem( SmallIconSet( "suspend" ), i18n("&Suspend Application"), Options::SuspendWindowOp );
- advanced_popup->insertItem( SmallIconSet( "exec" ), i18n("&Resume Application"), Options::ResumeWindowOp );
+ advanced_popup->insertItem( SmallIconSet( "application-x-executable" ), i18n("&Resume Application"), Options::ResumeWindowOp );
advanced_popup->insertSeparator();
advanced_popup->insertItem( SmallIconSet( "wizard" ), i18n("&Special Window Settings..."), Options::WindowRulesOp );
advanced_popup->insertItem( SmallIconSet( "wizard" ), i18n("&Special Application Settings..."), Options::ApplicationRulesOp );
|
||