Skip to content
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

Improve lobby and chat reconnection; allow user to create custom game filters #1139

Merged
merged 13 commits into from
Jan 8, 2025
Merged

Improve lobby and chat reconnection; allow user to create custom game filters #1139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7e59637
Import all QActions from QtGui
Gatsik Jan 7, 2025
33c4989
pre-commit autoupdate
Gatsik Jan 7, 2025
4a4777c
Abort pending rating history requests if they are not needed
Gatsik Jan 7, 2025
b6d53e9
Improve broken reconnection
Gatsik Jan 7, 2025
f9f4503
Handle match_cancelled server message
Gatsik Jan 7, 2025
83ec2ea
Apply tiny improvement that annoingly pollutes git status
Gatsik Jan 7, 2025
27f1256
Allow user to add custom game filters
Gatsik Jan 7, 2025
c5fffdf
Reduce keepalive_interval from 60 to 10 seconds for ServerReconnecter
Gatsik Jan 7, 2025
d4438d6
Handle search_violation command (do nothihng)
Gatsik Jan 7, 2025
9c2d225
Let user know that game filters are case insensitive
Gatsik Jan 8, 2025
d420e3b
Remove some profound bullshit
Gatsik Jan 8, 2025
5fe7080
Disable locked achivements' icons
Gatsik Jan 8, 2025
340b88f
build: Replace transitional libegl1-mesa with libegl1
Gatsik Jan 8, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
libxkbcommon-x11-0 \
x11-utils \
libyaml-dev \
libegl1-mesa \
libegl1 \
libxcb-icccm4 \
libxcb-image0 \
libxcb-keysyms1 \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
libxkbcommon-x11-0 \
x11-utils \
libyaml-dev \
libegl1-mesa \
libegl1 \
libxcb-icccm4 \
libxcb-image0 \
libxcb-keysyms1 \
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -10,7 +10,7 @@ repos:
hooks:
- id: add-trailing-comma
- repo: https://github.com/PyCQA/flake8
rev: 7.1.0
rev: 7.1.1
hooks:
- id: flake8
- repo: https://github.com/PyCQA/isort
Expand Down
23 changes: 22 additions & 1 deletion res/client/client.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,17 @@ QTableWidget::item::hover
border-radius: 3px;
}

QTableWidget#filtersTableWidget::item:hover
{
background: none;
}

QTableWidget#filtersTableWidget::item:selected
{
color: white;
background-color: #306030;
}

QTableWidget#nameHistoryTableWidget::item::hover
{
background: none;
Expand Down Expand Up @@ -747,7 +758,7 @@ QScrollBar::sub-page
background-color: #1f1f1f;
}

QCheckBox#hideGamesWithPw
QCheckBox#hideGamesWithPw,#hideGamesWithMods
{
color:white;
background-color: #111111;
Expand Down Expand Up @@ -781,6 +792,10 @@ QLabel#VSLabel
margin: 0px;
}

QLabel#gameFiltersManagerDescription
{
color: gold;
}

QGroupBox
{
Expand Down Expand Up @@ -995,6 +1010,12 @@ QPushButton#showAllButton
border-radius: 2px;
}

QPushButton#manageGameFiltersButton:hover
{
color: white;
background-color: #808080;
}

QSpinBox, QDoubleSpinBox
{
color:orange;
Expand Down
86 changes: 86 additions & 0 deletions res/games/filtercreator.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>FilterCreator</class>
<widget class="QDialog" name="FilterCreator">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>383</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string>Filter Creator</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QComboBox" name="filterTypeComboBox"/>
</item>
<item row="1" column="0">
<widget class="QComboBox" name="constraintComboBox"/>
</item>
<item row="3" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0">
<widget class="QLineEdit" name="lineEdit"/>
</item>
<item row="4" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>FilterCreator</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>FilterCreator</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>
145 changes: 145 additions & 0 deletions res/games/filtermanager.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Dialog</class>
<widget class="QDialog" name="Dialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>484</width>
<height>394</height>
</rect>
</property>
<property name="windowTitle">
<string>Manage Game Filters</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::Shape::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Shadow::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="addButton">
<property name="text">
<string>Add</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="removeButton">
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0">
<widget class="QTableWidget" name="filtersTableWidget">
<property name="editTriggers">
<set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::SelectionMode::SingleSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectionBehavior::SelectRows</enum>
</property>
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
<attribute name="verticalHeaderStretchLastSection">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string>id</string>
</property>
</column>
<column>
<property name="text">
<string>Type</string>
</property>
</column>
<column>
<property name="text">
<string>Constraint</string>
</property>
</column>
<column>
<property name="text">
<string>Value</string>
</property>
</column>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="gameFiltersManagerDescription">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Set rules upon which games will be EXCLUDED from game list. Case insensitive</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Dialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Dialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>
27 changes: 27 additions & 0 deletions res/games/games.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,26 @@
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="gamesShownCountLabel">
<property name="text">
<string>Games shown:</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="manageGameFiltersButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Manage Filters</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="labelSortGames">
<property name="sizePolicy">
Expand Down Expand Up @@ -445,6 +465,13 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="hideGamesWithMods">
<property name="text">
<string>Hide Modded Games</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down
Loading
Loading