Merge pull request #1136 from Gatsik/chart

Add playercard, fix mapgen options, replay scoreboard is now proper widget, not html string
FAForever · Aug 3, 2024 · 0162bb1 · 0162bb1
2 parents a367768 + 04de926
commit 0162bb1
Show file tree

Hide file tree

Showing 97 changed files with 4,936 additions and 2,437 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: windows-latest
     env:
       UID_VERSION: v4.0.6
-      ICE_ADAPTER_VERSION: v3.3.7
+      ICE_ADAPTER_VERSION: v3.3.9
       BUILD_VERSION: ${{ github.event.inputs.version }}
 
     steps:
@@ -47,25 +47,10 @@ jobs:
         run: |
           python setup.py bdist_msi
 
-      - name: Get Artifact Paths
-        id: artifact_paths
-        run: |
-          function getMsiPath {
-            $files = Get-ChildItem *.msi -Recurse | Select -First 1
-            (Get-Item $files).FullName
-          }
-          $WINDOWS_MSI = getMsiPath
-          Write-Host "MSI path: $WINDOWS_MSI"
-          $WINDOWS_MSI_NAME = (Get-Item $WINDOWS_MSI).Name
-          Write-Host "MSI name: $WINDOWS_MSI_NAME"
-          echo "WINDOWS_MSI=$WINDOWS_MSI" >> "$env:GITHUB_ENV"
-          echo "WINDOWS_MSI_NAME=$WINDOWS_MSI_NAME" >> "$env:GITHUB_ENV"
-
       - name: Calculate checksum
         id: checksum
         run: |
-          Write-Host MSI path is: $env:WINDOWS_MSI
-          $MSI_SUM = $(Get-FileHash $env:WINDOWS_MSI).hash
+          $MSI_SUM = $(Get-FileHash dist/*).hash
           Write-Host $MSI_SUM
           echo "MSI_SUM=$MSI_SUM" >> "$env:GITHUB_ENV"
 
@@ -78,4 +63,4 @@ jobs:
           body: "SHA256: ${{ env.MSI_SUM }}"
           draft: true
           prerelease: true
-          artifacts: ${{ env.WINDOWS_MSI }}
+          artifacts: dist/*
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
     hooks:
     -   id: add-trailing-comma
 -   repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
+    rev: 7.1.0
     hooks:
     -   id: flake8
 -   repo: https://github.com/PyCQA/isort

diff --git a/requirements.txt b/requirements.txt
@@ -6,7 +6,9 @@ jinja2
 pathlib
 pydantic
 pyqt6
+pyqt6-charts
 pyqt6-networkauth
+pyqtgraph
 pytest
 pytest-cov
 pytest-mock

diff --git a/res/client/client.css b/res/client/client.css
@@ -79,6 +79,39 @@ QMenuBar::item
      height: 13px;
  }
 
+QTabWidget
+{
+    background-color:#383838;
+    color: silver;
+    min-width: 80px;
+    padding:4px;
+}
+
+QTabWidget::pane
+{
+    border: none;
+    background-color: #2f2f2f;
+}
+
+QTabWidget > QTabBar::tab
+{
+    background-color:#383838;
+    color: silver;
+    min-width: 80px;
+}
+
+QTabWidget > QTabBar::tab::hover
+{
+    color: silver;
+    background-color: #808080;
+}
+
+QTabWidget > QTabBar::tab::selected
+{
+    color: white;
+    background-color: #758fa0;
+}
+
 QTabWidget#matchmakerQueues::pane
 {
     background-color: none;
@@ -137,6 +170,27 @@ QWidget#centralwidget, QProgressDialog, QWindow, QWizard
     background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFFF, stop:0.1 #000000, stop:1 #1F1F1F);
 }
 
+QWidget#replayScore
+{
+    background-color: #202025;
+    background: #202025;
+    padding: 0px;
+}
+
+QWidget#achievementWidget
+{
+    background-color: #202025;
+}
+
+QWidget#hline
+{
+    background-color: #202025;
+}
+
+QWidget#statisticsChartsScrollArea,#achievementsScrollArea
+{
+    background-color: #383838;
+}
 
 QTabWidget#mainTabs::pane
 { /* The tab widget frame */
@@ -349,6 +403,48 @@ QTextEdit, QPlainTextEdit, QLineEdit, QListWidget, QListView, QTableWidget, QTre
     border-bottom-right-radius : 5px;
 }
 
+QFrame#rankedFrame
+{
+    border-style:solid;
+    border-width:1px;
+    border-color:#353535;
+    color:silver;
+    padding:5px;
+    background-color:#303038;
+    border-bottom-left-radius : 5px;
+    border-bottom-right-radius : 5px;
+}
+
+QListView#replayScoreTeamList
+{
+    border-width:0px;
+    border-color:#353535;
+    color:silver;
+    padding:0px;
+    background-color:#202025;
+    alternate-background-color: #303035;
+    border-top-right-radius : 0px;
+    border-top-left-radius : 0px;
+    border-bottom-left-radius : 0px;
+    border-bottom-right-radius : 0px;
+
+}
+
+QPlainTextEdit#mapNamePlainTextEdit
+{
+    border-width:0px;
+    border-style:solid;
+    border-color:#353535;
+    color:orange;
+    padding:0px;
+    background-color:#202025;
+    alternate-background-color: #303035;
+    border-top-right-radius : 0px;
+    border-top-left-radius : 0px;
+    border-bottom-left-radius : 0px;
+    border-bottom-right-radius : 0px;
+}
+
 QTableView
 {
     border-style:solid;
@@ -434,6 +530,12 @@ QTableWidget::item::hover
     border-radius: 3px;
 }
 
+QTableWidget#nameHistoryTableWidget::item::hover
+{
+    background: none;
+    border-radius: 0px;
+}
+
 
 QTableWidget::item:selected, QListWidget::item:previously-selected, QListView::item:previously-selected
 {
@@ -543,6 +645,16 @@ QScrollArea
     border-bottom-right-radius : 5px;
 }
 
+QScrollArea#replayScoreScrollArea
+{
+    background-color: #202025;
+    background: #202025;
+    color:#202025;
+    border-width: 0px;
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+    padding: 0px;
+}
 
 /* Scrollbars*/
 QScrollBar:horizontal {
@@ -662,6 +774,14 @@ QLabel#labelLoading,#labelAutomatchInfo
     color: gold;
 }
 
+QLabel#VSLabel
+{
+    color: black;
+    background-color: #202025;
+    margin: 0px;
+}
+
+
 QGroupBox
 {
     margin: 5px;
@@ -678,6 +798,11 @@ QLabel
     color: silver;
 }
 
+QLabel::disabled
+{
+    color: gray;
+}
+
 /* Used for dialogs*/
 QDialog
 {
@@ -699,34 +824,36 @@ QCheckBox#spoilerCheckbox, #automaticCheckbox, #showLatestCheckbox, #hideUnrChec
 
 QCheckBox#spoilerCheckbox::indicator:unchecked, #automaticCheckbox::indicator:unchecked, #showLatestCheckbox::indicator:unchecked,
 #hideUnrCheckbox::indicator:unchecked, #matchUsernameCheckbox::indicator:unchecked,
-#landRandomDensity::indicator::unchecked, #plateausRandomDensity::indicator::unchecked, #mountainsRandomDensity::indicator::unchecked,
-#rampsRandomDensity::indicator::unchecked, #mexRandomDensity::indicator::unchecked ,#reclaimRandomDensity::indicator::unchecked
+#landRandomDensity::indicator::unchecked, #resourceRandomGenerator::indicator::unchecked, #mountainsRandomDensity::indicator::unchecked,
+#rampsRandomDensity::indicator::unchecked, #mexRandomDensity::indicator::unchecked ,#reclaimRandomDensity::indicator::unchecked,
+#useCustomStyleCheckBox::indicator::unchecked
 {
     image: url('%THEMEPATH%/client/chboxUncheked.png');
- }
+}
 
-QCheckBox#spoilerCheckbox::indicator:checked, #automaticCheckbox::indicator:checked, #showLatestCheckbox::indicator:checked,
-#hideUnrCheckbox::indicator:checked, #matchUsernameCheckbox::indicator:checked,
-#landRandomDensity::indicator::checked, #plateausRandomDensity::indicator::checked, #mountainsRandomDensity::indicator::checked,
-#rampsRandomDensity::indicator::checked, #mexRandomDensity::indicator::checked ,#reclaimRandomDensity::indicator::checked
+ QCheckBox#spoilerCheckbox::indicator:checked, #automaticCheckbox::indicator:checked, #showLatestCheckbox::indicator:checked,
+ #hideUnrCheckbox::indicator:checked, #matchUsernameCheckbox::indicator:checked,
+ #landRandomDensity::indicator::checked, #plateausRandomDensity::indicator::checked, #mountainsRandomDensity::indicator::checked,
+ #rampsRandomDensity::indicator::checked, #mexRandomDensity::indicator::checked ,#reclaimRandomDensity::indicator::checked,
+ #useCustomStyleCheckBox::indicator::checked
 {
     image: url('%THEMEPATH%/client/chboxCheked.png');
- }
+}
 
- QCheckBox::enabled
- {
-     color: silver;
- }
+QCheckBox::enabled
+{
+    color: silver;
+}
 
- QCheckBox::indicator:unchecked
- {
+QCheckBox::indicator:unchecked
+{
     image: url('%THEMEPATH%/client/chboxUnchecked.png');
- }
+}
 
- QCheckBox::indicator:checked
- {
+QCheckBox::indicator:checked
+{
     image: url('%THEMEPATH%/client/chboxChecked.png');
- }
+}
 
 /* Used for Ranked Buttons only at the moment*/
 QToolButton#rankedPlay
@@ -743,14 +870,6 @@ QToolButton#rankedPlay::disabled
     border: 1px solid darkslategrey;
 }
 
-QProgressBar#searchProgress
-{
-    background-color: silver;
-    padding: 2px;
-	border-radius: 5px;
-	border: 1px solid grey;
-}
-
 QToolButton#mapsPool
 {
 	color: silver;
@@ -779,7 +898,7 @@ QToolButton::hover
 
     color:silver;
     padding:5px;
-    background-color:#606060;
+    background-color:#808080;
     border-radius : 5px;
  }
 
@@ -876,22 +995,43 @@ QPushButton#showAllButton
     border-radius: 2px;
 }
 
-QComboBox, QComboBox:selected, QDoubleSpinBox#mapSize
+QSpinBox, QDoubleSpinBox
 {
     color:orange;
     selection-color:orange;
     background-color: #575656;
     selection-background-color: #575656;
+    border: 1 solid;
+    border-color: #555450;
+
 }
 
-QDoubleSpinBox#mapSize
+QSpinBox::disabled, QDoubleSpinBox::disabled
 {
+    color:gray;
+    selection-color:gray;
+    background-color: #575656;
+    selection-background-color: #575656;
     border: 1 solid;
     border-color: #555450;
-    selection-color: white;
-    selection-background-color: slateblue;
+
 }
 
+
+QComboBox, QComboBox:selected
+{
+    color:orange;
+    selection-color:orange;
+    background-color: #575656;
+    selection-background-color: #575656;
+}
+
+QComboBox::disabled
+{
+    color:gray;
+}
+
+
 QComboBox QAbstractItemView {
     border: 2px solid darkgray;
     selection-background-color: #575656;
@@ -909,3 +1049,21 @@ QFrame#settingsFrame {
     border-bottom-left-radius : 5px;
     border-bottom-right-radius : 5px;
 }
+
+#line
+{
+    background-color: #202025;
+}
+
+QProgressBar#achievementBar
+{
+    background-color: gray;
+    text-align: center;
+    max-height: 12px;
+    border: 1px solid black;
+}
+
+QProgressBar#achievementBar::chunk
+{
+    background-color: orange;
+}