Skip to content

Commit e470b60

Browse files
GatsikGatsik
committed
Fix some code style issues
1 parent 00ed0e4 commit e470b60

Some content is hidden

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

65 files changed

+189
-127
lines changed

‎changelog.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Contributors:
3939
* Fix basic searching in vaults
4040
* Implement somewhat of a cache system like in the Java client
4141
* Online replay vault: fix downloading replays
42-
42+
4343
Contributors:
4444
- Gatsik
4545

@@ -92,15 +92,15 @@ Contributors:
9292
Contributors:
9393
- Strogo
9494
- muellni
95-
95+
9696
0.18.3
9797
=====
9898
* ICE adapter debug window fixes
9999

100100
Contributors:
101101
- Geosearchef
102102
- muellni
103-
103+
104104
0.18.2
105105
=====
106106
* ICE adapter integration
@@ -662,7 +662,7 @@ Bugfixes
662662
- Fixed colouring problem with certain names
663663
- Automatic login will now get disabled if login fails
664664
- Fixed exceptions popping up related to corrupted replays
665-
- Logs will no longer fill to unreasonable sizes
665+
- Logs will no longer fill to unreasonable sizes
666666
- Many other small issues fixed
667667

668668

‎res/client/client.css

+8-8
Original file line numberDiff line numberDiff line change
@@ -259,12 +259,12 @@ QSplitter::handle:hover
259259
background-color: #353535;
260260
color: orange;
261261
}
262-
262+
263263
QDateEdit:disabled
264264
{
265265
color: #8D8B85;
266266
}
267-
267+
268268
QDateEdit::down-arrow
269269
{
270270
color: orange;
@@ -297,7 +297,7 @@ QSpinBox#minRating::disabled
297297
background-color: #4b4b4b;
298298
}
299299

300-
QComboBox#filter1, #filter2, #filter3, #filter4, #filter5, #filter6,
300+
QComboBox#filter1, #filter2, #filter3, #filter4, #filter5, #filter6,
301301
#operator1, #operator2, #operator3, #operator4, #operator5, #operator6
302302
{
303303
background-color: #353535;
@@ -310,7 +310,7 @@ QToolBox#replayToolBox::tab
310310
color: silver;
311311
border-radius: 3px;
312312
padding-left: 145px; /* "alignment: center" doesn't work with toolboxes :| */
313-
}
313+
}
314314

315315
#advancedSearch, #mapPreview
316316
{
@@ -374,7 +374,7 @@ QHeaderView::section
374374
background-color: #4b4b4b;
375375
font: bold;
376376
border-left: 1 solid;
377-
377+
378378
}
379379

380380
QHeaderView::down-arrow
@@ -671,15 +671,15 @@ QCheckBox#spoilerCheckbox, #automaticCheckbox, #showLatestCheckbox, #hideUnrChec
671671
{
672672
color: silver;
673673
}
674-
QCheckBox#spoilerCheckbox::indicator:unchecked, #automaticCheckbox::indicator:unchecked, #showLatestCheckbox::indicator:unchecked,
674+
QCheckBox#spoilerCheckbox::indicator:unchecked, #automaticCheckbox::indicator:unchecked, #showLatestCheckbox::indicator:unchecked,
675675
#hideUnrCheckbox::indicator:unchecked
676676
,#landRandomDensity::indicator::unchecked, #plateausRandomDensity::indicator::unchecked, #mountainsRandomDensity::indicator::unchecked
677677
,#rampsRandomDensity::indicator::unchecked, #mexRandomDensity::indicator::unchecked ,#reclaimRandomDensity::indicator::unchecked
678678
{
679679
image: url('%THEMEPATH%/client/chboxUncheked.png');
680680
}
681681

682-
QCheckBox#spoilerCheckbox::indicator:checked, #automaticCheckbox::indicator:checked, #showLatestCheckbox::indicator:checked,
682+
QCheckBox#spoilerCheckbox::indicator:checked, #automaticCheckbox::indicator:checked, #showLatestCheckbox::indicator:checked,
683683
#hideUnrCheckbox::indicator:checked
684684
,#landRandomDensity::indicator::checked, #plateausRandomDensity::indicator::checked, #mountainsRandomDensity::indicator::checked
685685
,#rampsRandomDensity::indicator::checked, #mexRandomDensity::indicator::checked ,#reclaimRandomDensity::indicator::checked
@@ -759,7 +759,7 @@ QToolButton::checked
759759
background-color:#C0C0C0;
760760
border-radius : 5px;
761761
}
762-
762+
763763
QPushButton#refreshButton, #nextButton, #previousButton, #goToPageButton, #firstButton, #lastButton,
764764
#resetButton, #searchPlayerButton, #UIButton, #uploadButton, #kickButton, #leaveButton
765765
{

‎res/client/randomcolors.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
["IndianRed","LightCoral","Salmon","DarkSalmon","LightSalmon","Red","FireBrick","DarkRed","Pink","LightPink","HotPink","DeepPink","MediumVioletRed","PaleVioletRed","LightSalmon","Coral","Tomato","Gold","Yellow","LightYellow","LemonChiffon","LightGoldenrodYellow","PapayaWhip","Moccasin","PeachPuff","PaleGoldenrod","Khaki","DarkKhaki","Lavender","Thistle","Plum","Violet","Orchid","Fuchsia","Magenta","MediumOrchid","MediumPurple","Amethyst","BlueViolet","DarkViolet","DarkOrchid","DarkMagenta","Purple","SlateBlue","DarkSlateBlue","MediumSlateBlue","GreenYellow","Chartreuse","LawnGreen","Lime","LimeGreen","PaleGreen","LightGreen","MediumSpringGreen","SpringGreen","MediumSeaGreen","SeaGreen","ForestGreen","Green","DarkGreen","YellowGreen","OliveDrab","Olive","DarkOliveGreen","MediumAquamarine","DarkSeaGreen","LightSeaGreen","DarkCyan","Teal","Aqua","Cyan","LightCyan","PaleTurquoise","Aquamarine","Turquoise","MediumTurquoise","DarkTurquoise","CadetBlue","SteelBlue","LightSteelBlue","PowderBlue","SkyBlue","DeepSkyBlue","DodgerBlue","CornflowerBlue","MediumSlateBlue","RoyalBlue","Blue","MediumBlue"]
1+
["IndianRed","LightCoral","Salmon","DarkSalmon","LightSalmon","Red","FireBrick","DarkRed","Pink","LightPink","HotPink","DeepPink","MediumVioletRed","PaleVioletRed","LightSalmon","Coral","Tomato","Gold","Yellow","LightYellow","LemonChiffon","LightGoldenrodYellow","PapayaWhip","Moccasin","PeachPuff","PaleGoldenrod","Khaki","DarkKhaki","Lavender","Thistle","Plum","Violet","Orchid","Fuchsia","Magenta","MediumOrchid","MediumPurple","Amethyst","BlueViolet","DarkViolet","DarkOrchid","DarkMagenta","Purple","SlateBlue","DarkSlateBlue","MediumSlateBlue","GreenYellow","Chartreuse","LawnGreen","Lime","LimeGreen","PaleGreen","LightGreen","MediumSpringGreen","SpringGreen","MediumSeaGreen","SeaGreen","ForestGreen","Green","DarkGreen","YellowGreen","OliveDrab","Olive","DarkOliveGreen","MediumAquamarine","DarkSeaGreen","LightSeaGreen","DarkCyan","Teal","Aqua","Cyan","LightCyan","PaleTurquoise","Aquamarine","Turquoise","MediumTurquoise","DarkTurquoise","CadetBlue","SteelBlue","LightSteelBlue","PowderBlue","SkyBlue","DeepSkyBlue","DodgerBlue","CornflowerBlue","MediumSlateBlue","RoyalBlue","Blue","MediumBlue"]

‎res/coop/formatters/coop.qthtml

-2
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,3 @@
99
</td>
1010
<tr>
1111
</table>
12-
13-

‎res/coop/formatters/style.css

+4-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ QTabWidget::pane
3333

3434

3535
/* Style the tab using the tab sub-control. Note that it reads QTabBar _not_ QTabWidget */
36-
QTabWidget > QTabBar::tab
36+
QTabWidget > QTabBar::tab
3737
{
3838
background-color:#383838;
3939
color: silver;
@@ -42,21 +42,21 @@ QTabWidget > QTabBar::tab
4242
}
4343

4444

45-
QTabWidget > QTabBar::tab:!selected
45+
QTabWidget > QTabBar::tab:!selected
4646
{
4747

4848
background-color: #203040;
4949
}
5050

5151

52-
QTabWidget > QTabBar::tab:hover
52+
QTabWidget > QTabBar::tab:hover
5353
{
5454
color:white;
5555
background-color: #606060;
5656
}
5757

5858

59-
QTabWidget > QTabBar::tab:selected
59+
QTabWidget > QTabBar::tab:selected
6060
{
6161
color:white;
6262
background-color: #303030;
@@ -106,4 +106,3 @@ body {background-color: #2f2f2f; overflow: hidden;}
106106
.pages .current_page {color: black;}
107107

108108
.search_form {float: left;}
109-

‎res/games/formatters/faf.qthtml

-2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,3 @@
1515
</tr>
1616
</tbody>
1717
</table>
18-
19-

‎res/notification_system/dialog.ui

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</property>
1616
<property name="styleSheet">
1717
<string notr="true">QDialog {
18-
18+
1919
background-color: #272b30;
2020
}
2121

@@ -56,7 +56,7 @@ QPushButton:hover {
5656
background-color: rgba(0,0,0,0);
5757
width: 18px;
5858
height: 18px;
59-
59+
6060
}</string>
6161
</property>
6262
<layout class="QVBoxLayout">
@@ -118,7 +118,7 @@ QPushButton:hover {
118118
<string notr="true">QLabel {
119119
color: rgb(255, 255, 255);
120120
font-weight: bold;
121-
font-family: Verdana;
121+
font-family: Verdana;
122122
font-size:13pt;
123123
}
124124

‎res/stats/formatters/ladder_header.qthtml

-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@
33
<th width="100%">{name}</th>
44
<th align="center" width="50">{score}</th>
55
</tr>
6-

‎res/stats/formatters/style.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ QTabWidget::pane
1414
}
1515

1616
/* Style the tab using the tab sub-control. Note that it reads QTabBar _not_ QTabWidget */
17-
QTabWidget > QTabBar::tab
17+
QTabWidget > QTabBar::tab
1818
{
1919
background-color:#383838;
2020
color: silver;
@@ -27,7 +27,7 @@ QTabWidget > QTabBar::tab:!selected
2727
background-color: #203040;
2828
}
2929

30-
QTabWidget > QTabBar::tab:hover
30+
QTabWidget > QTabBar::tab:hover
3131
{
3232
color:white;
3333
background-color: #606060;

‎res/tournaments/formatters/open.qthtml

-2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,3 @@
1515

1616
</tbody>
1717
</table>
18-
19-

‎res/tournaments/formatters/style.css

-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,3 @@ QListWidget::item::hover
1313
{
1414
background-color: #555555;
1515
}
16-

‎res/tutorials/formatters/tutorials.qthtml

-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,3 @@
1111
</tr>
1212
</tbody>
1313
</table>
14-
15-

‎res/vaults/modvault/comment.qthtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
</table>
44
<p width = 300>
55
{text}
6-
</p>
6+
</p>

‎res/vaults/modvault/uimod.qthtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
<p width="300">
44
{description}
55
</p>
6-
</font>
6+
</font>

‎runtests.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#! /usr/bin/env python3
22

3-
import pytest
43
import sys
54

5+
import pytest
6+
67
if __name__ == '__main__':
78
sys.exit(pytest.main(sys.argv[1:]))

‎setup.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import os
2-
import sys
32
import site
3+
import sys
4+
from pathlib import Path
45

6+
import PyQt5.uic
57
import sip
6-
from pathlib import Path
78

89
sip.setapi('QString', 2)
910
sip.setapi('QVariant', 2)
1011
sip.setapi('QStringList', 2)
1112
sip.setapi('QList', 2)
1213
sip.setapi('QProcess', 2)
1314

14-
import PyQt5.uic
1515
if sys.platform == 'win32':
16-
from cx_Freeze import setup, Executable
16+
from cx_Freeze import Executable, setup
1717
else:
1818
from distutils.core import setup
1919

@@ -169,5 +169,5 @@ def get_jsonschema_includes():
169169
maintainer='Sheeo',
170170
url='http://www.faforever.com',
171171
license='GNU General Public License, Version 3',
172-
**platform_options
172+
**platform_options,
173173
)

‎src/__main__.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010

1111
# According to PyQt5 docs we need to import QtWebEngineWidgets before we create
1212
# QApplication
13-
from PyQt5 import QtWebEngineWidgets, QtWidgets, uic
13+
from PyQt5 import QtWebEngineWidgets # noqa: F401
14+
from PyQt5 import QtWidgets, uic
1415
from PyQt5.QtCore import Qt
1516

1617
import util

‎src/api/stats_api.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
from .ApiBase import ApiBase
21
import logging
2+
3+
from .ApiBase import ApiBase
4+
35
logger = logging.getLogger(__name__)
46

57

‎src/chat/__init__.py

+5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
from chat.chatlineedit import ChatLineEdit
44
from chat.chatterlistview import ChatterListView
55

6+
__all__ = (
7+
"ChatLineEdit",
8+
"ChatterListView",
9+
)
10+
611

712
class ChatMVC:
813
def __init__(

‎src/chat/channel_view.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@
99
from chat.channel_widget import ChannelWidget
1010
from chat.chatter_menu import ChatterMenu
1111
from chat.chatter_model import (
12-
ChatterEventFilter, ChatterFormat,
13-
ChatterItemDelegate, ChatterLayout,
14-
ChatterLayoutElements, ChatterModel,
12+
ChatterEventFilter,
13+
ChatterFormat,
14+
ChatterItemDelegate,
15+
ChatterLayout,
16+
ChatterLayoutElements,
17+
ChatterModel,
1518
ChatterSortFilterModel,
1619
)
1720
from downloadManager import DownloadRequest

‎src/client/__init__.py

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55

66
from ._clientwindow import ClientWindow
77

8+
__all__ = (
9+
"ThemeMenu",
10+
)
11+
812
logger = logging.getLogger(__name__)
913

1014
instance = ClientWindow()

‎src/client/_clientwindow.py

+14-6
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,33 @@
2424
from chat.ircconnection import IrcConnection
2525
from chat.language_channel_config import LanguageChannelConfig
2626
from chat.line_restorer import ChatLineRestorer
27-
from client.clientstate import ClientState
2827
from client.aliasviewer import AliasSearchWindow, AliasWindow
2928
from client.chat_config import ChatConfig
29+
from client.clientstate import ClientState
3030
from client.connection import (
31-
ConnectionState, Dispatcher, LobbyInfo,
32-
ServerConnection, ServerReconnecter,
31+
ConnectionState,
32+
Dispatcher,
33+
LobbyInfo,
34+
ServerConnection,
35+
ServerReconnecter,
3336
)
3437
from client.gameannouncer import GameAnnouncer
3538
from client.login import LoginWidget
3639
from client.playercolors import PlayerColors
3740
from client.theme_menu import ThemeMenu
3841
from client.user import (
39-
User, UserRelationController, UserRelationModel,
40-
UserRelations, UserRelationTrackers,
42+
User,
43+
UserRelationController,
44+
UserRelationModel,
45+
UserRelations,
46+
UserRelationTrackers,
4147
)
4248
from connectivity.ConnectivityDialog import ConnectivityDialog
4349
from coop import CoopWidget
4450
from downloadManager import (
45-
MAP_PREVIEW_ROOT, AvatarDownloader, PreviewDownloader,
51+
MAP_PREVIEW_ROOT,
52+
AvatarDownloader,
53+
PreviewDownloader,
4654
)
4755
from fa.factions import Factions
4856
from fa.game_runner import GameRunner

‎src/client/aliasviewer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import logging
22

33
from PyQt5 import QtWidgets
4-
from PyQt5.QtCore import QDateTime, QTimer, Qt
4+
from PyQt5.QtCore import QDateTime, Qt, QTimer
55

66
from api.player_api import PlayerApiConnector
77

‎src/coop/__init__.py

+4
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@
33
# For use by other modules
44
from ._coopwidget import CoopWidget
55

6+
__all__ = (
7+
"CoopWidget",
8+
)
9+
610
logger = logging.getLogger(__name__)

0 commit comments

Comments
 (0)