Skip to content

Commit 659c094

Browse files
committed
Maj pyqt6
1 parent e6f1f8f commit 659c094

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

C2Client/C2Client/GraphPanel.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ def __init__(self, parent, grpcClient):
189189
self.scene = QGraphicsScene()
190190

191191
self.view = QGraphicsView(self.scene)
192-
self.view.setRenderHint(QPainter.Antialiasing)
192+
self.view.setRenderHint(QPainter.RenderHint.Antialiasing)
193193

194194
self.vbox = QVBoxLayout()
195195
self.vbox.setContentsMargins(0, 0, 0, 0)
@@ -336,8 +336,8 @@ def updateGraph(self):
336336
print("[+] add connector listener:", listenerHash, "beacon", beaconHash)
337337

338338
for item in self.listNodeItem:
339-
item.setFlag(QGraphicsItem.ItemIsMovable)
340-
item.setFlag(QGraphicsItem.ItemIsSelectable)
339+
item.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsMovable)
340+
item.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsSelectable)
341341

342342

343343
class GetGraphInfoWorker(QObject):

C2Client/C2Client/ListenerPanel.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
QTableWidgetItem,
1616
QWidget,
1717
QHeaderView,
18+
QAbstractItemView,
1819
)
1920

2021
from .grpcClient import TeamServerApi_pb2
@@ -79,7 +80,7 @@ def __init__(self, parent, grpcClient):
7980
# List of sessions
8081
self.listListener = QTableWidget()
8182
self.listListener.setShowGrid(False)
82-
self.listListener.setSelectionBehavior(QTableView.SelectRows)
83+
self.listListener.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
8384

8485
self.listListener.setRowCount(0)
8586
self.listListener.setColumnCount(4)
@@ -91,7 +92,7 @@ def __init__(self, parent, grpcClient):
9192
self.listListener.verticalHeader().setVisible(False)
9293
header = self.listListener.horizontalHeader()
9394
for i in range(header.count()):
94-
header.setSectionResizeMode(i, QHeaderView.Stretch)
95+
header.setSectionResizeMode(i, QHeaderView.ResizeMode.Stretch)
9596
self.layout.addWidget(self.listListener)
9697

9798
# Thread to get listeners every second
@@ -118,15 +119,15 @@ def showContextMenu(self, position):
118119
menu = QMenu()
119120
menu.addAction('Add')
120121
menu.triggered.connect(self.actionClicked)
121-
menu.exec_(self.listListener.viewport().mapToGlobal(position))
122+
menu.exec(self.listListener.viewport().mapToGlobal(position))
122123
else:
123124
row = index.row()
124125
self.item = str(self.listListener.item(row, 0).data(0))
125126

126127
menu = QMenu()
127128
menu.addAction('Stop')
128129
menu.triggered.connect(self.actionClicked)
129-
menu.exec_(self.listListener.viewport().mapToGlobal(position))
130+
menu.exec(self.listListener.viewport().mapToGlobal(position))
130131

131132

132133
# catch stopListener menu click

C2Client/C2Client/SessionPanel.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
QTableWidgetItem,
1212
QWidget,
1313
QHeaderView,
14+
QAbstractItemView,
1415
)
1516

1617
from .grpcClient import TeamServerApi_pb2
@@ -60,7 +61,7 @@ def __init__(self, parent, grpcClient):
6061
# List of sessions
6162
self.listSession = QTableWidget()
6263
self.listSession.setShowGrid(False)
63-
self.listSession.setSelectionBehavior(QTableView.SelectRows)
64+
self.listSession.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
6465
self.listSession.setRowCount(0)
6566
self.listSession.setColumnCount(11)
6667

@@ -70,7 +71,7 @@ def __init__(self, parent, grpcClient):
7071
self.listSession.verticalHeader().setVisible(False)
7172
header = self.listSession.horizontalHeader()
7273
for i in range(header.count()):
73-
header.setSectionResizeMode(i, QHeaderView.Stretch)
74+
header.setSectionResizeMode(i, QHeaderView.ResizeMode.Stretch)
7475
QTimer.singleShot(100, self.switch_to_interactive)
7576
self.layout.addWidget(self.listSession)
7677

@@ -91,14 +92,14 @@ def resizeEvent(self, event):
9192
self.listSession.verticalHeader().setVisible(False)
9293
header = self.listSession.horizontalHeader()
9394
for i in range(header.count()):
94-
header.setSectionResizeMode(i, QHeaderView.Stretch)
95+
header.setSectionResizeMode(i, QHeaderView.ResizeMode.Stretch)
9596
QTimer.singleShot(100, self.switch_to_interactive)
9697

9798

9899
def switch_to_interactive(self):
99100
header = self.listSession.horizontalHeader()
100101
for i in range(header.count()):
101-
header.setSectionResizeMode(i, QHeaderView.Interactive)
102+
header.setSectionResizeMode(i, QHeaderView.ResizeMode.Interactive)
102103

103104
def __del__(self):
104105
self.getSessionsWorker.quit()
@@ -119,7 +120,7 @@ def showContextMenu(self, position):
119120
menu.addAction('Stop')
120121
menu.addAction('Delete')
121122
menu.triggered.connect(self.actionClicked)
122-
menu.exec_(self.listSession.viewport().mapToGlobal(position))
123+
menu.exec(self.listSession.viewport().mapToGlobal(position))
123124

124125

125126
# catch Interact and Stop menu click

C2Client/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
pycryptodome==3.23.0
2-
grpcio==1.66.1
2+
grpcio==1.74.0
33
PyQt6==6.7.0
44
pyqtdarktheme==2.1.0
5-
protobuf==5.27.0
5+
protobuf==6.32.0
66
gitpython==3.1.45
77
requests==2.32.5
88
pwn==1.0

0 commit comments

Comments
 (0)