diff -r f0af2401f981 -r 5c7bfc8bac6a QTfrontend/pages.cpp --- a/QTfrontend/pages.cpp Sat Dec 15 18:58:55 2007 +0000 +++ b/QTfrontend/pages.cpp Sat Dec 15 19:40:50 2007 +0000 @@ -29,6 +29,7 @@ #include #include #include +#include #include "pages.h" #include "sdlkeys.h" @@ -461,7 +462,8 @@ BtnNetConnect->setText(QPushButton::tr("Connect")); GBClayout->addWidget(BtnNetConnect, 2, 2); - netServersWidget = 0; + tvServersList = new QTableView(ConnGroupBox); + GBClayout->addWidget(tvServersList, 1, 0, 1, 3); BtnUpdateSList = new QPushButton(ConnGroupBox); BtnUpdateSList->setFont(*font14); @@ -483,23 +485,22 @@ void PageNet::updateServersList() { - if (netServersWidget) delete netServersWidget; +// if (tvServersList->model()) delete tvServersList->model(); if (rbLocalGame->isChecked()) - netServersWidget = new HWNetUdpWidget(ConnGroupBox); - else - netServersWidget = new HWNetWwwWidget(ConnGroupBox); +//; netServersWidget = new HWNetUdpWidget(ConnGroupBox); +// else + tvServersList->setModel(new HWNetWwwModel()); - netServersWidget->updateList(); - GBClayout->addWidget(netServersWidget, 1, 0, 1, 3); + static_cast(tvServersList->model())->updateList(); - connect(BtnUpdateSList, SIGNAL(clicked()), netServersWidget, SLOT(updateList())); - connect(netServersWidget->serversList, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this, SLOT(slotConnect())); + connect(BtnUpdateSList, SIGNAL(clicked()), static_cast(tvServersList->model()), SLOT(updateList())); +// connect(netServersWidget->serversList, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this, SLOT(slotConnect())); } void PageNet::slotConnect() { - emit connectClicked(); + emit connectClicked("localhost", 46631); } PageNetServer::PageNetServer(QWidget* parent) : QWidget(parent)