Bring package_development, package_games, package_graphics, package_network, package_multimedia, package_wordprocessing, edu_science, package_utilities, input_devices_settings, kcmsystem, personal, and looknfeel icons into XDG compliance

pull/16/head
Timothy Pearson 10 years ago
parent 96608b99bf
commit e1ff3591ff

@ -4115,10 +4115,10 @@ TQPixmap TDEHardwareDevices::getDeviceTypeIconFromType(TDEGenericDeviceType::TDE
ret = DesktopIcon("kcmpci", size); ret = DesktopIcon("kcmpci", size);
} }
else if (query == TDEGenericDeviceType::I2C) { else if (query == TDEGenericDeviceType::I2C) {
ret = DesktopIcon("input_devices_settings", size); ret = DesktopIcon("preferences-desktop-peripherals", size);
} }
else if (query == TDEGenericDeviceType::MDIO) { else if (query == TDEGenericDeviceType::MDIO) {
ret = DesktopIcon("input_devices_settings", size); ret = DesktopIcon("preferences-desktop-peripherals", size);
} }
else if (query == TDEGenericDeviceType::Mainboard) { else if (query == TDEGenericDeviceType::Mainboard) {
ret = DesktopIcon("kcmpci", size); // FIXME ret = DesktopIcon("kcmpci", size); // FIXME
@ -4172,10 +4172,10 @@ TQPixmap TDEHardwareDevices::getDeviceTypeIconFromType(TDEGenericDeviceType::TDE
ret = DesktopIcon("camera-photo", size); ret = DesktopIcon("camera-photo", size);
} }
else if (query == TDEGenericDeviceType::Serial) { else if (query == TDEGenericDeviceType::Serial) {
ret = DesktopIcon("input_devices_settings", size); ret = DesktopIcon("preferences-desktop-peripherals", size);
} }
else if (query == TDEGenericDeviceType::Parallel) { else if (query == TDEGenericDeviceType::Parallel) {
ret = DesktopIcon("input_devices_settings", size); ret = DesktopIcon("preferences-desktop-peripherals", size);
} }
else if (query == TDEGenericDeviceType::TextIO) { else if (query == TDEGenericDeviceType::TextIO) {
ret = DesktopIcon("chardevice", size); ret = DesktopIcon("chardevice", size);
@ -4208,19 +4208,19 @@ TQPixmap TDEHardwareDevices::getDeviceTypeIconFromType(TDEGenericDeviceType::TDE
ret = DesktopIcon("kcmpci", size); ret = DesktopIcon("kcmpci", size);
} }
else if (query == TDEGenericDeviceType::Platform) { else if (query == TDEGenericDeviceType::Platform) {
ret = DesktopIcon("kcmsystem", size); ret = DesktopIcon("preferences-system", size);
} }
else if (query == TDEGenericDeviceType::Cryptography) { else if (query == TDEGenericDeviceType::Cryptography) {
ret = DesktopIcon("password", size); ret = DesktopIcon("password", size);
} }
else if (query == TDEGenericDeviceType::Event) { else if (query == TDEGenericDeviceType::Event) {
ret = DesktopIcon("kcmsystem", size); ret = DesktopIcon("preferences-system", size);
} }
else if (query == TDEGenericDeviceType::Input) { else if (query == TDEGenericDeviceType::Input) {
ret = DesktopIcon("kcmsystem", size); ret = DesktopIcon("preferences-system", size);
} }
else if (query == TDEGenericDeviceType::PNP) { else if (query == TDEGenericDeviceType::PNP) {
ret = DesktopIcon("kcmsystem", size); ret = DesktopIcon("preferences-system", size);
} }
else if (query == TDEGenericDeviceType::OtherACPI) { else if (query == TDEGenericDeviceType::OtherACPI) {
ret = DesktopIcon("kcmdevices", size); // FIXME ret = DesktopIcon("kcmdevices", size); // FIXME
@ -4238,7 +4238,7 @@ TQPixmap TDEHardwareDevices::getDeviceTypeIconFromType(TDEGenericDeviceType::TDE
ret = DesktopIcon("kcmdevices", size); // FIXME ret = DesktopIcon("kcmdevices", size); // FIXME
} }
else if (query == TDEGenericDeviceType::OtherVirtual) { else if (query == TDEGenericDeviceType::OtherVirtual) {
ret = DesktopIcon("kcmsystem", size); ret = DesktopIcon("preferences-system", size);
} }
else { else {
ret = DesktopIcon("hwinfo", size); ret = DesktopIcon("hwinfo", size);

@ -272,8 +272,8 @@ void KMJobViewer::initActions()
TDEToggleAction *tact = new TDEToggleAction(i18n("&Toggle Completed Jobs"),"history",0,actionCollection(),"view_completed"); TDEToggleAction *tact = new TDEToggleAction(i18n("&Toggle Completed Jobs"),"history",0,actionCollection(),"view_completed");
tact->setEnabled(m_manager->actions() & KMJob::ShowCompleted); tact->setEnabled(m_manager->actions() & KMJob::ShowCompleted);
connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowCompleted(bool))); connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowCompleted(bool)));
TDEToggleAction *uact = new TDEToggleAction(i18n("Show Only User Jobs"), "personal", 0, actionCollection(), "view_user_jobs"); TDEToggleAction *uact = new TDEToggleAction(i18n("Show Only User Jobs"), "preferences-desktop-personal", 0, actionCollection(), "view_user_jobs");
uact->setCheckedState(KGuiItem(i18n("Hide Only User Jobs"),"personal")); uact->setCheckedState(KGuiItem(i18n("Hide Only User Jobs"),"preferences-desktop-personal"));
connect(uact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotUserOnly(bool))); connect(uact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotUserOnly(bool)));
m_userfield = new TQLineEdit(0); m_userfield = new TQLineEdit(0);
m_userfield->setText(getenv("USER")); m_userfield->setText(getenv("USER"));

@ -227,7 +227,7 @@ void KMMainView::initActions()
tact->setChecked(KMManager::self()->isFilterEnabled()); tact->setChecked(KMManager::self()->isFilterEnabled());
connect(tact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool))); connect(tact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool)));
TDEActionMenu *mact = new TDEActionMenu(i18n("Pri&nter Tools"), "package_utilities", m_actions, "printer_tool"); TDEActionMenu *mact = new TDEActionMenu(i18n("Pri&nter Tools"), "applications-utilities", m_actions, "printer_tool");
mact->setDelayed(false); mact->setDelayed(false);
connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int))); connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int)));
TQStringList files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop"); TQStringList files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop");

@ -59,7 +59,7 @@ KMWLocal::KMWLocal(TQWidget *parent, const char *name)
m_parents[2] = new TQListViewItem(root, m_parents[1], i18n("USB")); m_parents[2] = new TQListViewItem(root, m_parents[1], i18n("USB"));
m_parents[3] = new TQListViewItem(root, m_parents[2], i18n("Others")); m_parents[3] = new TQListViewItem(root, m_parents[2], i18n("Others"));
for (int i=0;i<4;i++) for (int i=0;i<4;i++)
m_parents[i]->setPixmap(0, SmallIcon("input_devices_settings")); m_parents[i]->setPixmap(0, SmallIcon("preferences-desktop-peripherals"));
TQLabel *l2 = new TQLabel(i18n("<p>Select a valid detected port, or enter directly the corresponding URI in the bottom edit field.</p>"), this); TQLabel *l2 = new TQLabel(i18n("<p>Select a valid detected port, or enter directly the corresponding URI in the bottom edit field.</p>"), this);
TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, 10); TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, 10);

Loading…
Cancel
Save