author | drw <drw> | 2005-03-03 19:15:30 (UTC) |
---|---|---|
committer | drw <drw> | 2005-03-03 19:15:30 (UTC) |
commit | 9c55e475ed3170488dd37ce8f36fa909397997bb (patch) (unidiff) | |
tree | f1fad490bc0d56059f8c26cfdf9002a831158a7c | |
parent | adb8960dfcdb18b698f313fc7e7d40209c65b01a (diff) | |
download | opie-9c55e475ed3170488dd37ce8f36fa909397997bb.zip opie-9c55e475ed3170488dd37ce8f36fa909397997bb.tar.gz opie-9c55e475ed3170488dd37ce8f36fa909397997bb.tar.bz2 |
Scale icons appropriately
-rw-r--r-- | noncore/settings/packagemanager/installdlg.cpp | 34 | ||||
-rw-r--r-- | noncore/settings/packagemanager/oipkgconfigdlg.cpp | 24 |
2 files changed, 39 insertions, 19 deletions
diff --git a/noncore/settings/packagemanager/installdlg.cpp b/noncore/settings/packagemanager/installdlg.cpp index 7dea591..36851b0 100644 --- a/noncore/settings/packagemanager/installdlg.cpp +++ b/noncore/settings/packagemanager/installdlg.cpp | |||
@@ -67,5 +67,5 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap | |||
67 | m_packages[ m_numCommands ] = packages1; | 67 | m_packages[ m_numCommands ] = packages1; |
68 | ++m_numCommands; | 68 | ++m_numCommands; |
69 | 69 | ||
70 | if ( command1 == OPackage::Install ) | 70 | if ( command1 == OPackage::Install ) |
71 | m_installFound = true; | 71 | m_installFound = true; |
@@ -76,5 +76,5 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap | |||
76 | m_packages[ m_numCommands ] = packages2; | 76 | m_packages[ m_numCommands ] = packages2; |
77 | ++m_numCommands; | 77 | ++m_numCommands; |
78 | 78 | ||
79 | if ( command2 == OPackage::Install ) | 79 | if ( command2 == OPackage::Install ) |
80 | m_installFound = true; | 80 | m_installFound = true; |
@@ -85,5 +85,5 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap | |||
85 | m_packages[ m_numCommands ] = packages3; | 85 | m_packages[ m_numCommands ] = packages3; |
86 | ++m_numCommands; | 86 | ++m_numCommands; |
87 | 87 | ||
88 | if ( command3 == OPackage::Install ) | 88 | if ( command3 == OPackage::Install ) |
89 | m_installFound = true; | 89 | m_installFound = true; |
@@ -130,9 +130,12 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap | |||
130 | layout->addMultiCellWidget( groupBox, 2, 2, 0, 1 ); | 130 | layout->addMultiCellWidget( groupBox, 2, 2, 0, 1 ); |
131 | 131 | ||
132 | m_btnStart = new QPushButton( Resource::loadPixmap( "packagemanager/apply" ), tr( "Start" ), this ); | 132 | QPixmap pic; |
133 | pic.convertFromImage( Resource::loadImage( "packagemanager/apply" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
134 | m_btnStart = new QPushButton( pic, tr( "Start" ), this ); | ||
133 | layout->addWidget( m_btnStart, 3, 0 ); | 135 | layout->addWidget( m_btnStart, 3, 0 ); |
134 | connect( m_btnStart, SIGNAL(clicked()), this, SLOT(slotBtnStart()) ); | 136 | connect( m_btnStart, SIGNAL(clicked()), this, SLOT(slotBtnStart()) ); |
135 | 137 | ||
136 | m_btnOptions = new QPushButton( Resource::loadPixmap( "SettingsIcon" ), tr( "Options" ), this ); | 138 | pic.convertFromImage( Resource::loadImage( "SettingsIcon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); |
139 | m_btnOptions = new QPushButton( pic, tr( "Options" ), this ); | ||
137 | layout->addWidget( m_btnOptions, 3, 1 ); | 140 | layout->addWidget( m_btnOptions, 3, 1 ); |
138 | connect( m_btnOptions, SIGNAL( clicked() ), this, SLOT(slotBtnOptions()) ); | 141 | connect( m_btnOptions, SIGNAL( clicked() ), this, SLOT(slotBtnOptions()) ); |
@@ -218,5 +221,7 @@ void InstallDlg::slotBtnStart() | |||
218 | // Allow user to close dialog | 221 | // Allow user to close dialog |
219 | m_btnStart->setText( tr( "Close" ) ); | 222 | m_btnStart->setText( tr( "Close" ) ); |
220 | m_btnStart->setIconSet( Resource::loadPixmap( "enter" ) ); | 223 | QPixmap pic; |
224 | pic.convertFromImage( Resource::loadImage( "enter" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
225 | m_btnStart->setIconSet( pic ); | ||
221 | return; | 226 | return; |
222 | } | 227 | } |
@@ -235,10 +240,12 @@ void InstallDlg::slotBtnStart() | |||
235 | m_destination->setEnabled( false ); | 240 | m_destination->setEnabled( false ); |
236 | } | 241 | } |
237 | 242 | ||
238 | m_btnOptions->setEnabled( false ); | 243 | m_btnOptions->setEnabled( false ); |
239 | if ( m_numCommands > 1 ) | 244 | if ( m_numCommands > 1 ) |
240 | { | 245 | { |
241 | m_btnStart->setText( tr( "Abort" ) ); | 246 | m_btnStart->setText( tr( "Abort" ) ); |
242 | m_btnStart->setIconSet( Resource::loadPixmap( "close" ) ); | 247 | QPixmap pic; |
248 | pic.convertFromImage( Resource::loadImage( "close" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
249 | m_btnStart->setIconSet( pic ); | ||
243 | } | 250 | } |
244 | else | 251 | else |
@@ -253,13 +260,16 @@ void InstallDlg::slotBtnStart() | |||
253 | this, SLOT(slotOutput(const QString &)), true ); | 260 | this, SLOT(slotOutput(const QString &)), true ); |
254 | } | 261 | } |
255 | 262 | ||
256 | // All commands executed, allow user to close dialog | 263 | // All commands executed, allow user to close dialog |
257 | m_btnStart->setEnabled( true ); | 264 | m_btnStart->setEnabled( true ); |
258 | m_btnStart->setText( tr( "Close" ) ); | 265 | m_btnStart->setText( tr( "Close" ) ); |
259 | m_btnStart->setIconSet( Resource::loadPixmap( "enter" ) ); | 266 | QPixmap pic; |
267 | pic.convertFromImage( Resource::loadImage( "enter" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
268 | m_btnStart->setIconSet( pic ); | ||
260 | 269 | ||
261 | m_btnOptions->setEnabled( true ); | 270 | m_btnOptions->setEnabled( true ); |
262 | m_btnOptions->setText( tr( "Save output" ) ); | 271 | m_btnOptions->setText( tr( "Save output" ) ); |
263 | m_btnOptions->setIconSet( Resource::loadPixmap( "save" ) ); | 272 | pic.convertFromImage( Resource::loadImage( "save" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); |
273 | m_btnOptions->setIconSet( pic ); | ||
264 | } | 274 | } |
265 | 275 | ||
@@ -306,5 +316,5 @@ void InstallDlg::slotOutput( const QString &msg ) | |||
306 | m_output->append( lineStr ); | 316 | m_output->append( lineStr ); |
307 | m_output->setCursorPosition( m_output->numLines(), 0 ); | 317 | m_output->setCursorPosition( m_output->numLines(), 0 ); |
308 | 318 | ||
309 | // Update available space | 319 | // Update available space |
310 | slotDisplayAvailSpace( QString::null ); | 320 | slotDisplayAvailSpace( QString::null ); |
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp index 7ee2d74..5f60990 100644 --- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp +++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp | |||
@@ -181,10 +181,13 @@ void OIpkgConfigDlg::initServerWidget() | |||
181 | layout->addMultiCellWidget( m_serverList, 0, 0, 0, 2 ); | 181 | layout->addMultiCellWidget( m_serverList, 0, 0, 0, 2 ); |
182 | 182 | ||
183 | QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container ); | 183 | QPixmap pic; |
184 | pic.convertFromImage( Resource::loadImage( "new" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
185 | QPushButton *btn = new QPushButton( pic, tr( "New" ), container ); | ||
184 | QWhatsThis::add( btn, tr( "Tap here to create a new entry. Fill in the fields below and then tap on Update." ) ); | 186 | QWhatsThis::add( btn, tr( "Tap here to create a new entry. Fill in the fields below and then tap on Update." ) ); |
185 | connect( btn, SIGNAL(clicked()), this, SLOT(slotServerNew()) ); | 187 | connect( btn, SIGNAL(clicked()), this, SLOT(slotServerNew()) ); |
186 | layout->addWidget( btn, 1, 0 ); | 188 | layout->addWidget( btn, 1, 0 ); |
187 | 189 | ||
188 | m_serverEditBtn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Edit" ), container ); | 190 | pic.convertFromImage( Resource::loadImage( "edit" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); |
191 | m_serverEditBtn = new QPushButton( pic, tr( "Edit" ), container ); | ||
189 | m_serverEditBtn->setEnabled( false ); | 192 | m_serverEditBtn->setEnabled( false ); |
190 | QWhatsThis::add( m_serverEditBtn, tr( "Tap here to edit the entry selected above." ) ); | 193 | QWhatsThis::add( m_serverEditBtn, tr( "Tap here to edit the entry selected above." ) ); |
@@ -192,5 +195,6 @@ void OIpkgConfigDlg::initServerWidget() | |||
192 | layout->addWidget( m_serverEditBtn, 1, 1 ); | 195 | layout->addWidget( m_serverEditBtn, 1, 1 ); |
193 | 196 | ||
194 | m_serverDeleteBtn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container ); | 197 | pic.convertFromImage( Resource::loadImage( "trash" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); |
198 | m_serverDeleteBtn = new QPushButton( pic, tr( "Delete" ), container ); | ||
195 | m_serverDeleteBtn->setEnabled( false ); | 199 | m_serverDeleteBtn->setEnabled( false ); |
196 | QWhatsThis::add( m_serverDeleteBtn, tr( "Tap here to delete the entry selected above." ) ); | 200 | QWhatsThis::add( m_serverDeleteBtn, tr( "Tap here to delete the entry selected above." ) ); |
@@ -219,10 +223,13 @@ void OIpkgConfigDlg::initDestinationWidget() | |||
219 | layout->addMultiCellWidget( m_destList, 0, 0, 0, 2 ); | 223 | layout->addMultiCellWidget( m_destList, 0, 0, 0, 2 ); |
220 | 224 | ||
221 | QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container ); | 225 | QPixmap pic; |
226 | pic.convertFromImage( Resource::loadImage( "new" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
227 | QPushButton *btn = new QPushButton( pic, tr( "New" ), container ); | ||
222 | QWhatsThis::add( btn, tr( "Tap here to create a new entry. Fill in the fields below and then tap on Update." ) ); | 228 | QWhatsThis::add( btn, tr( "Tap here to create a new entry. Fill in the fields below and then tap on Update." ) ); |
223 | connect( btn, SIGNAL(clicked()), this, SLOT(slotDestNew()) ); | 229 | connect( btn, SIGNAL(clicked()), this, SLOT(slotDestNew()) ); |
224 | layout->addWidget( btn, 1, 0 ); | 230 | layout->addWidget( btn, 1, 0 ); |
225 | 231 | ||
226 | m_destEditBtn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Edit" ), container ); | 232 | pic.convertFromImage( Resource::loadImage( "edit" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); |
233 | m_destEditBtn = new QPushButton( pic, tr( "Edit" ), container ); | ||
227 | m_destEditBtn->setEnabled( false ); | 234 | m_destEditBtn->setEnabled( false ); |
228 | QWhatsThis::add( m_destEditBtn, tr( "Tap here to edit the entry selected above." ) ); | 235 | QWhatsThis::add( m_destEditBtn, tr( "Tap here to edit the entry selected above." ) ); |
@@ -230,5 +237,6 @@ void OIpkgConfigDlg::initDestinationWidget() | |||
230 | layout->addWidget( m_destEditBtn, 1, 1 ); | 237 | layout->addWidget( m_destEditBtn, 1, 1 ); |
231 | 238 | ||
232 | m_destDeleteBtn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container ); | 239 | pic.convertFromImage( Resource::loadImage( "trash" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); |
240 | m_destDeleteBtn = new QPushButton( pic, tr( "Delete" ), container ); | ||
233 | m_destDeleteBtn->setEnabled( false ); | 241 | m_destDeleteBtn->setEnabled( false ); |
234 | QWhatsThis::add( m_destDeleteBtn, tr( "Tap here to delete the entry selected above." ) ); | 242 | QWhatsThis::add( m_destDeleteBtn, tr( "Tap here to delete the entry selected above." ) ); |
@@ -342,5 +350,7 @@ void OIpkgConfigDlg::initOptionsWidget() | |||
342 | QWhatsThis::add( m_optSourceLists, tr( "Enter the directory where package source feed information is stored." ) ); | 350 | QWhatsThis::add( m_optSourceLists, tr( "Enter the directory where package source feed information is stored." ) ); |
343 | layout->addWidget( m_optSourceLists, 7, 0 ); | 351 | layout->addWidget( m_optSourceLists, 7, 0 ); |
344 | QPushButton *btn = new QPushButton( Resource::loadPixmap( "folder" ), QString::null, container ); | 352 | QPixmap pic; |
353 | pic.convertFromImage( Resource::loadImage( "folder" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
354 | QPushButton *btn = new QPushButton( pic, QString::null, container ); | ||
345 | btn->setMaximumWidth( btn->height() ); | 355 | btn->setMaximumWidth( btn->height() ); |
346 | QWhatsThis::add( btn, tr( "Tap here to select the directory where package source feed information is stored." ) ); | 356 | QWhatsThis::add( btn, tr( "Tap here to select the directory where package source feed information is stored." ) ); |