Skip to content

Remove TCP entry point #1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Salanto merged 4 commits into from
Jul 9, 2024
Merged

Remove TCP entry point #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
054a022
Remove TCP entry point
TrickyLeifa Jul 7, 2024
a61a815
Tweaked error message
TrickyLeifa Jul 7, 2024
ef2c56d
Merge branch 'master' into tcp-removal
stonedDiscord Jul 9, 2024
99dec6c
Merge branch 'master' into tcp-removal
Salanto Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,8 @@ add_executable(Attorney_Online
src/lobby.cpp
src/lobby.h
src/main.cpp
src/net/netconnection.cpp
src/net/netconnection.h
src/net/nettcpconnection.cpp
src/net/nettcpconnection.h
src/net/netwebsocketconnection.cpp
src/net/netwebsocketconnection.h
src/network/websocketconnection.cpp
src/network/websocketconnection.h
src/networkmanager.cpp
src/networkmanager.h
src/options.cpp
Expand All @@ -103,6 +99,7 @@ add_executable(Attorney_Online
src/widgets/server_editor_dialog.h
data.qrc
src/screenslidetimer.h src/screenslidetimer.cpp
src/network/serverinfo.h src/network/serverinfo.cpp
)

set_target_properties(Attorney_Online PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/bin")
Expand Down
23 changes: 1 addition & 22 deletions data/ui/favorite_server_dialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,34 +78,13 @@
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Protocol:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="protocol">
<item>
<property name="text">
<string>TCP</string>
</property>
</item>
<item>
<property name="text">
<string>WEBSOCKET</string>
</property>
</item>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Description:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<item row="3" column="1">
<widget class="QPlainTextEdit" name="description">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
Expand Down
18 changes: 14 additions & 4 deletions data/ui/lobby.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,14 @@ QScrollBar:horizontall {
<item row="1" column="0">
<widget class="QTreeWidget" name="serverlist_tree">
<property name="styleSheet">
<string notr="true">background-color: rgba(140, 140, 140, 255);
color: rgb(255, 255, 255);</string>
<string notr="true">QHeaderView, QTreeView {
background-color: rgba(140, 140, 140, 255);
color: rgb(255, 255, 255);
}

QToolTip {
color: black;
}</string>
</property>
<property name="textElideMode">
<enum>Qt::ElideNone</enum>
Expand All @@ -330,7 +336,7 @@ color: rgb(255, 255, 255);</string>
<string>#</string>
</property>
<property name="textAlignment">
<set>AlignTrailing|AlignVCenter</set>
<set>AlignLeading|AlignVCenter</set>
</property>
</column>
<column>
Expand Down Expand Up @@ -369,7 +375,11 @@ color: rgb(255, 255, 255);</string>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgba(140, 140, 140, 255);
color: rgb(255, 255, 255);</string>
color: rgb(255, 255, 255);

QToolTip {
color: black;
};</string>
</property>
<property name="textElideMode">
<enum>Qt::ElideNone</enum>
Expand Down
19 changes: 0 additions & 19 deletions src/datatypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,6 @@

#include <optional>

enum ServerConnectionType
{
TcpServerConnection,
WebSocketServerConnection,
};

static const QMap<QString, ServerConnectionType> SERVER_CONNECTION_TYPE_STRING_MAP = {{"tcp", ServerConnectionType::TcpServerConnection}, {"ws", ServerConnectionType::WebSocketServerConnection}};

struct ServerInfo
{
QString name;
QString description;
QString ip;
int port;
ServerConnectionType socket_type;

inline QString toString() { return QString("%1 (<%2>%3:%4)").arg(name, SERVER_CONNECTION_TYPE_STRING_MAP.key(socket_type), ip, QString::number(port)); }
};

struct CharacterSlot
{
QString name;
Expand Down
Loading