Skip to content

Commit

Permalink
Version 0.5.2 Beta (2021-10-16)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tretdm
tretdm authored Oct 16, 2021
1 parent 8d422a0 commit 8f93a90
Show file tree
Hide file tree
Showing 10 changed files with 573 additions and 241 deletions.
61 changes: 57 additions & 4 deletions 005.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>461</width>
<height>227</height>
<height>259</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -94,7 +94,13 @@ selection-background-color: rgb(161, 75, 0);</string>
<property name="minimumSize">
<size>
<width>220</width>
<height>21</height>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="styleSheet">
Expand All @@ -117,7 +123,13 @@ selection-background-color: rgb(255, 119, 0);</string>
<property name="minimumSize">
<size>
<width>0</width>
<height>21</height>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="styleSheet">
Expand All @@ -141,7 +153,13 @@ selection-background-color: rgb(255, 119, 0);</string>
<property name="minimumSize">
<size>
<width>220</width>
<height>21</height>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="styleSheet">
Expand All @@ -155,13 +173,48 @@ selection-background-color: rgb(255, 119, 0);</string>
</item>
<item>
<widget class="QCheckBox" name="backlight_cb">
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="text">
<string>Подсветка сообщений</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QCheckBox" name="parsing_debugger_cb">
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="text">
<string>Отладчик парсинга (выводить в консоли RAW-строки)</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
Expand Down
31 changes: 31 additions & 0 deletions chat_widget.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def setupUi(self, Form):
Form.setStyleSheet("background-color: rgb(43, 43, 43);\n"
"color: rgb(255, 255, 255);")
self.verticalLayout = QtWidgets.QVBoxLayout(Form)
self.verticalLayout.setSpacing(4)
self.verticalLayout.setObjectName("verticalLayout")
self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
self.horizontalLayout_4.setObjectName("horizontalLayout_4")
Expand Down Expand Up @@ -135,6 +136,34 @@ def setupUi(self, Form):
self.members_list.header().setVisible(False)
self.members_list.header().setStretchLastSection(True)
self.horizontalLayout_4.addWidget(self.members_list)
self.list_frame = QtWidgets.QWidget(Form)
self.list_frame.setMinimumSize(QtCore.QSize(144, 0))
self.list_frame.setObjectName("list_frame")
self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.list_frame)
self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
self.verticalLayout_2.setSpacing(0)
self.verticalLayout_2.setObjectName("verticalLayout_2")
spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
self.verticalLayout_2.addItem(spacerItem)
self.error_getting_member_list = QtWidgets.QLabel(self.list_frame)
self.error_getting_member_list.setMinimumSize(QtCore.QSize(144, 200))
self.error_getting_member_list.setMaximumSize(QtCore.QSize(144, 200))
self.error_getting_member_list.setTextFormat(QtCore.Qt.RichText)
self.error_getting_member_list.setAlignment(QtCore.Qt.AlignCenter)
self.error_getting_member_list.setWordWrap(True)
self.error_getting_member_list.setObjectName("error_getting_member_list")
self.verticalLayout_2.addWidget(self.error_getting_member_list)
self.horizontalLayout = QtWidgets.QHBoxLayout()
self.horizontalLayout.setSpacing(0)
self.horizontalLayout.setObjectName("horizontalLayout")
self.close_panel_btn = QtWidgets.QPushButton(self.list_frame)
self.close_panel_btn.setMaximumSize(QtCore.QSize(60, 24))
self.close_panel_btn.setObjectName("close_panel_btn")
self.horizontalLayout.addWidget(self.close_panel_btn)
self.verticalLayout_2.addLayout(self.horizontalLayout)
spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
self.verticalLayout_2.addItem(spacerItem1)
self.horizontalLayout_4.addWidget(self.list_frame)
self.verticalLayout.addLayout(self.horizontalLayout_4)
self.verticalLayout_3 = QtWidgets.QVBoxLayout()
self.verticalLayout_3.setContentsMargins(-1, 0, 0, -1)
Expand Down Expand Up @@ -164,6 +193,8 @@ def retranslateUi(self, Form):
_translate = QtCore.QCoreApplication.translate
Form.setWindowTitle(_translate("Form", "Чат"))
self.members_list.headerItem().setText(0, _translate("Form", "Members"))
self.error_getting_member_list.setText(_translate("Form", "<html><head/><body><p><span style=\" font-weight:600;\">Нам пока не удалось получить список участников.</span></p><p>Попробуйте включить отладчик строк в настройках и сообщить <a href=\"https://github.com/tinelix/irc-client/issues\"><span style=\" text-decoration: underline; color:#1d99f3;\">разработчикам</span></a> об этой проблеме.</p><p>Строка в консоли должна быть в таком формате:<br/><span style=\" font-size:7pt;\">&lt;сервер&gt; &lt;код&gt; &lt;ваш_ник&gt; &lt;ник1&gt; &lt;ник2&gt;</span></p></body></html>"))
self.close_panel_btn.setText(_translate("Form", "Закрыть"))
self.message_text.setText(_translate("Form", "На данный момент отправить сообщение нельзя"))
self.send_msg_btn.setText(_translate("Form", "Отправить"))
import resources_rc
104 changes: 104 additions & 0 deletions chat_widget.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
color: rgb(255, 255, 255);</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>4</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
Expand Down Expand Up @@ -193,6 +196,107 @@ background-color: rgb(43, 43, 43);
</column>
</widget>
</item>
<item>
<widget class="QWidget" name="list_frame" native="true">
<property name="minimumSize">
<size>
<width>144</width>
<height>0</height>
</size>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="error_getting_member_list">
<property name="minimumSize">
<size>
<width>144</width>
<height>200</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>144</width>
<height>200</height>
</size>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Нам пока не удалось получить список участников.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Попробуйте включить отладчик строк в настройках и сообщить &lt;a href=&quot;https://github.com/tinelix/irc-client/issues&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#1d99f3;&quot;&gt;разработчикам&lt;/span&gt;&lt;/a&gt; об этой проблеме.&lt;/p&gt;&lt;p&gt;Строка в консоли должна быть в таком формате:&lt;br/&gt;&lt;span style=&quot; font-size:7pt;&quot;&gt;&amp;lt;сервер&amp;gt; &amp;lt;код&amp;gt; &amp;lt;ваш_ник&amp;gt; &amp;lt;ник1&amp;gt; &amp;lt;ник2&amp;gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="close_panel_btn">
<property name="maximumSize">
<size>
<width>60</width>
<height>24</height>
</size>
</property>
<property name="text">
<string>Закрыть</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item>
Expand Down
22 changes: 18 additions & 4 deletions dlg005.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
class Ui_Dialog(object):
def setupUi(self, Dialog):
Dialog.setObjectName("Dialog")
Dialog.resize(461, 227)
Dialog.resize(461, 259)
Dialog.setStyleSheet("background-color: rgb(43, 43, 43);\n"
"color: rgb(255, 255, 255);")
self.verticalLayout = QtWidgets.QVBoxLayout(Dialog)
Expand Down Expand Up @@ -48,15 +48,17 @@ def setupUi(self, Dialog):
self.gridLayout_2.setObjectName("gridLayout_2")
self.dark_theme_cb = QtWidgets.QCheckBox(Dialog)
self.dark_theme_cb.setEnabled(True)
self.dark_theme_cb.setMinimumSize(QtCore.QSize(220, 21))
self.dark_theme_cb.setMinimumSize(QtCore.QSize(220, 22))
self.dark_theme_cb.setMaximumSize(QtCore.QSize(16777215, 22))
self.dark_theme_cb.setStyleSheet("border-color: rgb(255, 119, 0);\n"
"selection-background-color: rgb(255, 119, 0);")
self.dark_theme_cb.setChecked(True)
self.dark_theme_cb.setTristate(False)
self.dark_theme_cb.setObjectName("dark_theme_cb")
self.gridLayout_2.addWidget(self.dark_theme_cb, 0, 0, 1, 1)
self.save_msghistory_cb = QtWidgets.QCheckBox(Dialog)
self.save_msghistory_cb.setMinimumSize(QtCore.QSize(0, 21))
self.save_msghistory_cb.setMinimumSize(QtCore.QSize(0, 22))
self.save_msghistory_cb.setMaximumSize(QtCore.QSize(16777215, 22))
self.save_msghistory_cb.setStyleSheet("border-color: rgb(255, 119, 0);\n"
"selection-background-color: rgb(255, 119, 0);")
self.save_msghistory_cb.setObjectName("save_msghistory_cb")
Expand All @@ -66,15 +68,26 @@ def setupUi(self, Dialog):
self.horizontalLayout.setObjectName("horizontalLayout")
self.msgs_hint = QtWidgets.QCheckBox(Dialog)
self.msgs_hint.setEnabled(True)
self.msgs_hint.setMinimumSize(QtCore.QSize(220, 21))
self.msgs_hint.setMinimumSize(QtCore.QSize(220, 22))
self.msgs_hint.setMaximumSize(QtCore.QSize(16777215, 22))
self.msgs_hint.setStyleSheet("border-color: rgb(255, 119, 0);\n"
"selection-background-color: rgb(255, 119, 0);")
self.msgs_hint.setObjectName("msgs_hint")
self.horizontalLayout.addWidget(self.msgs_hint)
self.backlight_cb = QtWidgets.QCheckBox(Dialog)
self.backlight_cb.setMinimumSize(QtCore.QSize(0, 22))
self.backlight_cb.setMaximumSize(QtCore.QSize(16777215, 22))
self.backlight_cb.setObjectName("backlight_cb")
self.horizontalLayout.addWidget(self.backlight_cb)
self.verticalLayout.addLayout(self.horizontalLayout)
self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
self.parsing_debugger_cb = QtWidgets.QCheckBox(Dialog)
self.parsing_debugger_cb.setMinimumSize(QtCore.QSize(0, 22))
self.parsing_debugger_cb.setMaximumSize(QtCore.QSize(16777215, 22))
self.parsing_debugger_cb.setObjectName("parsing_debugger_cb")
self.horizontalLayout_2.addWidget(self.parsing_debugger_cb)
self.verticalLayout.addLayout(self.horizontalLayout_2)
self.gridLayout_3 = QtWidgets.QGridLayout()
self.gridLayout_3.setObjectName("gridLayout_3")
self.font_label = QtWidgets.QLabel(Dialog)
Expand Down Expand Up @@ -126,4 +139,5 @@ def retranslateUi(self, Dialog):
self.save_msghistory_cb.setText(_translate("Dialog", "Сохранять историю сообщений"))
self.msgs_hint.setText(_translate("Dialog", "Подсказки при вводе текста"))
self.backlight_cb.setText(_translate("Dialog", "Подсветка сообщений"))
self.parsing_debugger_cb.setText(_translate("Dialog", "Отладчик парсинга (выводить в консоли RAW-строки)"))
self.font_label.setText(_translate("Dialog", "Шрифт сообщений:"))
Loading

0 comments on commit 8f93a90

Please sign in to comment.