author | paule <paule> | 2007-01-28 09:03:16 (UTC) |
---|---|---|
committer | paule <paule> | 2007-01-28 09:03:16 (UTC) |
commit | 0db6862d81bd0444362fa6cd1edf0ae579639daa (patch) (unidiff) | |
tree | 0085f7c9aea9e9e9a7e041a3af9e7d8ac1799e48 | |
parent | 67b8a6e01fd3e47227f8bafa21077506fa55568c (diff) | |
download | opie-0db6862d81bd0444362fa6cd1edf0ae579639daa.zip opie-0db6862d81bd0444362fa6cd1edf0ae579639daa.tar.gz opie-0db6862d81bd0444362fa6cd1edf0ae579639daa.tar.bz2 |
More fixes for remote selection
-rw-r--r-- | noncore/tools/remote/remotetab.cpp | 12 | ||||
-rw-r--r-- | noncore/tools/remote/topgroup.cpp | 13 |
2 files changed, 25 insertions, 0 deletions
diff --git a/noncore/tools/remote/remotetab.cpp b/noncore/tools/remote/remotetab.cpp index 45995fd..c89d8c2 100644 --- a/noncore/tools/remote/remotetab.cpp +++ b/noncore/tools/remote/remotetab.cpp | |||
@@ -53,2 +53,10 @@ int RemoteTab::sendIR() | |||
53 | { | 53 | { |
54 | QString curr_remote = topGroup->getRemotesText(); | ||
55 | if(curr_remote != "") | ||
56 | cfg->setGroup(curr_remote); | ||
57 | else { | ||
58 | QMessageBox::warning(this, tr("Error"), tr("Please select or create\na remote layout"), QMessageBox::Ok, QMessageBox::NoButton); | ||
59 | return 0; | ||
60 | } | ||
61 | |||
54 | const QObject *button = sender(); | 62 | const QObject *button = sender(); |
@@ -159,2 +167,6 @@ void RemoteTab::updateRemotesList() | |||
159 | topGroup->updateRemotes(cfg); | 167 | topGroup->updateRemotes(cfg); |
168 | |||
169 | QString curr_remote = topGroup->getRemotesText(); | ||
170 | if(curr_remote != "") | ||
171 | remoteSelected(curr_remote); | ||
160 | } | 172 | } |
diff --git a/noncore/tools/remote/topgroup.cpp b/noncore/tools/remote/topgroup.cpp index 7f2366b..d4eb6e2 100644 --- a/noncore/tools/remote/topgroup.cpp +++ b/noncore/tools/remote/topgroup.cpp | |||
@@ -49,2 +49,5 @@ void TopGroup::updateRemotes(Config *cfg) | |||
49 | { | 49 | { |
50 | // Save currently selected item if any | ||
51 | QString curr_remote = remotes->currentText(); | ||
52 | |||
50 | remotes->clear(); | 53 | remotes->clear(); |
@@ -52,2 +55,12 @@ void TopGroup::updateRemotes(Config *cfg) | |||
52 | remotes->insertStringList(cfg->readListEntry("remoteList", ',') ); | 55 | remotes->insertStringList(cfg->readListEntry("remoteList", ',') ); |
56 | |||
57 | // Select previously selected item | ||
58 | if(curr_remote != "") { | ||
59 | for(int i=0;i<remotes->count();i++) { | ||
60 | if(remotes->text(i) == curr_remote) { | ||
61 | remotes->setCurrentItem(i); | ||
62 | break; | ||
63 | } | ||
64 | } | ||
65 | } | ||
53 | } | 66 | } |