summaryrefslogtreecommitdiff
authordrw <drw>2005-06-05 22:41:15 (UTC)
committer drw <drw>2005-06-05 22:41:15 (UTC)
commit56b8917e2cca3715e9a19941965ddd73e6bba5d4 (patch) (unidiff)
tree77f19a696d1cc4568083f38467390b59c5270da2
parent31e8d6aad8220f747113870cfa10261435a2a162 (diff)
downloadopie-56b8917e2cca3715e9a19941965ddd73e6bba5d4.zip
opie-56b8917e2cca3715e9a19941965ddd73e6bba5d4.tar.gz
opie-56b8917e2cca3715e9a19941965ddd73e6bba5d4.tar.bz2
Resource -> OResource
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/packagemanager/entrydlg.cpp8
-rw-r--r--noncore/settings/packagemanager/installdlg.cpp26
-rw-r--r--noncore/settings/packagemanager/mainwindow.cpp38
-rw-r--r--noncore/settings/packagemanager/oipkgconfigdlg.cpp52
-rw-r--r--noncore/settings/packagemanager/packageinfodlg.cpp8
5 files changed, 65 insertions, 67 deletions
diff --git a/noncore/settings/packagemanager/entrydlg.cpp b/noncore/settings/packagemanager/entrydlg.cpp
index 5d61342..1e87e64 100644
--- a/noncore/settings/packagemanager/entrydlg.cpp
+++ b/noncore/settings/packagemanager/entrydlg.cpp
@@ -31,9 +31,9 @@
31#include "entrydlg.h" 31#include "entrydlg.h"
32 32
33#include <opie2/ofiledialog.h> 33#include <opie2/ofiledialog.h>
34#include <opie2/oresource.h>
34 35
35#include <qpe/qpeapplication.h> 36#include <qpe/qpeapplication.h>
36#include <qpe/resource.h>
37 37
38#include <qlabel.h> 38#include <qlabel.h>
39#include <qlayout.h> 39#include <qlayout.h>
@@ -53,9 +53,9 @@ EntryDlg::EntryDlg( const QString &label, QWidget* parent, const char* name, boo
53 layout->addWidget( m_entry, 1, 0 ); 53 layout->addWidget( m_entry, 1, 0 );
54 connect( m_entry, SIGNAL(returnPressed()), this, SLOT(slotTryAccept()) ); 54 connect( m_entry, SIGNAL(returnPressed()), this, SLOT(slotTryAccept()) );
55 55
56 QPixmap pic; 56 QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ),
57 pic.convertFromImage( Resource::loadImage( "folder" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); 57 QString::null, this );
58 QPushButton *btn = new QPushButton( pic, QString::null, this ); 58 btn->setMinimumHeight( AppLnk::smallIconSize()+4 );
59 btn->setMaximumWidth( btn->height() ); 59 btn->setMaximumWidth( btn->height() );
60 connect( btn, SIGNAL(clicked()), this, SLOT(slotSelectPath()) ); 60 connect( btn, SIGNAL(clicked()), this, SLOT(slotSelectPath()) );
61 layout->addWidget( btn, 1, 1 ); 61 layout->addWidget( btn, 1, 1 );
diff --git a/noncore/settings/packagemanager/installdlg.cpp b/noncore/settings/packagemanager/installdlg.cpp
index 205d7ed..15d88ad 100644
--- a/noncore/settings/packagemanager/installdlg.cpp
+++ b/noncore/settings/packagemanager/installdlg.cpp
@@ -31,9 +31,9 @@
31#include "installdlg.h" 31#include "installdlg.h"
32 32
33#include <opie2/ofiledialog.h> 33#include <opie2/ofiledialog.h>
34#include <opie2/oresource.h>
34 35
35#include <qpe/fileselector.h> 36#include <qpe/fileselector.h>
36#include <qpe/resource.h>
37#include <qpe/storage.h> 37#include <qpe/storage.h>
38 38
39#include <qapplication.h> 39#include <qapplication.h>
@@ -130,15 +130,14 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap
130 groupBoxLayout->addWidget( m_output ); 130 groupBoxLayout->addWidget( m_output );
131 layout->addMultiCellWidget( groupBox, 2, 2, 0, 1 ); 131 layout->addMultiCellWidget( groupBox, 2, 2, 0, 1 );
132 132
133 QPixmap pic; 133 m_btnStart = new QPushButton( Opie::Core::OResource::loadPixmap( "packagemanager/apply",
134 pic.convertFromImage( Resource::loadImage( "packagemanager/apply" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); 134 Opie::Core::OResource::SmallIcon ), tr( "Start" ), this );
135 m_btnStart = new QPushButton( pic, tr( "Start" ), this );
136 m_btnStart->setMinimumHeight( AppLnk::smallIconSize() ); 135 m_btnStart->setMinimumHeight( AppLnk::smallIconSize() );
137 layout->addWidget( m_btnStart, 3, 0 ); 136 layout->addWidget( m_btnStart, 3, 0 );
138 connect( m_btnStart, SIGNAL(clicked()), this, SLOT(slotBtnStart()) ); 137 connect( m_btnStart, SIGNAL(clicked()), this, SLOT(slotBtnStart()) );
139 138
140 pic.convertFromImage( Resource::loadImage( "SettingsIcon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); 139 m_btnOptions = new QPushButton( Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ),
141 m_btnOptions = new QPushButton( pic, tr( "Options" ), this ); 140 tr( "Options" ), this );
142 m_btnOptions->setMinimumHeight( AppLnk::smallIconSize() ); 141 m_btnOptions->setMinimumHeight( AppLnk::smallIconSize() );
143 layout->addWidget( m_btnOptions, 3, 1 ); 142 layout->addWidget( m_btnOptions, 3, 1 );
144 connect( m_btnOptions, SIGNAL( clicked() ), this, SLOT(slotBtnOptions()) ); 143 connect( m_btnOptions, SIGNAL( clicked() ), this, SLOT(slotBtnOptions()) );
@@ -223,9 +222,7 @@ void InstallDlg::slotBtnStart()
223 222
224 // Allow user to close dialog 223 // Allow user to close dialog
225 m_btnStart->setText( tr( "Close" ) ); 224 m_btnStart->setText( tr( "Close" ) );
226 QPixmap pic; 225 m_btnStart->setIconSet( Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ) );
227 pic.convertFromImage( Resource::loadImage( "close" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
228 m_btnStart->setIconSet( pic );
229 return; 226 return;
230 } 227 }
231 else if ( btnText == tr( "Close" ) ) 228 else if ( btnText == tr( "Close" ) )
@@ -247,9 +244,7 @@ void InstallDlg::slotBtnStart()
247 if ( m_numCommands > 1 ) 244 if ( m_numCommands > 1 )
248 { 245 {
249 m_btnStart->setText( tr( "Abort" ) ); 246 m_btnStart->setText( tr( "Abort" ) );
250 QPixmap pic; 247 m_btnStart->setIconSet( Opie::Core::OResource::loadPixmap( "reset", Opie::Core::OResource::SmallIcon ) );
251 pic.convertFromImage( Resource::loadImage( "reset" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
252 m_btnStart->setIconSet( pic );
253 } 248 }
254 else 249 else
255 { 250 {
@@ -266,14 +261,11 @@ void InstallDlg::slotBtnStart()
266 // All commands executed, allow user to close dialog 261 // All commands executed, allow user to close dialog
267 m_btnStart->setEnabled( true ); 262 m_btnStart->setEnabled( true );
268 m_btnStart->setText( tr( "Close" ) ); 263 m_btnStart->setText( tr( "Close" ) );
269 QPixmap pic; 264 m_btnStart->setIconSet( Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ) );
270 pic.convertFromImage( Resource::loadImage( "close" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
271 m_btnStart->setIconSet( pic );
272 265
273 m_btnOptions->setEnabled( true ); 266 m_btnOptions->setEnabled( true );
274 m_btnOptions->setText( tr( "Save output" ) ); 267 m_btnOptions->setText( tr( "Save output" ) );
275 pic.convertFromImage( Resource::loadImage( "save" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); 268 m_btnOptions->setIconSet( Opie::Core::OResource::loadPixmap( "save", Opie::Core::OResource::SmallIcon ) );
276 m_btnOptions->setIconSet( pic );
277} 269}
278 270
279void InstallDlg::slotBtnOptions() 271void InstallDlg::slotBtnOptions()
diff --git a/noncore/settings/packagemanager/mainwindow.cpp b/noncore/settings/packagemanager/mainwindow.cpp
index 0e40c01..e0e5e04 100644
--- a/noncore/settings/packagemanager/mainwindow.cpp
+++ b/noncore/settings/packagemanager/mainwindow.cpp
@@ -36,10 +36,10 @@
36#include "packageinfodlg.h" 36#include "packageinfodlg.h"
37 37
38#include <opie2/ofiledialog.h> 38#include <opie2/ofiledialog.h>
39#include <opie2/oresource.h>
39 40
40#include <qpe/qcopenvelope_qws.h> 41#include <qpe/qcopenvelope_qws.h>
41#include <qpe/qpeapplication.h> 42#include <qpe/qpeapplication.h>
42#include <qpe/resource.h>
43 43
44#include <qaction.h> 44#include <qaction.h>
45#include <qdir.h> 45#include <qdir.h>
@@ -64,8 +64,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags /*fl*/ )
64 , m_statusWidget( this ) 64 , m_statusWidget( this )
65 , m_statusText( &m_statusWidget ) 65 , m_statusText( &m_statusWidget )
66 , m_statusBar( &m_statusWidget ) 66 , m_statusBar( &m_statusWidget )
67 , m_iconUpdated( Resource::loadPixmap( "packagemanager/updated" ) ) 67 , m_iconUpdated( Opie::Core::OResource::loadPixmap( "packagemanager/updated" ) )
68 , m_iconInstalled( Resource::loadPixmap( "installed" ) ) 68 , m_iconInstalled( Opie::Core::OResource::loadPixmap( "installed" ) )
69 , m_iconNull( m_iconUpdated.size() ) 69 , m_iconNull( m_iconUpdated.size() )
70 , m_filterName( QString::null ) 70 , m_filterName( QString::null )
71 , m_filterServer( QString::null ) 71 , m_filterServer( QString::null )
@@ -159,33 +159,37 @@ void MainWindow::initUI()
159 // Packages menu 159 // Packages menu
160 QPopupMenu *popup = new QPopupMenu( this ); 160 QPopupMenu *popup = new QPopupMenu( this );
161 161
162 QAction *a = new QAction( tr( "Update lists" ), Resource::loadPixmap( "packagemanager/update" ), QString::null, 0, this, 0 ); 162 QAction *a = new QAction( tr( "Update lists" ), Opie::Core::OResource::loadPixmap( "packagemanager/update",
163 Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
163 a->setWhatsThis( tr( "Tap here to update package lists from servers." ) ); 164 a->setWhatsThis( tr( "Tap here to update package lists from servers." ) );
164 connect( a, SIGNAL(activated()), this, SLOT(slotUpdate()) ); 165 connect( a, SIGNAL(activated()), this, SLOT(slotUpdate()) );
165 a->addTo( popup ); 166 a->addTo( popup );
166 a->addTo( &m_toolBar ); 167 a->addTo( &m_toolBar );
167 168
168 QAction *actionUpgrade = new QAction( tr( "Upgrade" ), Resource::loadPixmap( "packagemanager/upgrade" ), QString::null, 0, this, 0 ); 169 QAction *actionUpgrade = new QAction( tr( "Upgrade" ), Opie::Core::OResource::loadPixmap( "packagemanager/upgrade",
170 Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
169 actionUpgrade->setWhatsThis( tr( "Tap here to upgrade all installed packages if a newer version is available." ) ); 171 actionUpgrade->setWhatsThis( tr( "Tap here to upgrade all installed packages if a newer version is available." ) );
170 connect( actionUpgrade, SIGNAL(activated()), this, SLOT(slotUpgrade()) ); 172 connect( actionUpgrade, SIGNAL(activated()), this, SLOT(slotUpgrade()) );
171 actionUpgrade->addTo( popup ); 173 actionUpgrade->addTo( popup );
172 actionUpgrade->addTo( &m_toolBar ); 174 actionUpgrade->addTo( &m_toolBar );
173 175
174 QPixmap iconDownload = Resource::loadPixmap( "packagemanager/download" ); 176 QPixmap iconDownload = Opie::Core::OResource::loadPixmap( "packagemanager/download", Opie::Core::OResource::SmallIcon );
175 QPixmap iconRemove = Resource::loadPixmap( "packagemanager/remove" ); 177 QPixmap iconRemove = Opie::Core::OResource::loadPixmap( "packagemanager/remove", Opie::Core::OResource::SmallIcon );
176 QAction *actionDownload = new QAction( tr( "Download" ), iconDownload, QString::null, 0, this, 0 ); 178 QAction *actionDownload = new QAction( tr( "Download" ), iconDownload, QString::null, 0, this, 0 );
177 actionDownload->setWhatsThis( tr( "Tap here to download the currently selected package(s)." ) ); 179 actionDownload->setWhatsThis( tr( "Tap here to download the currently selected package(s)." ) );
178 connect( actionDownload, SIGNAL(activated()), this, SLOT(slotDownload()) ); 180 connect( actionDownload, SIGNAL(activated()), this, SLOT(slotDownload()) );
179 actionDownload->addTo( popup ); 181 actionDownload->addTo( popup );
180 actionDownload->addTo( &m_toolBar ); 182 actionDownload->addTo( &m_toolBar );
181 183
182 a = new QAction( tr( "Apply changes" ), Resource::loadPixmap( "packagemanager/apply" ), QString::null, 0, this, 0 ); 184 a = new QAction( tr( "Apply changes" ), Opie::Core::OResource::loadPixmap( "packagemanager/apply",
185 Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
183 a->setWhatsThis( tr( "Tap here to install, remove or upgrade currently selected package(s)." ) ); 186 a->setWhatsThis( tr( "Tap here to install, remove or upgrade currently selected package(s)." ) );
184 connect( a, SIGNAL(activated()), this, SLOT(slotApply()) ); 187 connect( a, SIGNAL(activated()), this, SLOT(slotApply()) );
185 a->addTo( popup ); 188 a->addTo( popup );
186 a->addTo( &m_toolBar ); 189 a->addTo( &m_toolBar );
187 190
188 a = new QAction( tr( "Install local package" ), Resource::loadPixmap( "folder" ), QString::null, 0, this, 0 ); 191 a = new QAction( tr( "Install local package" ), Opie::Core::OResource::loadPixmap( "folder",
192 Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
189 a->setWhatsThis( tr( "Tap here to install a package file located on device." ) ); 193 a->setWhatsThis( tr( "Tap here to install a package file located on device." ) );
190 connect( a, SIGNAL(activated()), this, SLOT(slotInstallLocal()) ); 194 connect( a, SIGNAL(activated()), this, SLOT(slotInstallLocal()) );
191 a->addTo( popup ); 195 a->addTo( popup );
@@ -193,7 +197,8 @@ void MainWindow::initUI()
193 197
194 popup->insertSeparator(); 198 popup->insertSeparator();
195 199
196 a = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ), QString::null, 0, this, 0 ); 200 a = new QAction( tr( "Configure" ), Opie::Core::OResource::loadPixmap( "SettingsIcon",
201 Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
197 a->setWhatsThis( tr( "Tap here to configure this application." ) ); 202 a->setWhatsThis( tr( "Tap here to configure this application." ) );
198 connect( a, SIGNAL(activated()), this, SLOT(slotConfigure()) ); 203 connect( a, SIGNAL(activated()), this, SLOT(slotConfigure()) );
199 a->addTo( popup ); 204 a->addTo( popup );
@@ -222,8 +227,8 @@ void MainWindow::initUI()
222 227
223 popup->insertSeparator(); 228 popup->insertSeparator();
224 229
225 m_actionFilter = new QAction( tr( "Filter" ), Resource::loadPixmap( "packagemanager/filter" ), 230 m_actionFilter = new QAction( tr( "Filter" ), Opie::Core::OResource::loadPixmap( "packagemanager/filter",
226 QString::null, 0, this, 0 ); 231 Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
227 m_actionFilter->setToggleAction( true ); 232 m_actionFilter->setToggleAction( true );
228 m_actionFilter->setWhatsThis( tr( "Tap here to apply current filter." ) ); 233 m_actionFilter->setWhatsThis( tr( "Tap here to apply current filter." ) );
229 connect( m_actionFilter, SIGNAL(toggled(bool)), this, SLOT(slotFilter(bool)) ); 234 connect( m_actionFilter, SIGNAL(toggled(bool)), this, SLOT(slotFilter(bool)) );
@@ -236,12 +241,14 @@ void MainWindow::initUI()
236 241
237 popup->insertSeparator(); 242 popup->insertSeparator();
238 243
239 a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 ); 244 a = new QAction( tr( "Find" ), Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ),
245 QString::null, 0, this, 0 );
240 a->setWhatsThis( tr( "Tap here to search for text in package names." ) ); 246 a->setWhatsThis( tr( "Tap here to search for text in package names." ) );
241 connect( a, SIGNAL(activated()), this, SLOT(slotFindShowToolbar()) ); 247 connect( a, SIGNAL(activated()), this, SLOT(slotFindShowToolbar()) );
242 a->addTo( popup ); 248 a->addTo( popup );
243 249
244 m_actionFindNext = new QAction( tr( "Find next" ), Resource::loadIconSet( "next" ), QString::null, 0, this, 0 ); 250 m_actionFindNext = new QAction( tr( "Find next" ), Opie::Core::OResource::loadPixmap( "next",
251 Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
245 m_actionFindNext->setEnabled( false ); 252 m_actionFindNext->setEnabled( false );
246 m_actionFindNext->setWhatsThis( tr( "Tap here to find the next package name containing the text you are searching for." ) ); 253 m_actionFindNext->setWhatsThis( tr( "Tap here to find the next package name containing the text you are searching for." ) );
247 connect( m_actionFindNext, SIGNAL(activated()), this, SLOT(slotFindNext()) ); 254 connect( m_actionFindNext, SIGNAL(activated()), this, SLOT(slotFindNext()) );
@@ -251,7 +258,8 @@ void MainWindow::initUI()
251 mb->insertItem( tr( "View" ), popup ); 258 mb->insertItem( tr( "View" ), popup );
252 259
253 // Finish find toolbar creation 260 // Finish find toolbar creation
254 a = new QAction( QString::null, Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); 261 a = new QAction( QString::null, Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ),
262 QString::null, 0, this, 0 );
255 a->setWhatsThis( tr( "Tap here to hide the find toolbar." ) ); 263 a->setWhatsThis( tr( "Tap here to hide the find toolbar." ) );
256 connect( a, SIGNAL(activated()), this, SLOT(slotFindHideToolbar()) ); 264 connect( a, SIGNAL(activated()), this, SLOT(slotFindHideToolbar()) );
257 a->addTo( &m_findBar ); 265 a->addTo( &m_findBar );
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
index 945571f..58c572b 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
@@ -31,9 +31,9 @@
31#include "oipkgconfigdlg.h" 31#include "oipkgconfigdlg.h"
32 32
33#include <opie2/ofiledialog.h> 33#include <opie2/ofiledialog.h>
34#include <opie2/oresource.h>
34 35
35#include <qpe/qpeapplication.h> 36#include <qpe/qpeapplication.h>
36#include <qpe/resource.h>
37 37
38#include <qcheckbox.h> 38#include <qcheckbox.h>
39#include <qcombobox.h> 39#include <qcombobox.h>
@@ -182,25 +182,24 @@ void OIpkgConfigDlg::initServerWidget()
182 connect( m_serverList, SIGNAL(highlighted(int)), this, SLOT(slotServerSelected(int)) ); 182 connect( m_serverList, SIGNAL(highlighted(int)), this, SLOT(slotServerSelected(int)) );
183 layout->addMultiCellWidget( m_serverList, 0, 0, 0, 2 ); 183 layout->addMultiCellWidget( m_serverList, 0, 0, 0, 2 );
184 184
185 QPixmap pic; 185 QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
186 pic.convertFromImage( Resource::loadImage( "new" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); 186 tr( "New" ), container );
187 QPushButton *btn = new QPushButton( pic, tr( "New" ), container ); 187 btn->setMinimumHeight( AppLnk::smallIconSize()+4 );
188 btn->setMinimumHeight( AppLnk::smallIconSize() );
189 QWhatsThis::add( btn, tr( "Tap here to create a new entry. Fill in the fields below and then tap on Update." ) ); 188 QWhatsThis::add( btn, tr( "Tap here to create a new entry. Fill in the fields below and then tap on Update." ) );
190 connect( btn, SIGNAL(clicked()), this, SLOT(slotServerNew()) ); 189 connect( btn, SIGNAL(clicked()), this, SLOT(slotServerNew()) );
191 layout->addWidget( btn, 1, 0 ); 190 layout->addWidget( btn, 1, 0 );
192 191
193 pic.convertFromImage( Resource::loadImage( "edit" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); 192 m_serverEditBtn = new QPushButton( Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ),
194 m_serverEditBtn = new QPushButton( pic, tr( "Edit" ), container ); 193 tr( "Edit" ), container );
195 m_serverEditBtn->setMinimumHeight( AppLnk::smallIconSize() ); 194 m_serverEditBtn->setMinimumHeight( AppLnk::smallIconSize()+4 );
196 m_serverEditBtn->setEnabled( false ); 195 m_serverEditBtn->setEnabled( false );
197 QWhatsThis::add( m_serverEditBtn, tr( "Tap here to edit the entry selected above." ) ); 196 QWhatsThis::add( m_serverEditBtn, tr( "Tap here to edit the entry selected above." ) );
198 connect( m_serverEditBtn, SIGNAL(clicked()), this, SLOT(slotServerEdit()) ); 197 connect( m_serverEditBtn, SIGNAL(clicked()), this, SLOT(slotServerEdit()) );
199 layout->addWidget( m_serverEditBtn, 1, 1 ); 198 layout->addWidget( m_serverEditBtn, 1, 1 );
200 199
201 pic.convertFromImage( Resource::loadImage( "trash" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); 200 m_serverDeleteBtn = new QPushButton( Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ),
202 m_serverDeleteBtn = new QPushButton( pic, tr( "Delete" ), container ); 201 tr( "Delete" ), container );
203 m_serverDeleteBtn->setMinimumHeight( AppLnk::smallIconSize() ); 202 m_serverDeleteBtn->setMinimumHeight( AppLnk::smallIconSize()+4 );
204 m_serverDeleteBtn->setEnabled( false ); 203 m_serverDeleteBtn->setEnabled( false );
205 QWhatsThis::add( m_serverDeleteBtn, tr( "Tap here to delete the entry selected above." ) ); 204 QWhatsThis::add( m_serverDeleteBtn, tr( "Tap here to delete the entry selected above." ) );
206 connect( m_serverDeleteBtn, SIGNAL(clicked()), this, SLOT(slotServerDelete()) ); 205 connect( m_serverDeleteBtn, SIGNAL(clicked()), this, SLOT(slotServerDelete()) );
@@ -227,25 +226,24 @@ void OIpkgConfigDlg::initDestinationWidget()
227 connect( m_destList, SIGNAL(highlighted(int)), this, SLOT(slotDestSelected(int)) ); 226 connect( m_destList, SIGNAL(highlighted(int)), this, SLOT(slotDestSelected(int)) );
228 layout->addMultiCellWidget( m_destList, 0, 0, 0, 2 ); 227 layout->addMultiCellWidget( m_destList, 0, 0, 0, 2 );
229 228
230 QPixmap pic; 229 QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
231 pic.convertFromImage( Resource::loadImage( "new" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); 230 tr( "New" ), container );
232 QPushButton *btn = new QPushButton( pic, tr( "New" ), container ); 231 btn->setMinimumHeight( AppLnk::smallIconSize()+4 );
233 btn->setMinimumHeight( AppLnk::smallIconSize() );
234 QWhatsThis::add( btn, tr( "Tap here to create a new entry. Fill in the fields below and then tap on Update." ) ); 232 QWhatsThis::add( btn, tr( "Tap here to create a new entry. Fill in the fields below and then tap on Update." ) );
235 connect( btn, SIGNAL(clicked()), this, SLOT(slotDestNew()) ); 233 connect( btn, SIGNAL(clicked()), this, SLOT(slotDestNew()) );
236 layout->addWidget( btn, 1, 0 ); 234 layout->addWidget( btn, 1, 0 );
237 235
238 pic.convertFromImage( Resource::loadImage( "edit" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); 236 m_destEditBtn = new QPushButton( Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ),
239 m_destEditBtn = new QPushButton( pic, tr( "Edit" ), container ); 237 tr( "Edit" ), container );
240 m_destEditBtn->setMinimumHeight( AppLnk::smallIconSize() ); 238 m_destEditBtn->setMinimumHeight( AppLnk::smallIconSize()+4 );
241 m_destEditBtn->setEnabled( false ); 239 m_destEditBtn->setEnabled( false );
242 QWhatsThis::add( m_destEditBtn, tr( "Tap here to edit the entry selected above." ) ); 240 QWhatsThis::add( m_destEditBtn, tr( "Tap here to edit the entry selected above." ) );
243 connect( m_destEditBtn, SIGNAL(clicked()), this, SLOT(slotDestEdit()) ); 241 connect( m_destEditBtn, SIGNAL(clicked()), this, SLOT(slotDestEdit()) );
244 layout->addWidget( m_destEditBtn, 1, 1 ); 242 layout->addWidget( m_destEditBtn, 1, 1 );
245 243
246 pic.convertFromImage( Resource::loadImage( "trash" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); 244 m_destDeleteBtn = new QPushButton( Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ),
247 m_destDeleteBtn = new QPushButton( pic, tr( "Delete" ), container ); 245 tr( "Delete" ), container );
248 m_destDeleteBtn->setMinimumHeight( AppLnk::smallIconSize() ); 246 m_destDeleteBtn->setMinimumHeight( AppLnk::smallIconSize()+4 );
249 m_destDeleteBtn->setEnabled( false ); 247 m_destDeleteBtn->setEnabled( false );
250 QWhatsThis::add( m_destDeleteBtn, tr( "Tap here to delete the entry selected above." ) ); 248 QWhatsThis::add( m_destDeleteBtn, tr( "Tap here to delete the entry selected above." ) );
251 connect( m_destDeleteBtn, SIGNAL(clicked()), this, SLOT(slotDestDelete()) ); 249 connect( m_destDeleteBtn, SIGNAL(clicked()), this, SLOT(slotDestDelete()) );
@@ -357,9 +355,10 @@ void OIpkgConfigDlg::initOptionsWidget()
357 m_optSourceLists = new QLineEdit( container ); 355 m_optSourceLists = new QLineEdit( container );
358 QWhatsThis::add( m_optSourceLists, tr( "Enter the directory where package source feed information is stored." ) ); 356 QWhatsThis::add( m_optSourceLists, tr( "Enter the directory where package source feed information is stored." ) );
359 layout->addWidget( m_optSourceLists, 7, 0 ); 357 layout->addWidget( m_optSourceLists, 7, 0 );
360 QPixmap pic; 358
361 pic.convertFromImage( Resource::loadImage( "folder" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); 359 QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ),
362 QPushButton *btn = new QPushButton( pic, QString::null, container ); 360 QString::null, container );
361 btn->setMinimumHeight( AppLnk::smallIconSize()+4 );
363 btn->setMaximumWidth( btn->height() ); 362 btn->setMaximumWidth( btn->height() );
364 QWhatsThis::add( btn, tr( "Tap here to select the directory where package source feed information is stored." ) ); 363 QWhatsThis::add( btn, tr( "Tap here to select the directory where package source feed information is stored." ) );
365 connect( btn, SIGNAL(clicked()), this, SLOT(slotOptSelectSourceListsPath()) ); 364 connect( btn, SIGNAL(clicked()), this, SLOT(slotOptSelectSourceListsPath()) );
@@ -662,9 +661,8 @@ OIpkgDestDlg::OIpkgDestDlg( OConfItem *dest, QWidget *parent )
662 m_location = new QLineEdit( this ); 661 m_location = new QLineEdit( this );
663 QWhatsThis::add( m_location, tr( "Enter the absolute directory path of this entry here." ) ); 662 QWhatsThis::add( m_location, tr( "Enter the absolute directory path of this entry here." ) );
664 layout2->addWidget( m_location ); 663 layout2->addWidget( m_location );
665 QPixmap pic; 664 QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ),
666 pic.convertFromImage( Resource::loadImage( "folder" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); 665 QString::null, this );
667 QPushButton *btn = new QPushButton( pic, QString::null, this );
668 btn->setMaximumWidth( btn->height() ); 666 btn->setMaximumWidth( btn->height() );
669 QWhatsThis::add( btn, tr( "Tap here to select the desired location." ) ); 667 QWhatsThis::add( btn, tr( "Tap here to select the desired location." ) );
670 connect( btn, SIGNAL(clicked()), this, SLOT(slotSelectPath()) ); 668 connect( btn, SIGNAL(clicked()), this, SLOT(slotSelectPath()) );
diff --git a/noncore/settings/packagemanager/packageinfodlg.cpp b/noncore/settings/packagemanager/packageinfodlg.cpp
index e034f34..8b1b203 100644
--- a/noncore/settings/packagemanager/packageinfodlg.cpp
+++ b/noncore/settings/packagemanager/packageinfodlg.cpp
@@ -32,10 +32,9 @@
32#include "opackage.h" 32#include "opackage.h"
33#include "opackagemanager.h" 33#include "opackagemanager.h"
34 34
35#include <opie2/oresource.h>
35#include <opie2/otabwidget.h> 36#include <opie2/otabwidget.h>
36 37
37#include <qpe/resource.h>
38
39#include <qlayout.h> 38#include <qlayout.h>
40#include <qpushbutton.h> 39#include <qpushbutton.h>
41#include <qwhatsthis.h> 40#include <qwhatsthis.h>
@@ -96,8 +95,9 @@ PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QStr
96 m_files.setText( m_package->files() ); 95 m_files.setText( m_package->files() );
97 else 96 else
98 { 97 {
99 m_retrieveFiles = new QPushButton( Resource::loadPixmap( "packagemanager/apply" ), 98 m_retrieveFiles = new QPushButton( Opie::Core::OResource::loadPixmap( "packagemanager/apply",
100 tr( "Retrieve file list" ), filesWidget ); 99 Opie::Core::OResource::SmallIcon ), tr( "Retrieve file list" ),
100 filesWidget );
101 QWhatsThis::add( m_retrieveFiles, tr( "Tap here to retrieve list of files contained in this package." ) ); 101 QWhatsThis::add( m_retrieveFiles, tr( "Tap here to retrieve list of files contained in this package." ) );
102 filesLayout->addWidget( m_retrieveFiles ); 102 filesLayout->addWidget( m_retrieveFiles );
103 connect( m_retrieveFiles, SIGNAL(clicked()), this, SLOT(slotBtnFileScan()) ); 103 connect( m_retrieveFiles, SIGNAL(clicked()), this, SLOT(slotBtnFileScan()) );