Browse Source

Fix exec icon location and bring it into XDG compliance

pull/2/head
Timothy Pearson 8 years ago
parent
commit
50b6f1f60f
  1. 2
      kcontrol/icons/iconthemes.cpp
  2. 4
      kdcop/kdcopwindow.cpp
  3. 2
      kdesktop/init/Templates/Program.desktop
  4. 2
      kdesktop/init/Templates/linkProgram.desktop
  5. 2
      kdesktop/minicli.cpp
  6. 2
      kdesktop/startupid.cpp
  7. 2
      kicker/applets/run/runapplet.desktop
  8. 2
      kicker/kicker/buttons/exec.desktop
  9. 2
      kicker/kicker/buttons/nontdeappbutton.h
  10. 2
      kicker/kicker/buttons/servicebutton.h
  11. 2
      kicker/kicker/core/container_button.h
  12. 2
      kicker/kicker/ui/browser_mnu.cpp
  13. 2
      kicker/kicker/ui/exe_dlg.cpp
  14. 2
      kicker/kicker/ui/service_mnu.cpp
  15. 6
      klipper/configdialog.cpp
  16. 2
      ksplashml/themeengine/objkstheme.cpp
  17. 2
      twin/useractions.cpp

2
kcontrol/icons/iconthemes.cpp

@ -62,7 +62,7 @@ IconThemesConfig::IconThemesConfig(TQWidget *parent, const char *name)
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);

4
kdcop/kdcopwindow.cpp

@ -114,7 +114,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem
{
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 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
new TDEAction
(
i18n("&Execute"),
"exec",
"application-x-executable",
CTRL + Key_E,
TQT_TQOBJECT(this),
TQT_SLOT(slotCallFunction()),

2
kdesktop/init/Templates/Program.desktop

@ -1,6 +1,6 @@
[Desktop Entry]
Exec=
Icon=exec
Icon=application-x-executable
Path=
Terminal=false
Type=Application

2
kdesktop/init/Templates/linkProgram.desktop

@ -148,6 +148,6 @@ Comment[xh]=Ikhonkco Elitsha Lwesicelo
Comment[zh_CN]=新建应用程序链接
Comment[zh_TW]=新建應用程式連結
Comment[zu]=Isixhumanisi esisha esiya kumyaleli
Icon=exec
Icon=application-x-executable
Type=Link
URL=.source/Program.desktop

2
kdesktop/minicli.cpp

@ -849,7 +849,7 @@ void Minicli::setIcon ()
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;

2
kdesktop/startupid.cpp

@ -182,7 +182,7 @@ void StartupId::start_startupid( const TQString& icon_P )
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 );

2
kicker/applets/run/runapplet.desktop

@ -125,6 +125,6 @@ Comment[vi]=Chạy một lệnh đơn mà không cần mở một thiết bị
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

2
kicker/kicker/buttons/exec.desktop

@ -121,5 +121,5 @@ Comment[vi]=Trình khởi động các chương trình không có trong thực
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

2
kicker/kicker/buttons/nontdeappbutton.h

@ -75,7 +75,7 @@ protected:
// 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);

2
kicker/kicker/buttons/servicebutton.h

@ -56,7 +56,7 @@ protected:
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;

2
kicker/kicker/core/container_button.h

@ -176,7 +176,7 @@ public:
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"); }
};

2
kicker/kicker/ui/browser_mnu.cpp

@ -548,7 +548,7 @@ void PanelBrowserMenu::initIconMap()
_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"));
}

2
kicker/kicker/ui/exe_dlg.cpp

@ -50,7 +50,7 @@ PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& descriptio
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"));

2
kicker/kicker/ui/service_mnu.cpp

@ -377,7 +377,7 @@ void PanelServiceMenu::doInitialize()
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()));
}

6
klipper/configdialog.cpp

@ -260,7 +260,7 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget,
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 @@ void ActionWidget::slotContextMenu( TDEListView *, TQListViewItem *item,
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 @@ void ActionWidget::slotItemChanged( TQListViewItem *item, const TQPoint&, int co
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()

2
ksplashml/themeengine/objkstheme.cpp

@ -116,7 +116,7 @@ bool ObjKsTheme::loadTDEConfig( TDEConfig *cfg, const TQString& activeTheme, boo
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" ) );

2
twin/useractions.cpp

@ -70,7 +70,7 @@ TQPopupMenu* Workspace::clientPopup()
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 );

Loading…
Cancel
Save