-rw-r--r-- | noncore/settings/networksettings/mainwindow/mainwindowimp.cpp | 20 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/edit.cpp | 10 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp2.cpp | 4 |
3 files changed, 15 insertions, 19 deletions
diff --git a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp index a7b0bdc..650e634 100644 --- a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp | |||
@@ -11,2 +11,4 @@ | |||
11 | #include <opie2/oprocess.h> | 11 | #include <opie2/oprocess.h> |
12 | #include <opie2/oresource.h> | ||
13 | |||
12 | #include <qpe/applnk.h> | 14 | #include <qpe/applnk.h> |
@@ -16,3 +18,2 @@ | |||
16 | #include <qpe/qlibrary.h> | 18 | #include <qpe/qlibrary.h> |
17 | #include <qpe/resource.h> | ||
18 | 19 | ||
@@ -534,9 +535,3 @@ void MainWindowImp::updateInterface(Interface *i) | |||
534 | // Update the icons and information | 535 | // Update the icons and information |
535 | #ifdef QWS | 536 | item->setPixmap( 0, Opie::Core::OResource::loadPixmap( i->getStatus() ? "up" : "down", Opie::Core::OResource::SmallIcon ) ); |
536 | QPixmap pic; | ||
537 | pic.convertFromImage( Resource::loadImage( i->getStatus() ? "up": "down" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
538 | item->setPixmap(0, ( pic )); | ||
539 | #else | ||
540 | item->setPixmap(0, (SmallIcon(i->getStatus() ? "up": "down"))); | ||
541 | #endif | ||
542 | 537 | ||
@@ -558,7 +553,4 @@ void MainWindowImp::updateInterface(Interface *i) | |||
558 | 553 | ||
559 | #ifdef QWS | 554 | item->setPixmap( 1, ( Opie::Core::OResource::loadPixmap( "networksettings/" + typeName, Opie::Core::OResource::SmallIcon ) ) ); |
560 | item->setPixmap(1, (Resource::loadPixmap(QString("networksettings/") + typeName))); | 555 | |
561 | #else | ||
562 | item->setPixmap(1, (SmallIcon(typeName))); | ||
563 | #endif | ||
564 | item->setText(2, i->getHardwareName()); | 556 | item->setText(2, i->getHardwareName()); |
@@ -784,3 +776,3 @@ void MainWindowImp::initHostname() | |||
784 | 776 | ||
785 | void MainWindowImp::slotHostname(Opie::Core::OProcess *proc, char *buffer, int buflen) | 777 | void MainWindowImp::slotHostname(Opie::Core::OProcess */*proc*/, char *buffer, int buflen) |
786 | { | 778 | { |
diff --git a/noncore/settings/networksettings/ppp/edit.cpp b/noncore/settings/networksettings/ppp/edit.cpp index 6c9735c..0abf161 100644 --- a/noncore/settings/networksettings/ppp/edit.cpp +++ b/noncore/settings/networksettings/ppp/edit.cpp | |||
@@ -31,3 +31,5 @@ | |||
31 | /* OPIE */ | 31 | /* OPIE */ |
32 | #include <qpe/resource.h> | 32 | #include <opie2/oresource.h> |
33 | |||
34 | #include <qpe/applnk.h> | ||
33 | #include <qpe/qpeapplication.h> | 35 | #include <qpe/qpeapplication.h> |
@@ -85,5 +87,7 @@ DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount | |||
85 | up = new QPushButton(this); | 87 | up = new QPushButton(this); |
86 | up->setPixmap( Resource::loadPixmap("up") ); | 88 | up->setPixmap( Opie::Core::OResource::loadPixmap("up", Opie::Core::OResource::SmallIcon) ); |
89 | up->setMinimumHeight( AppLnk::smallIconSize()+4 ); | ||
87 | down = new QPushButton(this); | 90 | down = new QPushButton(this); |
88 | down->setPixmap( Resource::loadPixmap("down") ); | 91 | down->setPixmap( Opie::Core::OResource::loadPixmap("down", Opie::Core::OResource::SmallIcon) ); |
92 | down->setMinimumHeight( AppLnk::smallIconSize()+4 ); | ||
89 | lpn1->addWidget(add); | 93 | lpn1->addWidget(add); |
diff --git a/noncore/settings/networksettings/wlan/wlanimp2.cpp b/noncore/settings/networksettings/wlan/wlanimp2.cpp index 2fd97c3..0c18bcc 100644 --- a/noncore/settings/networksettings/wlan/wlanimp2.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp2.cpp | |||
@@ -14,3 +14,3 @@ | |||
14 | #include <opie2/opcap.h> | 14 | #include <opie2/opcap.h> |
15 | #include <qpe/resource.h> | 15 | #include <opie2/oresource.h> |
16 | using namespace Opie::Core; | 16 | using namespace Opie::Core; |
@@ -604,3 +604,3 @@ void WLANImp::displayFoundNetwork( const QString& mode, int channel, const QStri | |||
604 | name.sprintf( "networksettings/%s", (const char*) mode ); | 604 | name.sprintf( "networksettings/%s", (const char*) mode ); |
605 | item->setPixmap( col_mode, Resource::loadPixmap( name ) ); | 605 | item->setPixmap( col_mode, Opie::Core::OResource::loadPixmap( name, Opie::Core::OResource::SmallIcon ) ); |
606 | qApp->processEvents(); | 606 | qApp->processEvents(); |