Diffstat (limited to 'noncore/settings/packagemanager/oipkgconfigdlg.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/packagemanager/oipkgconfigdlg.cpp | 52 |
1 files changed, 25 insertions, 27 deletions
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 | |||
@@ -32,7 +32,7 @@ | |||
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> |
@@ -183,15 +183,14 @@ void OIpkgConfigDlg::initServerWidget() | |||
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." ) ); |
@@ -199,7 +198,7 @@ void OIpkgConfigDlg::initServerWidget() | |||
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." ) ); |
@@ -228,15 +227,14 @@ void OIpkgConfigDlg::initDestinationWidget() | |||
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." ) ); |
@@ -244,7 +242,7 @@ void OIpkgConfigDlg::initDestinationWidget() | |||
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." ) ); |
@@ -358,7 +356,8 @@ void OIpkgConfigDlg::initOptionsWidget() | |||
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." ) ); |
@@ -663,7 +662,6 @@ OIpkgDestDlg::OIpkgDestDlg( OConfItem *dest, QWidget *parent ) | |||
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." ) ); |