-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 27 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmData.cpp | 29 |
2 files changed, 26 insertions, 30 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index 979549d..828f5a1 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp | |||
@@ -15,3 +15,3 @@ | |||
15 | #include <opie2/odebug.h> | 15 | #include <opie2/odebug.h> |
16 | 16 | #include <opie2/oresource.h> | |
17 | #include <opie2/ostorageinfo.h> | 17 | #include <opie2/ostorageinfo.h> |
@@ -22,3 +22,2 @@ | |||
22 | #include <qpe/applnk.h> | 22 | #include <qpe/applnk.h> |
23 | #include <qpe/resource.h> | ||
24 | #include <qpe/menubutton.h> | 23 | #include <qpe/menubutton.h> |
@@ -46,3 +45,3 @@ AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags ) | |||
46 | whichTab = 1; | 45 | whichTab = 1; |
47 | unknownXpm = Resource::loadImage("UnknownDocument").smoothScale(AppLnk::smallIconSize(),AppLnk::smallIconSize() ); | 46 | unknownXpm = Opie::Core::OResource::loadImage("UnknownDocument", Opie::Core::OResource::SmallIcon); |
48 | 47 | ||
@@ -138,8 +137,8 @@ void AdvancedFm::populateView() { | |||
138 | if( !QDir( fi->filePath() ).isReadable()) //is directory | 137 | if( !QDir( fi->filePath() ).isReadable()) //is directory |
139 | pm.convertFromImage( Resource::loadImage( "lockedfolder" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | 138 | pm = Opie::Core::OResource::loadPixmap( "lockedfolder", Opie::Core::OResource::SmallIcon ); |
140 | else | 139 | else |
141 | pm.convertFromImage( Resource::loadImage( "folder" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | 140 | pm = Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ); |
142 | } | 141 | } |
143 | else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) { | 142 | else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) { |
144 | pm.convertFromImage( Resource::loadImage( "exec" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | 143 | pm = Opie::Core::OResource::loadPixmap( "exec", Opie::Core::OResource::SmallIcon ); |
145 | } | 144 | } |
@@ -148,6 +147,6 @@ void AdvancedFm::populateView() { | |||
148 | | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) { | 147 | | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) { |
149 | pm.convertFromImage( Resource::loadImage( "exec" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | 148 | pm = Opie::Core::OResource::loadPixmap( "exec", Opie::Core::OResource::SmallIcon ); |
150 | } | 149 | } |
151 | else if( !fi->isReadable() ) { | 150 | else if( !fi->isReadable() ) { |
152 | pm.convertFromImage( Resource::loadImage( "locked" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | 151 | pm = Opie::Core::OResource::loadPixmap( "locked", Opie::Core::OResource::SmallIcon ); |
153 | } | 152 | } |
@@ -162,8 +161,3 @@ void AdvancedFm::populateView() { | |||
162 | // odebug << " overlay link image" << oendl; | 161 | // odebug << " overlay link image" << oendl; |
163 | pm.convertFromImage( Resource::loadImage( "advancedfm/symlink" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | 162 | pm = Opie::Core::OResource::loadPixmap( "advancedfm/symlink", Opie::Core::OResource::SmallIcon ); |
164 | // pm= Resource::loadPixmap( "folder" ); | ||
165 | // QPixmap lnk = Resource::loadPixmap( "opie/symlink" ); | ||
166 | // QPainter painter( &pm ); | ||
167 | // painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk ); | ||
168 | // pm.setMask( pm.createHeuristicMask( FALSE ) ); | ||
169 | } | 163 | } |
@@ -462,3 +456,4 @@ void AdvancedFm::showFileMenu() { | |||
462 | m->insertItem(tr("Execute"),this,SLOT(runThis())); | 456 | m->insertItem(tr("Execute"),this,SLOT(runThis())); |
463 | m->insertItem(Resource::loadPixmap("txt"),tr("Open as text"),this,SLOT(runText())); | 457 | m->insertItem( Opie::Core::OResource::loadPixmap( "txt", Opie::Core::OResource::SmallIcon ), |
458 | tr("Open as text"),this,SLOT(runText())); | ||
464 | } | 459 | } |
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp index b43d2ba..aa9db52 100644 --- a/noncore/apps/advancedfm/advancedfmData.cpp +++ b/noncore/apps/advancedfm/advancedfmData.cpp | |||
@@ -15,2 +15,3 @@ | |||
15 | #include <opie2/odebug.h> | 15 | #include <opie2/odebug.h> |
16 | #include <opie2/oresource.h> | ||
16 | #include <qpe/applnk.h> | 17 | #include <qpe/applnk.h> |
@@ -18,3 +19,2 @@ | |||
18 | #include <qpe/qpeapplication.h> | 19 | #include <qpe/qpeapplication.h> |
19 | #include <qpe/resource.h> | ||
20 | #include <qpe/menubutton.h> | 20 | #include <qpe/menubutton.h> |
@@ -54,6 +54,7 @@ void AdvancedFm::init() { | |||
54 | 54 | ||
55 | QPixmap pm; | 55 | bool useBigIcon = qApp->desktop()->size().width() > 330; |
56 | |||
56 | cdUpButton = new QToolButton( 0,"cdUpButton"); | 57 | cdUpButton = new QToolButton( 0,"cdUpButton"); |
57 | pm.convertFromImage( Resource::loadImage( "up" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | 58 | cdUpButton->setUsesBigPixmap( useBigIcon ); |
58 | cdUpButton->setPixmap( pm ); | 59 | cdUpButton->setPixmap( Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ) ); |
59 | cdUpButton->setAutoRaise( true ); | 60 | cdUpButton->setAutoRaise( true ); |
@@ -62,4 +63,4 @@ void AdvancedFm::init() { | |||
62 | qpeDirButton= new QToolButton( 0,"QPEButton"); | 63 | qpeDirButton= new QToolButton( 0,"QPEButton"); |
63 | pm.convertFromImage( Resource::loadImage( "logo/opielogo" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | 64 | qpeDirButton->setUsesBigPixmap( useBigIcon ); |
64 | qpeDirButton->setPixmap( pm );//,"",this,"QPEButton"); | 65 | qpeDirButton->setPixmap( Opie::Core::OResource::loadPixmap( "logo/opielogo", Opie::Core::OResource::SmallIcon ) ); |
65 | qpeDirButton->setAutoRaise( true ); | 66 | qpeDirButton->setAutoRaise( true ); |
@@ -68,4 +69,4 @@ void AdvancedFm::init() { | |||
68 | cfButton = new QToolButton( 0, "CFButton"); | 69 | cfButton = new QToolButton( 0, "CFButton"); |
69 | pm.convertFromImage( Resource::loadImage( "cardmon/pcmcia" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | 70 | cfButton->setUsesBigPixmap( useBigIcon ); |
70 | cfButton->setPixmap( pm ); | 71 | cfButton->setPixmap( Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ) ); |
71 | cfButton->setAutoRaise( true ); | 72 | cfButton->setAutoRaise( true ); |
@@ -74,4 +75,4 @@ void AdvancedFm::init() { | |||
74 | sdButton = new QToolButton( 0, "SDButton"); | 75 | sdButton = new QToolButton( 0, "SDButton"); |
75 | pm.convertFromImage( Resource::loadImage( "advancedfm/sdcard" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | 76 | sdButton->setUsesBigPixmap( useBigIcon ); |
76 | sdButton->setPixmap( pm ); | 77 | sdButton->setPixmap( Opie::Core::OResource::loadPixmap( "advancedfm/sdcard", Opie::Core::OResource::SmallIcon ) ); |
77 | sdButton->setAutoRaise( true ); | 78 | sdButton->setAutoRaise( true ); |
@@ -80,4 +81,4 @@ void AdvancedFm::init() { | |||
80 | docButton = new QToolButton( 0,"docsButton"); | 81 | docButton = new QToolButton( 0,"docsButton"); |
81 | pm.convertFromImage( Resource::loadImage( "DocsIcon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | 82 | docButton->setUsesBigPixmap( useBigIcon ); |
82 | docButton->setPixmap( pm ); | 83 | docButton->setPixmap( Opie::Core::OResource::loadPixmap( "DocsIcon", Opie::Core::OResource::SmallIcon ) ); |
83 | docButton->setAutoRaise( true ); | 84 | docButton->setAutoRaise( true ); |
@@ -86,4 +87,4 @@ void AdvancedFm::init() { | |||
86 | homeButton = new QToolButton( 0, "homeButton"); | 87 | homeButton = new QToolButton( 0, "homeButton"); |
87 | pm.convertFromImage( Resource::loadImage( "home" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | 88 | homeButton->setUsesBigPixmap( useBigIcon ); |
88 | homeButton->setPixmap( pm ); | 89 | homeButton->setPixmap( Opie::Core::OResource::loadPixmap( "home", Opie::Core::OResource::SmallIcon ) ); |
89 | homeButton->setAutoRaise( true ); | 90 | homeButton->setAutoRaise( true ); |