mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp

Browse Source
pull/163/head
David Cernat 8 years ago
parent d503a65849 c147d13a73
commit bcee35ca1d
10 changed files with 243 additions and 10 deletions
Show Stats Download Patch File Download Diff File

2
apps/browser/CMakeLists.txt
Unescape Escape View File

@ -11,6 +11,7 @@ set(BROWSER
ServerModel.cpp ServerModel.cpp
NetController.cpp NetController.cpp
ServerInfoDialog.cpp ServerInfoDialog.cpp
MySortFilterProxyModel.cpp
netutils/HTTPNetwork.cpp netutils/HTTPNetwork.cpp
netutils/Utils.cpp netutils/Utils.cpp
${CMAKE_SOURCE_DIR}/files/tes3mp/browser.rc ${CMAKE_SOURCE_DIR}/files/tes3mp/browser.rc
@ -20,6 +21,7 @@ set(BROWSER_HEADER_MOC
MainWindow.hpp MainWindow.hpp
ServerModel.hpp ServerModel.hpp
ServerInfoDialog.hpp ServerInfoDialog.hpp
MySortFilterProxyModel.hpp
) )
set(BROWSER_HEADER set(BROWSER_HEADER

34
apps/browser/MainWindow.cpp
Unescape Escape View File

@ -23,7 +23,7 @@ MainWindow::MainWindow(QWidget *parent)
browser = new ServerModel; browser = new ServerModel;
favorites = new ServerModel; favorites = new ServerModel;
proxyModel = new QSortFilterProxyModel; proxyModel = new MySortFilterProxyModel(this);
proxyModel->setSourceModel(browser); proxyModel->setSourceModel(browser);
tblServerBrowser->setModel(proxyModel); tblServerBrowser->setModel(proxyModel);
tblFavorites->setModel(proxyModel); tblFavorites->setModel(proxyModel);
@ -39,7 +39,12 @@ MainWindow::MainWindow(QWidget *parent)
connect(actionPlay, SIGNAL(triggered(bool)), this, SLOT(play())); connect(actionPlay, SIGNAL(triggered(bool)), this, SLOT(play()));
connect(tblServerBrowser, SIGNAL(clicked(QModelIndex)), this, SLOT(serverSelected())); connect(tblServerBrowser, SIGNAL(clicked(QModelIndex)), this, SLOT(serverSelected()));
connect(tblFavorites, SIGNAL(clicked(QModelIndex)), this, SLOT(serverSelected())); connect(tblFavorites, SIGNAL(clicked(QModelIndex)), this, SLOT(serverSelected()));
connect(tblFavorites, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(play()));
connect(tblServerBrowser, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(play()));
connect(cBoxNotFully, SIGNAL(toggled(bool)), this, SLOT(notFullySwitch(bool)));
connect(cBoxWithPlayers, SIGNAL(toggled(bool)), this, SLOT(havePlayersSwitch(bool)));
connect(comboLatency, SIGNAL(currentIndexChanged(int)), this, SLOT(maxLatencyChanged(int)));
connect(leGamemode, SIGNAL(textChanged(const QString &)), this, SLOT(gamemodeChanged(const QString &)));
loadFavorites(); loadFavorites();
} }
@ -184,4 +189,27 @@ void MainWindow::loadFavorites()
addServerAndUpdate(server.toString()); addServerAndUpdate(server.toString());
file.close(); file.close();
} }
void MainWindow::notFullySwitch(bool state)
{
proxyModel->filterFullServer(state);
}
void MainWindow::havePlayersSwitch(bool state)
{
proxyModel->filterEmptyServers(state);
}
void MainWindow::maxLatencyChanged(int index)
{
int maxLatency = index * 50;
proxyModel->pingLessThan(maxLatency);
}
void MainWindow::gamemodeChanged(const QString &text)
{
proxyModel->setFilterFixedString(text);
proxyModel->setFilterKeyColumn(ServerData::MODNAME);
}

8
apps/browser/MainWindow.hpp
Unescape Escape View File

@ -8,7 +8,7 @@
#include "ui_Main.h" #include "ui_Main.h"
#include "ServerModel.hpp" #include "ServerModel.hpp"
#include <QSortFilterProxyModel> #include "MySortFilterProxyModel.hpp"
#include <components/process/processinvoker.hpp> #include <components/process/processinvoker.hpp>
class MainWindow : public QMainWindow, private Ui::MainWindow class MainWindow : public QMainWindow, private Ui::MainWindow
@ -29,10 +29,14 @@ protected slots:
void deleteServer(); void deleteServer();
void play(); void play();
void serverSelected(); void serverSelected();
void notFullySwitch(bool state);
void havePlayersSwitch(bool state);
void maxLatencyChanged(int index);
void gamemodeChanged(const QString &text);
private: private:
Process::ProcessInvoker *mGameInvoker; Process::ProcessInvoker *mGameInvoker;
ServerModel *browser, *favorites; ServerModel *browser, *favorites;
QSortFilterProxyModel *proxyModel; MySortFilterProxyModel *proxyModel;
void loadFavorites(); void loadFavorites();
}; };

52
apps/browser/MySortFilterProxyModel.cpp
Unescape Escape View File

@ -0,0 +1,52 @@
//
// Created by koncord on 30.01.17.
//
#include "MySortFilterProxyModel.hpp"
#include "ServerModel.hpp"
#include <qdebug.h>
bool MySortFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
{
QModelIndex pingIndex = sourceModel()->index(sourceRow, ServerData::PING, sourceParent);
QModelIndex plIndex = sourceModel()->index(sourceRow, ServerData::PLAYERS, sourceParent);
QModelIndex maxPlIndex = sourceModel()->index(sourceRow, ServerData::MAX_PLAYERS, sourceParent);
int ping = sourceModel()->data(pingIndex).toInt();
int players = sourceModel()->data(plIndex).toInt();
int maxPlayers = sourceModel()->data(maxPlIndex).toInt();
if(maxPing > 0 && (ping == -1 || ping > maxPing))
return false;
if(filterEmpty && players == 0)
return false;
if(filterFull && players >= maxPlayers)
return false;
return QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent);
}
MySortFilterProxyModel::MySortFilterProxyModel(QObject *parent) : QSortFilterProxyModel(parent)
{
}
void MySortFilterProxyModel::filterEmptyServers(bool state)
{
filterEmpty = state;
invalidateFilter();
}
void MySortFilterProxyModel::filterFullServer(bool state)
{
filterFull = state;
invalidateFilter();
}
void MySortFilterProxyModel::pingLessThan(int maxPing)
{
this->maxPing = maxPing;
invalidateFilter();
}

27
apps/browser/MySortFilterProxyModel.hpp
Unescape Escape View File

@ -0,0 +1,27 @@
//
// Created by koncord on 30.01.17.
//
#ifndef OPENMW_MYSORTFILTERPROXYMODEL_HPP
#define OPENMW_MYSORTFILTERPROXYMODEL_HPP
#include <QSortFilterProxyModel>
class MySortFilterProxyModel : public QSortFilterProxyModel
{
Q_OBJECT
protected:
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const Q_DECL_FINAL;
public:
MySortFilterProxyModel(QObject *parent);
void filterFullServer(bool state);
void filterEmptyServers(bool state);
void pingLessThan(int maxPing);
private:
bool filterEmpty, filterFull;
int maxPing;
};
#endif //OPENMW_MYSORTFILTERPROXYMODEL_HPP

5
apps/browser/NetController.cpp
Unescape Escape View File

@ -217,7 +217,10 @@ void NetController::updateInfo()
QStringList addr = sd->addr.split(":"); QStringList addr = sd->addr.split(":");
sd->ping = PingRakNetServer(addr[0].toLatin1(), addr[1].toUShort()); sd->ping = PingRakNetServer(addr[0].toLatin1(), addr[1].toUShort());
sed = getExtendedData(addr[0].toLatin1(), addr[1].toUShort()); if(sd->ping != PING_UNREACHABLE)
sed = getExtendedData(addr[0].toLatin1(), addr[1].toUShort());
else
qDebug() << "Server is unreachable";
} }
QStringList NetController::players() QStringList NetController::players()

1
apps/browser/main.cpp
Unescape Escape View File

@ -43,7 +43,6 @@ int main(int argc, char *argv[])
atexit(NetController::Destroy); atexit(NetController::Destroy);
QApplication app(argc, argv); QApplication app(argc, argv);
MainWindow d; MainWindow d;
d.setWindowTitle("tes3mp Server Browser");
if (d.refresh()) if (d.refresh())
{ {

2
apps/browser/netutils/Utils.cpp
Unescape Escape View File

@ -20,7 +20,7 @@ unsigned int PingRakNetServer(const char *addr, unsigned short port)
RakNet::Packet *packet; RakNet::Packet *packet;
bool done = false; bool done = false;
int attempts = 0; int attempts = 0;
RakNet::TimeMS time = 999; RakNet::TimeMS time = PING_UNREACHABLE;
RakNet::SocketDescriptor socketDescriptor {0, ""}; RakNet::SocketDescriptor socketDescriptor {0, ""};
RakNet::RakPeerInterface *peer = RakNet::RakPeerInterface::GetInstance(); RakNet::RakPeerInterface *peer = RakNet::RakPeerInterface::GetInstance();

2
apps/browser/netutils/Utils.hpp
Unescape Escape View File

@ -9,6 +9,8 @@
#include <string> #include <string>
#define PING_UNREACHABLE 999
unsigned int PingRakNetServer(const char *addr, unsigned short port); unsigned int PingRakNetServer(const char *addr, unsigned short port);
struct ServerExtendedData struct ServerExtendedData

120
files/tes3mp/ui/Main.ui
Unescape Escape View File

@ -11,10 +11,10 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>MainWindow</string> <string>tes3mp Server Browser</string>
</property> </property>
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
@ -68,6 +68,122 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="groupBoxFilters">
<property name="title">
<string>Filters</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="lblMaxLatency">
<property name="text">
<string>Max latency:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboLatency">
<item>
<property name="text">
<string>All</string>
</property>
</item>
<item>
<property name="text">
<string>&lt;50</string>
</property>
</item>
<item>
<property name="text">
<string>&lt;100</string>
</property>
</item>
<item>
<property name="text">
<string>&lt;150</string>
</property>
</item>
<item>
<property name="text">
<string>&lt;200</string>
</property>
</item>
<item>
<property name="text">
<string>&lt;250</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QLabel" name="lblGameMode">
<property name="text">
<string>Game mode</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="leGamemode"/>
</item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QCheckBox" name="cBoxNotFully">
<property name="text">
<string>Not fully</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cBoxWithPlayers">
<property name="text">
<string>With players</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QToolBar" name="toolBar"> <widget class="QToolBar" name="toolBar">

Write Preview
Loading…
Cancel
Save