Author: cazfi Date: Sun Jan 11 22:15:55 2015 New Revision: 27627 URL: http://svn.gna.org/viewcvs/freeciv?rev=27627&view=rev Log: Fixed updating the installed version numbers in Qt modpack installer from the separate worker thread.
See bug #23141 Modified: branches/S2_5/tools/mpgui_qt.cpp branches/S2_5/tools/mpgui_qt.h branches/S2_5/tools/mpgui_qt_worker.cpp Modified: branches/S2_5/tools/mpgui_qt.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/tools/mpgui_qt.cpp?rev=27627&r1=27626&r2=27627&view=diff ============================================================================== --- branches/S2_5/tools/mpgui_qt.cpp (original) +++ branches/S2_5/tools/mpgui_qt.cpp Sun Jan 11 22:15:55 2015 @@ -227,6 +227,7 @@ connect(mplist_table, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(row_download(QModelIndex))); connect(this, SIGNAL(display_msg_thr_signal(const char *)), this, SLOT(display_msg(const char *))); connect(this, SIGNAL(progress_thr_signal(int, int)), this, SLOT(progress(int, int))); + connect(this, SIGNAL(refresh_list_versions_thr_signal()), this, SLOT(refresh_list_versions())); main_layout->addWidget(mplist_table); @@ -347,6 +348,14 @@ } /************************************************************************** + Refresh display of modpack list modpack versions from another thread +**************************************************************************/ +void mpgui::refresh_list_versions_thr() +{ + emit refresh_list_versions_thr_signal(); +} + +/************************************************************************** Build main modpack list view **************************************************************************/ void mpgui::setup_list(const char *name, const char *URL, Modified: branches/S2_5/tools/mpgui_qt.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/tools/mpgui_qt.h?rev=27627&r1=27626&r2=27627&view=diff ============================================================================== --- branches/S2_5/tools/mpgui_qt.h (original) +++ branches/S2_5/tools/mpgui_qt.h Sun Jan 11 22:15:55 2015 @@ -41,15 +41,17 @@ const char *version, const char *license, enum modpack_type type, const char *subtype, const char *notes); - void refresh_list_versions(); + void refresh_list_versions_thr(); signals: void display_msg_thr_signal(const char *msg); void progress_thr_signal(int downloaded, int max); + void refresh_list_versions_thr_signal(); public slots: void display_msg(const char *msg); void progress(int downloaded, int max); + void refresh_list_versions(); private slots: void URL_given(); Modified: branches/S2_5/tools/mpgui_qt_worker.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/tools/mpgui_qt_worker.cpp?rev=27627&r1=27626&r2=27627&view=diff ============================================================================== --- branches/S2_5/tools/mpgui_qt_worker.cpp (original) +++ branches/S2_5/tools/mpgui_qt_worker.cpp Sun Jan 11 22:15:55 2015 @@ -52,7 +52,7 @@ msg_callback(_("Ready")); } - gui->refresh_list_versions(); + gui->refresh_list_versions_thr(); } /************************************************************************** _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits