From: Jari Jarvi Date: Mon, 21 Jun 2010 13:35:30 +0000 (+0300) Subject: More implementation X-Git-Url: http://vcs.maemo.org/git/?p=irwi;a=commitdiff_plain;h=1a27f2c01d615891040a2e33a1cfebbbce6ca430 More implementation --- diff --git a/src/remote.cpp b/src/remote.cpp index 006e907..a3e66b5 100644 --- a/src/remote.cpp +++ b/src/remote.cpp @@ -127,6 +127,8 @@ void Remote::remoteDownloadFinished(QNetworkReply *reply) reply->deleteLater(); std::system("sudo /etc/init.d/lirc reload"); + + emit saveFinished(); } void Remote::infoRequestFinished(QNetworkReply *reply) diff --git a/src/remote.h b/src/remote.h index 32b8f61..3c2720f 100644 --- a/src/remote.h +++ b/src/remote.h @@ -38,6 +38,7 @@ private slots: signals: void infoUpdated(); + void saveFinished(); private: QString m_name; diff --git a/src/selectremotedlg.cpp b/src/selectremotedlg.cpp index 9b6e46a..a3c315f 100644 --- a/src/selectremotedlg.cpp +++ b/src/selectremotedlg.cpp @@ -89,7 +89,7 @@ void SelectRemoteDlg::mfgItemChanged(QListWidgetItem *current, if (current) { RemoteList remotes = - (*remoteDB)[alphabetList->currentItem()->text()][current->text()]; + (*remoteDB)[alphabetList->currentItem()->text()][current->text()]; foreach(Remote *remote, remotes) { modelList->addItem(new RemoteListWidgetItem(remote)); } @@ -102,6 +102,9 @@ void SelectRemoteDlg::downloadRemote() static_cast(modelList->currentItem()); if (currentModel) { + setBusy(); + connect(currentModel->remote(), SIGNAL(saveFinished()), + this, SLOT(close())); currentModel->remote()->saveToFile(); } } diff --git a/src/selectremotedlg.h b/src/selectremotedlg.h index 792814a..f64eb52 100644 --- a/src/selectremotedlg.h +++ b/src/selectremotedlg.h @@ -33,14 +33,18 @@ private slots: void downloadRemote(); void setDB(RemoteDB *db); +signals: + void remoteChanged(Remote); + private: + RemoteDBMgr remoteDBMgr; + QLabel *remoteNameLabel; QHBoxLayout *layout; QListWidget *alphabetList; QListWidget *mfgList; QListWidget *modelList; QPushButton *downloadBtn; - RemoteDBMgr remoteDBMgr; RemoteDB *remoteDB; void setBusy(bool busy = true);