TDE
/
tdenetworkmanager
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdenetworkmanager
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KIcon to enhance compatibility with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 87637dc2c2
commit 4387b2d786
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

12
tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp
Unescape View File

@ -54,18 +54,18 @@ class NetworkListViewItem : public TDEListViewItem
{ {
TQ_UINT8 strength = net.getStrength(); TQ_UINT8 strength = net.getStrength();
if (strength > 80) if (strength > 80)
setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_100", KIcon::Small)); setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_100", TDEIcon::Small));
else if (strength > 55) else if (strength > 55)
setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_75", KIcon::Small)); setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_75", TDEIcon::Small));
else if (strength > 30) else if (strength > 30)
setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_50", KIcon::Small)); setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_50", TDEIcon::Small));
else if (strength > 5) else if (strength > 5)
setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_25", KIcon::Small)); setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_25", TDEIcon::Small));
else else
setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_00", KIcon::Small)); setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_00", TDEIcon::Small));
if (net.isEncrypted()) if (net.isEncrypted())
setPixmap(2, TDEGlobal::iconLoader()->loadIcon("lock", KIcon::Small)); setPixmap(2, TDEGlobal::iconLoader()->loadIcon("lock", TDEIcon::Small));
} }
WirelessNetwork _net; WirelessNetwork _net;

4
tdenetworkmanager/src/devicetraycomponent.cpp
Unescape View File

@ -180,10 +180,10 @@ TQMovie DeviceTrayComponent::movieForState(TDENetworkConnectionStatus::TDENetwor
} }
} }
if (m_tray) { if (m_tray) {
return TQMovie(TDEGlobal::iconLoader()->moviePath(moviePath, KIcon::Panel, m_tray->width())); return TQMovie(TDEGlobal::iconLoader()->moviePath(moviePath, TDEIcon::Panel, m_tray->width()));
} }
else { else {
return TQMovie(TDEGlobal::iconLoader()->moviePath(moviePath, KIcon::Panel)); return TQMovie(TDEGlobal::iconLoader()->moviePath(moviePath, TDEIcon::Panel));
} }
} }
else { else {

20
tdenetworkmanager/src/tdenetman-connection_editor.cpp
Unescape View File

@ -69,16 +69,16 @@ class ConnectionListViewItem : public TDEListViewItem
setText(1, TDENetworkConnectionManager::friendlyConnectionTypeName(conn->type())); setText(1, TDENetworkConnectionManager::friendlyConnectionTypeName(conn->type()));
// TODO: Move to a Factory // TODO: Move to a Factory
if (conn->type() == TDENetworkConnectionType::WiredEthernet) { if (conn->type() == TDENetworkConnectionType::WiredEthernet) {
setPixmap(0, TDEGlobal::iconLoader()->loadIcon("wired", KIcon::Small)); setPixmap(0, TDEGlobal::iconLoader()->loadIcon("wired", TDEIcon::Small));
} }
else if (conn->type() == TDENetworkConnectionType::WiFi) { else if (conn->type() == TDENetworkConnectionType::WiFi) {
setPixmap(0, TDEGlobal::iconLoader()->loadIcon("wireless", KIcon::Small)); setPixmap(0, TDEGlobal::iconLoader()->loadIcon("wireless", TDEIcon::Small));
} }
else if (conn->type() == TDENetworkConnectionType::VPN) { else if (conn->type() == TDENetworkConnectionType::VPN) {
setPixmap(0, TDEGlobal::iconLoader()->loadIcon("encrypted", KIcon::Small)); setPixmap(0, TDEGlobal::iconLoader()->loadIcon("encrypted", TDEIcon::Small));
} }
else { else {
setPixmap(0, TDEGlobal::iconLoader()->loadIcon("help", KIcon::Small)); setPixmap(0, TDEGlobal::iconLoader()->loadIcon("help", TDEIcon::Small));
} }
} }
} }
@ -101,17 +101,17 @@ ConnectionEditorImpl::ConnectionEditorImpl(TQWidget* parent, const char* name, b
// pbEdit->hide(); // pbEdit->hide();
pbNew->setIconSet(TDEGlobal::iconLoader()->loadIcon("add", KIcon::Small)); pbNew->setIconSet(TDEGlobal::iconLoader()->loadIcon("add", TDEIcon::Small));
pbDelete->setIconSet(TDEGlobal::iconLoader()->loadIcon("remove", KIcon::Small)); pbDelete->setIconSet(TDEGlobal::iconLoader()->loadIcon("remove", TDEIcon::Small));
pbEdit->setIconSet(TDEGlobal::iconLoader()->loadIcon("edit", KIcon::Small)); pbEdit->setIconSet(TDEGlobal::iconLoader()->loadIcon("edit", TDEIcon::Small));
TQPopupMenu* popup = new TQPopupMenu(pbNew); TQPopupMenu* popup = new TQPopupMenu(pbNew);
// TODO: move to a factory class // TODO: move to a factory class
popup->insertItem(TDEGlobal::iconLoader()->loadIcon("wireless", KIcon::Small), i18n("Wireless"), this, TQT_SLOT(slotNewWirelessConnection())); popup->insertItem(TDEGlobal::iconLoader()->loadIcon("wireless", TDEIcon::Small), i18n("Wireless"), this, TQT_SLOT(slotNewWirelessConnection()));
popup->insertItem(TDEGlobal::iconLoader()->loadIcon("wired", KIcon::Small), i18n("Wired"), this, TQT_SLOT(slotNewWiredConnection())); popup->insertItem(TDEGlobal::iconLoader()->loadIcon("wired", TDEIcon::Small), i18n("Wired"), this, TQT_SLOT(slotNewWiredConnection()));
// if (!VPNManager::getVPNServices().isEmpty()) { // if (!VPNManager::getVPNServices().isEmpty()) {
popup->insertItem(TDEGlobal::iconLoader()->loadIcon("encrypted", KIcon::Small), i18n("VPN"), this, TQT_SLOT(slotNewVPNConnection())); popup->insertItem(TDEGlobal::iconLoader()->loadIcon("encrypted", TDEIcon::Small), i18n("VPN"), this, TQT_SLOT(slotNewVPNConnection()));
// } // }
pbNew->setPopup(popup); pbNew->setPopup(popup);

4
tdenetworkmanager/src/tdenetman-tray.cpp
Unescape View File

@ -981,7 +981,7 @@ TQPixmap Tray::pixmapForName(TQString pixmapPath)
TQMovie Tray::movieForName(TQString moviePath) TQMovie Tray::movieForName(TQString moviePath)
{ {
if (moviePath != "") { if (moviePath != "") {
return TQMovie(TDEGlobal::iconLoader()->moviePath(moviePath, KIcon::Panel, width())); return TQMovie(TDEGlobal::iconLoader()->moviePath(moviePath, TDEIcon::Panel, width()));
} }
else { else {
return TQMovie(); return TQMovie();
@ -990,7 +990,7 @@ TQMovie Tray::movieForName(TQString moviePath)
TQByteArray Tray::movieFileData(TQString movieName) { TQByteArray Tray::movieFileData(TQString movieName) {
TQByteArray ret; TQByteArray ret;
TQString fileName = TDEGlobal::iconLoader()->moviePath(movieName, KIcon::Panel, width()); TQString fileName = TDEGlobal::iconLoader()->moviePath(movieName, TDEIcon::Panel, width());
if (fileName != "") { if (fileName != "") {
TQFile file(fileName); TQFile file(fileName);
if (file.exists()) { if (file.exists()) {

2
tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.cpp
Unescape View File

@ -52,7 +52,7 @@ VPNAuthenticationDialog::VPNAuthenticationDialog(TDEVPNConnection* conn, TQWidge
{ {
this->setIcon(SmallIcon("encrypted", TQIconSet::Automatic)); this->setIcon(SmallIcon("encrypted", TQIconSet::Automatic));
this->setCaption(i18n("VPN Authentication for %1").arg(conn->friendlyName)); this->setCaption(i18n("VPN Authentication for %1").arg(conn->friendlyName));
labelPixmap->setPixmap(TDEGlobal::instance()->iconLoader()->loadIcon("encrypted", KIcon::Small, 32)); labelPixmap->setPixmap(TDEGlobal::instance()->iconLoader()->loadIcon("encrypted", TDEIcon::Small, 32));
// nice icons // nice icons
pushOK->setIconSet(SmallIcon("button_ok", TQIconSet::Automatic)); pushOK->setIconSet(SmallIcon("button_ok", TQIconSet::Automatic));

Write Preview
Loading…
Cancel
Save