-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 cf94628..e8e2982 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.cpp +++ b/noncore/settings/aqpkg/networkpkgmgr.cpp | |||
@@ -65,67 +65,68 @@ NetworkPackageManager::NetworkPackageManager( DataManager *dataManager, QWidget | |||
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 | // cout << "Adding " << it->getServerName() << " to combobox" << endl; |
98 | if ( !it->isServerActive() ) | 98 | if ( !it->isServerActive() ) |
99 | { | 99 | { |
100 | cout << it->getServerName() << " is not active" << endl; | ||
100 | i--; | 101 | i--; |
101 | continue; | 102 | continue; |
102 | } | 103 | } |
103 | serversList->insertItem( it->getServerName() ); | 104 | serversList->insertItem( it->getServerName() ); |
104 | if ( it->getServerName() == currentlySelectedServer ) | 105 | if ( it->getServerName() == currentlySelectedServer ) |
105 | activeItem = i; | 106 | activeItem = i; |
106 | } | 107 | } |
107 | 108 | ||
108 | // set selected server to be active server | 109 | // set selected server to be active server |
109 | if ( activeItem != -1 ) | 110 | if ( activeItem != -1 ) |
110 | serversList->setCurrentItem( activeItem ); | 111 | serversList->setCurrentItem( activeItem ); |
111 | serverSelected( 0 ); | 112 | serverSelected( 0 ); |
112 | } | 113 | } |
113 | 114 | ||
114 | void NetworkPackageManager :: selectLocalPackage( const QString &pkg ) | 115 | void NetworkPackageManager :: selectLocalPackage( const QString &pkg ) |
115 | { | 116 | { |
116 | // First select local server | 117 | // First select local server |
117 | for ( int i = 0 ; i < serversList->count() ; ++i ) | 118 | for ( int i = 0 ; i < serversList->count() ; ++i ) |
118 | { | 119 | { |
119 | if ( serversList->text( i ) == LOCAL_IPKGS ) | 120 | if ( serversList->text( i ) == LOCAL_IPKGS ) |
120 | { | 121 | { |
121 | serversList->setCurrentItem( i ); | 122 | serversList->setCurrentItem( i ); |
122 | break; | 123 | break; |
123 | } | 124 | } |
124 | } | 125 | } |
125 | serverSelected( 0 ); | 126 | serverSelected( 0 ); |
126 | 127 | ||
127 | // Now set the check box of the selected package | 128 | // Now set the check box of the selected package |
128 | for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild(); | 129 | for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild(); |
129 | item != 0 ; | 130 | item != 0 ; |
130 | item = (QCheckListItem *)item->nextSibling() ) | 131 | item = (QCheckListItem *)item->nextSibling() ) |
131 | { | 132 | { |