Skip to content

Commit 0162bb1

Browse files
GatsikGatsik
authored
Merge pull request FAForever#1136 from Gatsik/chart
Add playercard, fix mapgen options, replay scoreboard is now proper widget, not html string
2 parents a367768 + 04de926 commit 0162bb1

File tree

97 files changed

+4936
-2437
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+4936
-2437
lines changed

‎.github/workflows/release.yml

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: windows-latest
1414
env:
1515
UID_VERSION: v4.0.6
16-
ICE_ADAPTER_VERSION: v3.3.7
16+
ICE_ADAPTER_VERSION: v3.3.9
1717
BUILD_VERSION: ${{ github.event.inputs.version }}
1818

1919
steps:
@@ -47,25 +47,10 @@ jobs:
4747
run: |
4848
python setup.py bdist_msi
4949
50-
- name: Get Artifact Paths
51-
id: artifact_paths
52-
run: |
53-
function getMsiPath {
54-
$files = Get-ChildItem *.msi -Recurse | Select -First 1
55-
(Get-Item $files).FullName
56-
}
57-
$WINDOWS_MSI = getMsiPath
58-
Write-Host "MSI path: $WINDOWS_MSI"
59-
$WINDOWS_MSI_NAME = (Get-Item $WINDOWS_MSI).Name
60-
Write-Host "MSI name: $WINDOWS_MSI_NAME"
61-
echo "WINDOWS_MSI=$WINDOWS_MSI" >> "$env:GITHUB_ENV"
62-
echo "WINDOWS_MSI_NAME=$WINDOWS_MSI_NAME" >> "$env:GITHUB_ENV"
63-
6450
- name: Calculate checksum
6551
id: checksum
6652
run: |
67-
Write-Host MSI path is: $env:WINDOWS_MSI
68-
$MSI_SUM = $(Get-FileHash $env:WINDOWS_MSI).hash
53+
$MSI_SUM = $(Get-FileHash dist/*).hash
6954
Write-Host $MSI_SUM
7055
echo "MSI_SUM=$MSI_SUM" >> "$env:GITHUB_ENV"
7156
@@ -78,4 +63,4 @@ jobs:
7863
body: "SHA256: ${{ env.MSI_SUM }}"
7964
draft: true
8065
prerelease: true
81-
artifacts: ${{ env.WINDOWS_MSI }}
66+
artifacts: dist/*

‎.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repos:
1010
hooks:
1111
- id: add-trailing-comma
1212
- repo: https://github.com/PyCQA/flake8
13-
rev: 7.0.0
13+
rev: 7.1.0
1414
hooks:
1515
- id: flake8
1616
- repo: https://github.com/PyCQA/isort

‎requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ jinja2
66
pathlib
77
pydantic
88
pyqt6
9+
pyqt6-charts
910
pyqt6-networkauth
11+
pyqtgraph
1012
pytest
1113
pytest-cov
1214
pytest-mock

‎res/client/client.css

Lines changed: 189 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,39 @@ QMenuBar::item
7979
height: 13px;
8080
}
8181

82+
QTabWidget
83+
{
84+
background-color:#383838;
85+
color: silver;
86+
min-width: 80px;
87+
padding:4px;
88+
}
89+
90+
QTabWidget::pane
91+
{
92+
border: none;
93+
background-color: #2f2f2f;
94+
}
95+
96+
QTabWidget > QTabBar::tab
97+
{
98+
background-color:#383838;
99+
color: silver;
100+
min-width: 80px;
101+
}
102+
103+
QTabWidget > QTabBar::tab::hover
104+
{
105+
color: silver;
106+
background-color: #808080;
107+
}
108+
109+
QTabWidget > QTabBar::tab::selected
110+
{
111+
color: white;
112+
background-color: #758fa0;
113+
}
114+
82115
QTabWidget#matchmakerQueues::pane
83116
{
84117
background-color: none;
@@ -137,6 +170,27 @@ QWidget#centralwidget, QProgressDialog, QWindow, QWizard
137170
background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFFF, stop:0.1 #000000, stop:1 #1F1F1F);
138171
}
139172

173+
QWidget#replayScore
174+
{
175+
background-color: #202025;
176+
background: #202025;
177+
padding: 0px;
178+
}
179+
180+
QWidget#achievementWidget
181+
{
182+
background-color: #202025;
183+
}
184+
185+
QWidget#hline
186+
{
187+
background-color: #202025;
188+
}
189+
190+
QWidget#statisticsChartsScrollArea,#achievementsScrollArea
191+
{
192+
background-color: #383838;
193+
}
140194

141195
QTabWidget#mainTabs::pane
142196
{ /* The tab widget frame */
@@ -349,6 +403,48 @@ QTextEdit, QPlainTextEdit, QLineEdit, QListWidget, QListView, QTableWidget, QTre
349403
border-bottom-right-radius : 5px;
350404
}
351405

406+
QFrame#rankedFrame
407+
{
408+
border-style:solid;
409+
border-width:1px;
410+
border-color:#353535;
411+
color:silver;
412+
padding:5px;
413+
background-color:#303038;
414+
border-bottom-left-radius : 5px;
415+
border-bottom-right-radius : 5px;
416+
}
417+
418+
QListView#replayScoreTeamList
419+
{
420+
border-width:0px;
421+
border-color:#353535;
422+
color:silver;
423+
padding:0px;
424+
background-color:#202025;
425+
alternate-background-color: #303035;
426+
border-top-right-radius : 0px;
427+
border-top-left-radius : 0px;
428+
border-bottom-left-radius : 0px;
429+
border-bottom-right-radius : 0px;
430+
431+
}
432+
433+
QPlainTextEdit#mapNamePlainTextEdit
434+
{
435+
border-width:0px;
436+
border-style:solid;
437+
border-color:#353535;
438+
color:orange;
439+
padding:0px;
440+
background-color:#202025;
441+
alternate-background-color: #303035;
442+
border-top-right-radius : 0px;
443+
border-top-left-radius : 0px;
444+
border-bottom-left-radius : 0px;
445+
border-bottom-right-radius : 0px;
446+
}
447+
352448
QTableView
353449
{
354450
border-style:solid;
@@ -434,6 +530,12 @@ QTableWidget::item::hover
434530
border-radius: 3px;
435531
}
436532

533+
QTableWidget#nameHistoryTableWidget::item::hover
534+
{
535+
background: none;
536+
border-radius: 0px;
537+
}
538+
437539

438540
QTableWidget::item:selected, QListWidget::item:previously-selected, QListView::item:previously-selected
439541
{
@@ -543,6 +645,16 @@ QScrollArea
543645
border-bottom-right-radius : 5px;
544646
}
545647

648+
QScrollArea#replayScoreScrollArea
649+
{
650+
background-color: #202025;
651+
background: #202025;
652+
color:#202025;
653+
border-width: 0px;
654+
border-bottom-left-radius: 0px;
655+
border-bottom-right-radius: 0px;
656+
padding: 0px;
657+
}
546658

547659
/* Scrollbars*/
548660
QScrollBar:horizontal {
@@ -662,6 +774,14 @@ QLabel#labelLoading,#labelAutomatchInfo
662774
color: gold;
663775
}
664776

777+
QLabel#VSLabel
778+
{
779+
color: black;
780+
background-color: #202025;
781+
margin: 0px;
782+
}
783+
784+
665785
QGroupBox
666786
{
667787
margin: 5px;
@@ -678,6 +798,11 @@ QLabel
678798
color: silver;
679799
}
680800

801+
QLabel::disabled
802+
{
803+
color: gray;
804+
}
805+
681806
/* Used for dialogs*/
682807
QDialog
683808
{
@@ -699,34 +824,36 @@ QCheckBox#spoilerCheckbox, #automaticCheckbox, #showLatestCheckbox, #hideUnrChec
699824

700825
QCheckBox#spoilerCheckbox::indicator:unchecked, #automaticCheckbox::indicator:unchecked, #showLatestCheckbox::indicator:unchecked,
701826
#hideUnrCheckbox::indicator:unchecked, #matchUsernameCheckbox::indicator:unchecked,
702-
#landRandomDensity::indicator::unchecked, #plateausRandomDensity::indicator::unchecked, #mountainsRandomDensity::indicator::unchecked,
703-
#rampsRandomDensity::indicator::unchecked, #mexRandomDensity::indicator::unchecked ,#reclaimRandomDensity::indicator::unchecked
827+
#landRandomDensity::indicator::unchecked, #resourceRandomGenerator::indicator::unchecked, #mountainsRandomDensity::indicator::unchecked,
828+
#rampsRandomDensity::indicator::unchecked, #mexRandomDensity::indicator::unchecked ,#reclaimRandomDensity::indicator::unchecked,
829+
#useCustomStyleCheckBox::indicator::unchecked
704830
{
705831
image: url('%THEMEPATH%/client/chboxUncheked.png');
706-
}
832+
}
707833

708-
QCheckBox#spoilerCheckbox::indicator:checked, #automaticCheckbox::indicator:checked, #showLatestCheckbox::indicator:checked,
709-
#hideUnrCheckbox::indicator:checked, #matchUsernameCheckbox::indicator:checked,
710-
#landRandomDensity::indicator::checked, #plateausRandomDensity::indicator::checked, #mountainsRandomDensity::indicator::checked,
711-
#rampsRandomDensity::indicator::checked, #mexRandomDensity::indicator::checked ,#reclaimRandomDensity::indicator::checked
834+
QCheckBox#spoilerCheckbox::indicator:checked, #automaticCheckbox::indicator:checked, #showLatestCheckbox::indicator:checked,
835+
#hideUnrCheckbox::indicator:checked, #matchUsernameCheckbox::indicator:checked,
836+
#landRandomDensity::indicator::checked, #plateausRandomDensity::indicator::checked, #mountainsRandomDensity::indicator::checked,
837+
#rampsRandomDensity::indicator::checked, #mexRandomDensity::indicator::checked ,#reclaimRandomDensity::indicator::checked,
838+
#useCustomStyleCheckBox::indicator::checked
712839
{
713840
image: url('%THEMEPATH%/client/chboxCheked.png');
714-
}
841+
}
715842

716-
QCheckBox::enabled
717-
{
718-
color: silver;
719-
}
843+
QCheckBox::enabled
844+
{
845+
color: silver;
846+
}
720847

721-
QCheckBox::indicator:unchecked
722-
{
848+
QCheckBox::indicator:unchecked
849+
{
723850
image: url('%THEMEPATH%/client/chboxUnchecked.png');
724-
}
851+
}
725852

726-
QCheckBox::indicator:checked
727-
{
853+
QCheckBox::indicator:checked
854+
{
728855
image: url('%THEMEPATH%/client/chboxChecked.png');
729-
}
856+
}
730857

731858
/* Used for Ranked Buttons only at the moment*/
732859
QToolButton#rankedPlay
@@ -743,14 +870,6 @@ QToolButton#rankedPlay::disabled
743870
border: 1px solid darkslategrey;
744871
}
745872

746-
QProgressBar#searchProgress
747-
{
748-
background-color: silver;
749-
padding: 2px;
750-
border-radius: 5px;
751-
border: 1px solid grey;
752-
}
753-
754873
QToolButton#mapsPool
755874
{
756875
color: silver;
@@ -779,7 +898,7 @@ QToolButton::hover
779898

780899
color:silver;
781900
padding:5px;
782-
background-color:#606060;
901+
background-color:#808080;
783902
border-radius : 5px;
784903
}
785904

@@ -876,22 +995,43 @@ QPushButton#showAllButton
876995
border-radius: 2px;
877996
}
878997

879-
QComboBox, QComboBox:selected, QDoubleSpinBox#mapSize
998+
QSpinBox, QDoubleSpinBox
880999
{
8811000
color:orange;
8821001
selection-color:orange;
8831002
background-color: #575656;
8841003
selection-background-color: #575656;
1004+
border: 1 solid;
1005+
border-color: #555450;
1006+
8851007
}
8861008

887-
QDoubleSpinBox#mapSize
1009+
QSpinBox::disabled, QDoubleSpinBox::disabled
8881010
{
1011+
color:gray;
1012+
selection-color:gray;
1013+
background-color: #575656;
1014+
selection-background-color: #575656;
8891015
border: 1 solid;
8901016
border-color: #555450;
891-
selection-color: white;
892-
selection-background-color: slateblue;
1017+
8931018
}
8941019

1020+
1021+
QComboBox, QComboBox:selected
1022+
{
1023+
color:orange;
1024+
selection-color:orange;
1025+
background-color: #575656;
1026+
selection-background-color: #575656;
1027+
}
1028+
1029+
QComboBox::disabled
1030+
{
1031+
color:gray;
1032+
}
1033+
1034+
8951035
QComboBox QAbstractItemView {
8961036
border: 2px solid darkgray;
8971037
selection-background-color: #575656;
@@ -909,3 +1049,21 @@ QFrame#settingsFrame {
9091049
border-bottom-left-radius : 5px;
9101050
border-bottom-right-radius : 5px;
9111051
}
1052+
1053+
#line
1054+
{
1055+
background-color: #202025;
1056+
}
1057+
1058+
QProgressBar#achievementBar
1059+
{
1060+
background-color: gray;
1061+
text-align: center;
1062+
max-height: 12px;
1063+
border: 1px solid black;
1064+
}
1065+
1066+
QProgressBar#achievementBar::chunk
1067+
{
1068+
background-color: orange;
1069+
}

0 commit comments

Comments
 (0)