Diffstat (limited to 'noncore/settings/packagemanager/oipkgconfigdlg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/packagemanager/oipkgconfigdlg.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp index d134651..7941ab8 100644 --- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp +++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp | |||
@@ -30,8 +30,10 @@ | |||
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include "oipkgconfigdlg.h" | 32 | #include "oipkgconfigdlg.h" |
33 | 33 | ||
34 | #include <qpe/resource.h> | ||
35 | |||
34 | #include <qcheckbox.h> | 36 | #include <qcheckbox.h> |
35 | #include <qcombobox.h> | 37 | #include <qcombobox.h> |
36 | #include <qgroupbox.h> | 38 | #include <qgroupbox.h> |
37 | #include <qlabel.h> | 39 | #include <qlabel.h> |
@@ -40,11 +42,8 @@ | |||
40 | #include <qpushbutton.h> | 42 | #include <qpushbutton.h> |
41 | #include <qscrollview.h> | 43 | #include <qscrollview.h> |
42 | #include <qwhatsthis.h> | 44 | #include <qwhatsthis.h> |
43 | 45 | ||
44 | #include <qpe/resource.h> | ||
45 | |||
46 | using namespace Opie::Ui; | ||
47 | OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *parent ) | 46 | OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *parent ) |
48 | : QDialog( parent, QString::null, true, WStyle_ContextHelp ) | 47 | : QDialog( parent, QString::null, true, WStyle_ContextHelp ) |
49 | , m_ipkg( ipkg ) | 48 | , m_ipkg( ipkg ) |
50 | , m_configs( 0x0 ) | 49 | , m_configs( 0x0 ) |
@@ -100,9 +99,9 @@ void OIpkgConfigDlg::accept() | |||
100 | confItem->setValue( m_proxyHttpServer->text() ); | 99 | confItem->setValue( m_proxyHttpServer->text() ); |
101 | confItem->setActive( m_proxyHttpActive->isChecked() ); | 100 | confItem->setActive( m_proxyHttpActive->isChecked() ); |
102 | } | 101 | } |
103 | else | 102 | else |
104 | m_configs->append( new OConfItem( QString::null, OConfItem::Option, "http_proxy", | 103 | m_configs->append( new OConfItem( OConfItem::Option, "http_proxy", |
105 | m_proxyHttpServer->text(), m_proxyHttpActive->isChecked() ) ); | 104 | m_proxyHttpServer->text(), m_proxyHttpActive->isChecked() ) ); |
106 | 105 | ||
107 | confItem = findConfItem( OConfItem::Option, "ftp_proxy" ); | 106 | confItem = findConfItem( OConfItem::Option, "ftp_proxy" ); |
108 | if ( confItem ) | 107 | if ( confItem ) |
@@ -110,23 +109,23 @@ void OIpkgConfigDlg::accept() | |||
110 | confItem->setValue( m_proxyFtpServer->text() ); | 109 | confItem->setValue( m_proxyFtpServer->text() ); |
111 | confItem->setActive( m_proxyFtpActive->isChecked() ); | 110 | confItem->setActive( m_proxyFtpActive->isChecked() ); |
112 | } | 111 | } |
113 | else | 112 | else |
114 | m_configs->append( new OConfItem( QString::null, OConfItem::Option, "ftp_proxy", | 113 | m_configs->append( new OConfItem( OConfItem::Option, "ftp_proxy", |
115 | m_proxyFtpServer->text(), m_proxyFtpActive->isChecked() ) ); | 114 | m_proxyFtpServer->text(), m_proxyFtpActive->isChecked() ) ); |
116 | 115 | ||
117 | confItem = findConfItem( OConfItem::Option, "proxy_username" ); | 116 | confItem = findConfItem( OConfItem::Option, "proxy_username" ); |
118 | if ( confItem ) | 117 | if ( confItem ) |
119 | confItem->setValue( m_proxyUsername->text() ); | 118 | confItem->setValue( m_proxyUsername->text() ); |
120 | else | 119 | else |
121 | m_configs->append( new OConfItem( QString::null, OConfItem::Option, "proxy_username", | 120 | m_configs->append( new OConfItem( OConfItem::Option, "proxy_username", |
122 | m_proxyUsername->text() ) ); | 121 | m_proxyUsername->text() ) ); |
123 | 122 | ||
124 | confItem = findConfItem( OConfItem::Option, "proxy_password" ); | 123 | confItem = findConfItem( OConfItem::Option, "proxy_password" ); |
125 | if ( confItem ) | 124 | if ( confItem ) |
126 | confItem->setValue( m_proxyPassword->text() ); | 125 | confItem->setValue( m_proxyPassword->text() ); |
127 | else | 126 | else |
128 | m_configs->append( new OConfItem( QString::null, OConfItem::Option, "proxy_password", | 127 | m_configs->append( new OConfItem( OConfItem::Option, "proxy_password", |
129 | m_proxyPassword->text() ) ); | 128 | m_proxyPassword->text() ) ); |
130 | 129 | ||
131 | m_ipkg->setConfigItems( m_configs ); | 130 | m_ipkg->setConfigItems( m_configs ); |
132 | } | 131 | } |
@@ -531,9 +530,9 @@ void OIpkgConfigDlg::slotServerUpdate() | |||
531 | } | 530 | } |
532 | else | 531 | else |
533 | { | 532 | { |
534 | // Add new destination to configuration list | 533 | // Add new destination to configuration list |
535 | m_configs->append( new OConfItem( QString::null, OConfItem::Source, newName, | 534 | m_configs->append( new OConfItem( OConfItem::Source, newName, |
536 | m_serverLocation->text(), m_serverActive->isChecked() ) ); | 535 | m_serverLocation->text(), m_serverActive->isChecked() ) ); |
537 | m_configs->sort(); | 536 | m_configs->sort(); |
538 | 537 | ||
539 | m_serverList->insertItem( newName ); | 538 | m_serverList->insertItem( newName ); |
@@ -617,9 +616,9 @@ void OIpkgConfigDlg::slotDestUpdate() | |||
617 | } | 616 | } |
618 | else | 617 | else |
619 | { | 618 | { |
620 | // Add new destination to configuration list | 619 | // Add new destination to configuration list |
621 | m_configs->append( new OConfItem( QString::null, OConfItem::Destination, newName, | 620 | m_configs->append( new OConfItem( OConfItem::Destination, newName, |
622 | m_destLocation->text(), m_destActive->isChecked() ) ); | 621 | m_destLocation->text(), m_destActive->isChecked() ) ); |
623 | m_configs->sort(); | 622 | m_configs->sort(); |
624 | 623 | ||
625 | m_destList->insertItem( newName ); | 624 | m_destList->insertItem( newName ); |