author | andyq <andyq> | 2002-11-21 18:11:40 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-11-21 18:11:40 (UTC) |
commit | 5e806f161bc0bde64d5058dab4850c45aeba2cdf (patch) (unidiff) | |
tree | e93f10fe052da154b1cfe42bdbf5f29ef8749bc4 /noncore/settings/aqpkg/networkpkgmgr.cpp | |
parent | 5b0e9483f45967da95dc05d770197c631b959070 (diff) | |
download | opie-5e806f161bc0bde64d5058dab4850c45aeba2cdf.zip opie-5e806f161bc0bde64d5058dab4850c45aeba2cdf.tar.gz opie-5e806f161bc0bde64d5058dab4850c45aeba2cdf.tar.bz2 |
Fixed bug where installed and local ipkg servers weren't shown (hopefully)
Diffstat (limited to 'noncore/settings/aqpkg/networkpkgmgr.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp index 0814121..cf94628 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.cpp +++ b/noncore/settings/aqpkg/networkpkgmgr.cpp | |||
@@ -64,57 +64,58 @@ NetworkPackageManager::NetworkPackageManager( DataManager *dataManager, QWidget | |||
64 | showInstalledPkgs = false; | 64 | showInstalledPkgs = false; |
65 | showUpgradedPkgs = false; | 65 | showUpgradedPkgs = false; |
66 | categoryFilterEnabled = false; | 66 | categoryFilterEnabled = false; |
67 | 67 | ||
68 | initGui(); | 68 | initGui(); |
69 | setupConnections(); | 69 | setupConnections(); |
70 | 70 | ||
71 | updateData(); | 71 | updateData(); |
72 | } | 72 | } |
73 | 73 | ||
74 | NetworkPackageManager::~NetworkPackageManager() | 74 | NetworkPackageManager::~NetworkPackageManager() |
75 | { | 75 | { |
76 | } | 76 | } |
77 | 77 | ||
78 | void NetworkPackageManager :: timerEvent ( QTimerEvent * ) | 78 | void NetworkPackageManager :: timerEvent ( QTimerEvent * ) |
79 | { | 79 | { |
80 | killTimer( timerId ); | 80 | killTimer( timerId ); |
81 | 81 | ||
82 | // Add server names to listbox | 82 | // Add server names to listbox |
83 | updateData(); | 83 | updateData(); |
84 | } | 84 | } |
85 | 85 | ||
86 | void NetworkPackageManager :: updateData() | 86 | void NetworkPackageManager :: updateData() |
87 | { | 87 | { |
88 | serversList->clear(); | 88 | serversList->clear(); |
89 | packagesList->clear(); | 89 | packagesList->clear(); |
90 | 90 | ||
91 | 91 | ||
92 | vector<Server>::iterator it; | 92 | vector<Server>::iterator it; |
93 | int activeItem = -1; | 93 | int activeItem = -1; |
94 | int i; | 94 | int i; |
95 | for ( i = 0, it = dataMgr->getServerList().begin() ; it != dataMgr->getServerList().end() ; ++it, ++i ) | 95 | for ( i = 0, it = dataMgr->getServerList().begin() ; it != dataMgr->getServerList().end() ; ++it, ++i ) |
96 | { | 96 | { |
97 | cout << "Adding " << it->getServerName() << " to combobox" << endl; | ||
97 | if ( !it->isServerActive() ) | 98 | if ( !it->isServerActive() ) |
98 | { | 99 | { |
99 | i--; | 100 | i--; |
100 | continue; | 101 | continue; |
101 | } | 102 | } |
102 | serversList->insertItem( it->getServerName() ); | 103 | serversList->insertItem( it->getServerName() ); |
103 | if ( it->getServerName() == currentlySelectedServer ) | 104 | if ( it->getServerName() == currentlySelectedServer ) |
104 | activeItem = i; | 105 | activeItem = i; |
105 | } | 106 | } |
106 | 107 | ||
107 | // set selected server to be active server | 108 | // set selected server to be active server |
108 | if ( activeItem != -1 ) | 109 | if ( activeItem != -1 ) |
109 | serversList->setCurrentItem( activeItem ); | 110 | serversList->setCurrentItem( activeItem ); |
110 | serverSelected( 0 ); | 111 | serverSelected( 0 ); |
111 | } | 112 | } |
112 | 113 | ||
113 | void NetworkPackageManager :: selectLocalPackage( const QString &pkg ) | 114 | void NetworkPackageManager :: selectLocalPackage( const QString &pkg ) |
114 | { | 115 | { |
115 | // First select local server | 116 | // First select local server |
116 | for ( int i = 0 ; i < serversList->count() ; ++i ) | 117 | for ( int i = 0 ; i < serversList->count() ; ++i ) |
117 | { | 118 | { |
118 | if ( serversList->text( i ) == LOCAL_IPKGS ) | 119 | if ( serversList->text( i ) == LOCAL_IPKGS ) |
119 | { | 120 | { |
120 | serversList->setCurrentItem( i ); | 121 | serversList->setCurrentItem( i ); |