From afcbb1abdc035f880c07d93ccd4cdd06c6381f91 Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 25 Dec 2024 16:01:08 +0300 Subject: [PATCH] =?UTF-8?q?style:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=81=D1=82=D0=B8=D0=BB=D1=8C=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8,=20=D1=81?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=BE=D0=B2=D0=B0=D0=BB=20?= =?UTF-8?q?=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gui/__pycache__/mainGui.cpython-310.pyc | Bin 10238 -> 10488 bytes src/gui/__pycache__/plotter.cpython-310.pyc | Bin 11534 -> 11534 bytes src/gui/mainGui.py | 43 +++++++++++++----- .../__pycache__/qt_settings.cpython-310.pyc | Bin 10445 -> 10594 bytes src/utils/qt_settings.py | 8 ++++ 5 files changed, 39 insertions(+), 12 deletions(-) diff --git a/src/gui/__pycache__/mainGui.cpython-310.pyc b/src/gui/__pycache__/mainGui.cpython-310.pyc index 543b3966934ba5d1d86252063d12978b0c0acdef..c13de6e5f369509ebd424e513536e3e81d036fe6 100644 GIT binary patch delta 2982 zcmZt|OKcn0ao;Y#%g<7zNRg5(Qno&!6MypYCoPgVcKk^iIg%CB2@{lAaW~Y;%U$B_ zQkGP?IwVMf#6WDn7CEILixdS~z(paX?WIA1AV5z+5AC6g_E4Zb7&VF>QlMyopfhh* z62(Ns8_k>l%$s>{zkK083u!x*k_Gtt_m|h2`eV1#Gz>&pm~4wvxUz zIRsKwk1eNxYUtrSz9$xnVQ=e}|lQa_fdLh3JPzS|eZILeQ(zhz$A ziU4{JmQx{u;0j&R6K)XrFK&_^xgla-2NB9h3Y5`A^8-7#{hU)M|aQJmJ6-w%&D|#SPngb+;0d%N$}*Bt?6}B zUD8cYwrn@R*^%sVW@R6J)k}f?-iUb8!s5Ia@#n>h&r|(%ol;$^W#$aaXmwiW*V?M3 zLHm2*3&xtR(UTa2tZLe#OLe!g?8SFQ*e|mOp*#MRowzX2%TIvPyRe+Y0Aiv{GDIe_ z1dF6eGWZq31yUeMDGAgh8J316HWbdWGr8X!=5yNu-I{DT^;N?$mP~zcV6ge`ZqE*v zNyL|D&*u*h4@B}D2z|`n&3|4&886&eHcV~M(h*>N!qy6>*{it}X|wranf;|uxdJT^ z>&Alv7gpqM0w~F##c=1hg0Pb6rh7tg#?oav3-&e=wq+WYUcm#ZDinRtLrfcacnx3k_H#F!|YNKE|hmlC##r0T}8li-%C5;Yx`M;X_4J8 z9W4zc`zYxB0hTkvPLEE8d4k)ojb0(-CAK|whD@+8#va~kgM=5Rs@2qK1@WOyTT@{= z92em8I4;$MU)D`v*Ai{hcI(#-t*N_|0)^f{@I3@u06fW6m%LDu8k!dewBE2gmg^B? z;4Hkfvut0l%iJ8uIsasL$3MQrQ^c6)TL>xusv+*)6V>AsM}@wJV1Ke+>YBa|GwL|! zS7H7o!hUvO;{|^AM<|XK^s{L@I(-mzA3~5ts?4ce2ObIDJntj3gn+x?claIH#tCyL zT2H?MD2S>k(C~4t#*i=&R5mDOo7zo`?W{@_!VZ=%Ejyzi4h;hj0X_iyR))u5r%@=6 zT%vU}isz5_%1X!K_tQ?GKlrLg`Zmzuqd;)*ZiIGbpOo7%ZY)YC*vU$z#HU8tIpg2~ zufpIkyD~L+Cv?Ed2>VGzI~@dsgkbP?a)Wko=-zv}SF|d~9$@DtFI;spfc9sLSG=F2 z$Y;40r+Uj?)n8PXcCz~rJ?*b2?}katP6TF#u+JwipZ5dv5_Ly6^@dw-IIDhual5Ts z_16tk4@`QYw(2eq+S~wBQ%pVh=?orYEp~44+jW%lNPSTBham6(d+yLj+5IhFh1%Yk zDiVv8rp6!P-N2)N2jmB)W6a&e+VvuBW38pO2Mw+R?-aW`eat^~k!IN6r;m@ysFy=<2tghJ-huFSa%|?*%1uOX zA;3=eB*Sv)_c`XkkYiI(e)4#v{1hmbjbcG4ra;lHm#Wtrrs_Bi-8Ad{)#KB|2Pw^d zKQo<}Dn#YD9F>*g=$+Y-bQ+W|S4SwGDt&`Z&0gG6=GPb86Gs=^tNfyIXbgEx^rCcJ z!*q@=sgBM8jUx*atmT>=<0!lq{G$}^D7?cdeqB=h@T{efP5Ec$#g0K!$UxtHH4M6! Q{c*M|CrL)k;CmbTKWM+7uK)l5 delta 2741 zcmZuyU2GIp6rMXf-JPBNoBeC)?{1;AEI)052uK8N`4=cc3E(DXnKHw6+SwoOOj}xt zB|;)m5%4~s(cm^w6EyLM#uvi_iBG)n;FDQ>Fus}aKtd!$0X^q#|5(_`p1Jp&bI-Zw zJKw$Y=-|@>!9pOQ2=J@DJ)Aw>eKpubE?!-=XM5VG3%bYh=K|?KE|?Ay0p_w5%Bg8J z7fy%y+-pU0(R7puy98a)eHR4XX9Ui>(lOoLFQoieZ}pPCnE<&Wk|4Y8+D{@g_go@T z>mVI%m=}#RPo>LZ_y#F^HOtKAb4K1tHBukD?rDwU-pW3E-0n9V$INGK>Sw=r_L3IX zB7aTl*d6(px+oL|jm@m}{!Z5TU_24(AGaMNmz-aX@g_otjADU03tB(h?E5y}imR)F z#b=)Q?h|(#nwGN%fj5cD_6HM{oC^yY*<|oas|sEzk?u$5-uYmQz1D<|KI66Lg5JLwg_5||c_O*ulzH7!gE8EH}&l1eo? z(Zy+zfCgr6olFxVfRBg!$e@)=UfqRS?y-2R=+eC2r`PbYIONAQPGBggyDwqfibk5% z?B%ISp=qI{PV!{B0L<|8Q3BijOGoh!3T(?x+5s{ZrV_m9Mi6D+!6Ute)BCjX!idA} zMY_XuGpdz*!7(zHHegt+DY`yRH{gmIG!94*Mp$6i~VwZP`@S(=Fim9{g?8 z%S3@ENc4bzqnaw%_D^P3#}mX|@n;8X zSH`MxzYb0%cDeR$5`D@wCk9PRua2|^OgGrsx=rj>bAX&|=8;fKds^#sI2F=)WCy!Z6>Zh;)^kozr^ky7!c~Q zQWE8$Y(@W9(Ol!0&hsFy1Jn2Lx0isB34cTd-q0lxx+Iba`+Ldipc~A{lWpkxD~Vd|mI^>rz>QG|YA^`?(!kl9spiAIYF!nPjS6KL&?5>umdC)gqRHE(O@Zs~k8n zLMbrmXob)G18T4*ZB6TVw|NEUz;Q9jaavVX5_C;$@AB`+r|jS59ZjFXyc~iP(yxsg zJE5LFEobnI^mDegJ@FDoFUwddFYr1{={eN7i{|N^R;*5N3T$ocqxP;!=S3P~ciOuf zytpoc07cBez_3e|cPui{bEC5=kl?~b@* zk|HVYh@`k8lI)4d6c?xB6v<7`FzY6$F%Iu0nIkJpfY-3$?0fz#O$17 oI$TD1y)Z@YuX9ZLAL^-2S^xk5 diff --git a/src/gui/__pycache__/plotter.cpython-310.pyc b/src/gui/__pycache__/plotter.cpython-310.pyc index e1b172540784cec2530ea5f5b80e9406dd1a8110..0a61a3861a13f2f9c9b4567d91c2531292e5540b 100644 GIT binary patch delta 19 YcmeB+>Wkva=jG*M00Pfb8@X6?0Wlc_Z2$lO delta 19 YcmeB+>Wkva=jG*M0D_)98@X6?0WxI-q5uE@ diff --git a/src/gui/mainGui.py b/src/gui/mainGui.py index eef844d..ed41df1 100644 --- a/src/gui/mainGui.py +++ b/src/gui/mainGui.py @@ -3,7 +3,7 @@ from typing import Optional from PyQt5 import QtWidgets from PyQt5.QtCore import Qt from PyQt5.QtGui import QPixmap, QIcon -import time +from PyQt5.QtWidgets import QSizePolicy as QSP from utils.base.base import BaseMainWindow, BaseController from gui.settings_window import SystemSettings, OperatorSettings @@ -136,19 +136,40 @@ class MainWindow(BaseMainWindow): settings_menu.addAction(view_settings) def _init_statusBar(self) -> None: + # Создание пользовательского виджета для StatusBar note_widget = QtWidgets.QWidget() - note_layout = QtWidgets.QVBoxLayout(note_widget) + note_layout = QtWidgets.QHBoxLayout(note_widget) + note_layout.setContentsMargins(10, 1, 10, 1) + note_layout.setSpacing(15) # Устанавливаем расстояние между элементами + + # Создание QLabel и QProgressBar + self.mode_label = QtWidgets.QLabel() + self.note_label = QtWidgets.QLabel() self.progress_bar = QtWidgets.QProgressBar() self.progress_bar.setRange(0, 100) self.progress_bar.setValue(0) - self.note_label = QtWidgets.QLabel() - self.note_label.setMinimumWidth(250) self.progress_bar.setMinimumWidth(250) self.progress_bar.setMaximumHeight(10) self.progress_bar.setTextVisible(False) - note_layout.addWidget(self.note_label, alignment=Qt.AlignLeft) - note_layout.addWidget(self.progress_bar, alignment=Qt.AlignLeft) - self.statusBar().addPermanentWidget(note_widget) + + # Создание QSpacerItem + + # Установка политики размеров + self.mode_label.setSizePolicy(QSP.Policy.Preferred, QSP.Policy.Preferred) + self.note_label.setSizePolicy(QSP.Policy.MinimumExpanding, QSP.Policy.Preferred) + self.progress_bar.setSizePolicy(QSP.Policy.Fixed, QSP.Policy.Preferred) + + # Добавление виджетов в макет + note_layout.addWidget(self.mode_label) + note_layout.addWidget(self.note_label) + note_layout.addStretch(1) + note_layout.addWidget(self.progress_bar) + + # Установка политики размеров для note_widget + note_widget.setSizePolicy(QSP.Policy.Expanding, QSP.Policy.Preferred) + + # Добавление пользовательского виджета в StatusBar как Permanent Widget + self.statusBar().addPermanentWidget(note_widget, 1) def _toggle_visibility(self, body:QtWidgets.QDockWidget = None) -> None: """ @@ -183,10 +204,9 @@ class MainWindow(BaseMainWindow): button_widget = QtWidgets.QWidget() button_widget.setLayout(button_layout) - title = QtWidgets.QLabel("online mode") + self.mode_label.setText("online mode") self._central_layout.addWidget(self.tabWidget) self._central_layout.addWidget(button_widget) - self._central_layout.addWidget(title, alignment=Qt.AlignRight) self._controller.seeking_mode() def _init_raportUI(self) -> None: @@ -209,10 +229,9 @@ class MainWindow(BaseMainWindow): button_widget = QtWidgets.QWidget() button_widget.setLayout(button_layout) - title = QtWidgets.QLabel("raport mode") + self.mode_label.setText("raport mode") self._central_layout.addWidget(self.tabWidget) self._central_layout.addWidget(button_widget) - self._central_layout.addWidget(title, alignment=Qt.AlignRight) self._controller.raport_mode() @@ -255,7 +274,7 @@ class MainWindow(BaseMainWindow): def update_stateLabel(self, msg: str = None) -> None: self.note_label.setText(msg) - + self.note_label.adjustSize() def _transfer_settings(self) -> None: self.tabWidget.clear() diff --git a/src/utils/__pycache__/qt_settings.cpython-310.pyc b/src/utils/__pycache__/qt_settings.cpython-310.pyc index ab55d503db201325c986ba04fcdfc76407841ef6..dfa80c00f8c45957a232b1788a7eebbfd4ba964c 100644 GIT binary patch delta 189 zcmX>b_$Y`kpO=@50SI0(=A`TEOymn^@ls%5nEamGapS7F5|ho8g(jbskPuU_=28HH z%;fw$-QvuuR4WBTi-L;H36jce#(@Dv`RPTe#l=pEMGDnmbs)7#`9&$IMOF$%1r-X# z`8k;>3P44b5OXFAato`O7F0lZAk`(Q6(zcfIhpBsRtm|fc_pbu5V_jTjq=uveGAMPvi?{*(%S#F!?>V