Fix minicli icon preview

pull/16/head
Timothy Pearson 14 years ago
parent 6d74bae8a1
commit 5a2639a63a

@ -188,6 +188,8 @@ TQString KURIFilterData::iconName()
m_strIconName = exeName; m_strIconName = exeName;
else { else {
// not found, try to load from elf file (if supported) // not found, try to load from elf file (if supported)
// otherwise use default
m_strIconName = TQString::fromLatin1("exec");
#ifdef HAVE_ELFICON #ifdef HAVE_ELFICON
// Check for an embedded icon // Check for an embedded icon
unsigned int icon_size; unsigned int icon_size;
@ -244,27 +246,26 @@ TQString KURIFilterData::iconName()
} }
} }
if ((iconresnamefound == 0) && (icon)) { if (libr_can_continue == 1) {
// Extract the embedded icon if ((iconresnamefound == 0) && (icon)) {
size_t icon_data_length; // Extract the embedded icon
char* icondata = libr_icon_malloc(icon, &icon_data_length); size_t icon_data_length;
m_customIconPixmap.loadFromData(static_cast<uchar*>(static_cast<void*>(icondata)), icon_data_length); // EVIL CAST char* icondata = libr_icon_malloc(icon, &icon_data_length);
if (icon_size != 0) { m_customIconPixmap.loadFromData(static_cast<uchar*>(static_cast<void*>(icondata)), icon_data_length); // EVIL CAST
TQImage ip = m_customIconPixmap.convertToImage(); if (icon_size != 0) {
ip = ip.smoothScale(icon_size, icon_size); TQImage ip = m_customIconPixmap.convertToImage();
m_customIconPixmap.convertFromImage(ip); ip = ip.smoothScale(icon_size, icon_size);
m_customIconPixmap.convertFromImage(ip);
}
free(icondata);
libr_icon_close(icon);
} }
free(icondata);
libr_icon_close(icon);
}
libr_close(handle); libr_close(handle);
}
} }
} }
#endif // HAVE_ELFICON #endif // HAVE_ELFICON
// not found, use default
m_strIconName = TQString::fromLatin1("exec");
} }
break; break;
} }

Loading…
Cancel
Save