From 75e6c4f29c3794e609daec3aafc107fd0ea287ee Mon Sep 17 00:00:00 2001 From: Wiktor Mazur Date: Thu, 31 Oct 2019 21:49:11 +0100 Subject: [PATCH] Usage of QtClipboard --- frontend/requirements.txt | 1 - frontend/src/app.py | 3 ++- frontend/src/main.py | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/frontend/requirements.txt b/frontend/requirements.txt index 0548439..18dd857 100644 --- a/frontend/requirements.txt +++ b/frontend/requirements.txt @@ -1,6 +1,5 @@ pyside2~=5.13 pyinstaller -clipboard toml~=0.10 requests~=2.22 ./backend \ No newline at end of file diff --git a/frontend/src/app.py b/frontend/src/app.py index 691e9a1..5004ac1 100644 --- a/frontend/src/app.py +++ b/frontend/src/app.py @@ -28,8 +28,9 @@ def run(): app.setStyleSheet(style) geometry = app.screens()[0].size() + clipboard = app.clipboard() - widget = MainWidget() + widget = MainWidget(clipboard) widget.setWindowOpacity(window_config['opacity']) widget.resize(WIDTH, HEIGHT) widget.move(0, geometry.height() - HEIGHT - 280) diff --git a/frontend/src/main.py b/frontend/src/main.py index ca4a56a..5fd83d9 100644 --- a/frontend/src/main.py +++ b/frontend/src/main.py @@ -14,8 +14,6 @@ from PySide2.QtWidgets import QComboBox from PySide2 import QtGui from PySide2 import QtCore -import clipboard - from .dmg_list import DmgList from . import about from . import engine @@ -29,13 +27,14 @@ class Mode: class InteractiveBar(QWidget): - def __init__(self, table): + def __init__(self, table, clipboard): QWidget.__init__(self) self.mode = ModeWidget() self.table = table self.layout = QHBoxLayout() self.about = about.About() self.fame_per_minute = 0.0 + self.clipboard = clipboard self.copy_button = QPushButton(self) self.copy_button.setIcon(QtGui.QIcon(os.path.join(assets_path, 'copy.png'))) @@ -72,7 +71,9 @@ class InteractiveBar(QWidget): clip += '{}. {}-{}-{}%'.format(index+1, i.name, i.damage, i.percentage) clip += "\n" clip += "(AOStats https://git.io/JeBD1)" - clipboard.copy(clip) + + self.clipboard.clear(mode=self.clipboard.Clipboard ) + self.clipboard.setText(clip, mode=self.clipboard.Clipboard) def set_fame_per_minute(self, fpm): self.fame_per_minute = fpm @@ -99,14 +100,14 @@ class ModeWidget(QComboBox): class MainWidget(QWidget): - def __init__(self): + def __init__(self, clipboard): QWidget.__init__(self) self.mouse_pos = None self.table = DmgList() self.fame_label = QLabel() self.fame_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignHCenter) - self.bar = InteractiveBar(self.table) + self.bar = InteractiveBar(self.table, clipboard) self.layout = QVBoxLayout() self.layout.addWidget(self.bar)