summaryrefslogtreecommitdiff
authordrw <drw>2005-03-21 16:53:48 (UTC)
committer drw <drw>2005-03-21 16:53:48 (UTC)
commit958b13474d09d8cdf1f018abc1f48f80d24bf22f (patch) (unidiff)
tree21e8ff75ad792124b407d7dda543bc4349254dc9
parentbe3e262e107a8592a478f7c4114d2a54395885a5 (diff)
downloadopie-958b13474d09d8cdf1f018abc1f48f80d24bf22f.zip
opie-958b13474d09d8cdf1f018abc1f48f80d24bf22f.tar.gz
opie-958b13474d09d8cdf1f018abc1f48f80d24bf22f.tar.bz2
Fix for bug #1613 - scale toolbar icons
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfmData.cpp20
1 files changed, 14 insertions, 6 deletions
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index 3664c75..b43d2ba 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -10,12 +10,13 @@
10 * (at your option) any later version. * 10 * (at your option) any later version. *
11 ***************************************************************************/ 11 ***************************************************************************/
12#include "advancedfm.h" 12#include "advancedfm.h"
13 13
14/* OPIE */ 14/* OPIE */
15#include <opie2/odebug.h> 15#include <opie2/odebug.h>
16#include <qpe/applnk.h>
16#include <qpe/storage.h> 17#include <qpe/storage.h>
17#include <qpe/qpeapplication.h> 18#include <qpe/qpeapplication.h>
18#include <qpe/resource.h> 19#include <qpe/resource.h>
19#include <qpe/menubutton.h> 20#include <qpe/menubutton.h>
20using namespace Opie::Core; 21using namespace Opie::Core;
21using namespace Opie::Ui; 22using namespace Opie::Ui;
@@ -48,39 +49,46 @@ void AdvancedFm::init() {
48 49
49 layout->addWidget( menuBar ); 50 layout->addWidget( menuBar );
50 51
51 menuBar->insertItem( tr( "File" ), fileMenu); 52 menuBar->insertItem( tr( "File" ), fileMenu);
52 menuBar->insertItem( tr( "View" ), viewMenu); 53 menuBar->insertItem( tr( "View" ), viewMenu);
53 54
55 QPixmap pm;
54 cdUpButton = new QToolButton( 0,"cdUpButton"); 56 cdUpButton = new QToolButton( 0,"cdUpButton");
55 cdUpButton->setPixmap(Resource::loadPixmap("up")); 57 pm.convertFromImage( Resource::loadImage( "up" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
58 cdUpButton->setPixmap( pm );
56 cdUpButton->setAutoRaise( true ); 59 cdUpButton->setAutoRaise( true );
57 menuBar->insertItem( cdUpButton ); 60 menuBar->insertItem( cdUpButton );
58 61
59 qpeDirButton= new QToolButton( 0,"QPEButton"); 62 qpeDirButton= new QToolButton( 0,"QPEButton");
60 qpeDirButton->setPixmap( Resource::loadPixmap("launcher/opielogo16x16"));//,"",this,"QPEButton"); 63 pm.convertFromImage( Resource::loadImage( "logo/opielogo" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
64 qpeDirButton->setPixmap( pm );//,"",this,"QPEButton");
61 qpeDirButton->setAutoRaise( true ); 65 qpeDirButton->setAutoRaise( true );
62 menuBar->insertItem( qpeDirButton ); 66 menuBar->insertItem( qpeDirButton );
63 67
64 cfButton = new QToolButton( 0, "CFButton"); 68 cfButton = new QToolButton( 0, "CFButton");
65 cfButton->setPixmap(Resource::loadPixmap("cardmon/pcmcia")); 69 pm.convertFromImage( Resource::loadImage( "cardmon/pcmcia" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
70 cfButton->setPixmap( pm );
66 cfButton->setAutoRaise( true ); 71 cfButton->setAutoRaise( true );
67 menuBar->insertItem( cfButton ); 72 menuBar->insertItem( cfButton );
68 73
69 sdButton = new QToolButton( 0, "SDButton"); 74 sdButton = new QToolButton( 0, "SDButton");
70 sdButton->setPixmap(Resource::loadPixmap("advancedfm/sdcard")); 75 pm.convertFromImage( Resource::loadImage( "advancedfm/sdcard" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
76 sdButton->setPixmap( pm );
71 sdButton->setAutoRaise( true ); 77 sdButton->setAutoRaise( true );
72 menuBar->insertItem( sdButton ); 78 menuBar->insertItem( sdButton );
73 79
74 docButton = new QToolButton( 0,"docsButton"); 80 docButton = new QToolButton( 0,"docsButton");
75 docButton->setPixmap(Resource::loadPixmap("DocsIcon")); 81 pm.convertFromImage( Resource::loadImage( "DocsIcon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
82 docButton->setPixmap( pm );
76 docButton->setAutoRaise( true ); 83 docButton->setAutoRaise( true );
77 menuBar->insertItem( docButton ); 84 menuBar->insertItem( docButton );
78 85
79 homeButton = new QToolButton( 0, "homeButton"); 86 homeButton = new QToolButton( 0, "homeButton");
80 homeButton->setPixmap(Resource::loadPixmap("home")); 87 pm.convertFromImage( Resource::loadImage( "home" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
88 homeButton->setPixmap( pm );
81 homeButton->setAutoRaise( true ); 89 homeButton->setAutoRaise( true );
82 menuBar->insertItem( homeButton ); 90 menuBar->insertItem( homeButton );
83 91
84 fileMenu->insertItem( tr( "Show Hidden Files" ), this, SLOT( showMenuHidden() )); 92 fileMenu->insertItem( tr( "Show Hidden Files" ), this, SLOT( showMenuHidden() ));
85 fileMenu->setItemChecked( fileMenu->idAt(0),TRUE); 93 fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
86 fileMenu->insertSeparator(); 94 fileMenu->insertSeparator();