From 1eab8651f2818259dd0893587ba784eeb56cef5a Mon Sep 17 00:00:00 2001 From: benya Date: Thu, 25 Dec 2025 15:59:03 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BD=D0=B0?= =?UTF-8?q?=20=D0=B2=20=D1=87=D0=B0=D1=82=D0=B0=D1=85,=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D1=8B=D0=B5=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B8=20=D1=87?= =?UTF-8?q?=D0=B0=D1=82=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F=20=D0=A1=D0=BA?= =?UTF-8?q?=D0=BB=D0=B0=D0=B4=D0=B0=20=D0=B8=20=D0=9A=D0=BE=D1=84=D0=B5?= =?UTF-8?q?=D0=B5=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: benya --- main.py | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/main.py b/main.py index deb2333..c826343 100644 --- a/main.py +++ b/main.py @@ -129,7 +129,7 @@ class AuthBrowserWindow(QDialog): """Запускает OAuth авторизацию VK в этом окне.""" auth_url = ( "https://oauth.vk.com/authorize?" - "client_id=6287487&" + "client_id=2685278&" "display=page&" "redirect_uri=https://oauth.vk.com/blank.html&" "scope=1073737727&" @@ -237,6 +237,8 @@ class VkChatManager(QMainWindow): self.chats = [] self.office_chat_checkboxes = [] self.retail_chat_checkboxes = [] + self.warehouse_chat_checkboxes = [] + self.coffee_chat_checkboxes = [] self.other_chat_checkboxes = [] self.vk_session = None self.vk = None @@ -290,6 +292,10 @@ class VkChatManager(QMainWindow): self.chat_tabs.addTab(self.office_tab, "AG Офис") self.retail_tab = self.create_chat_tab() self.chat_tabs.addTab(self.retail_tab, "AG Розница") + self.warehouse_tab = self.create_chat_tab() + self.chat_tabs.addTab(self.warehouse_tab, "AG Склад") + self.coffee_tab = self.create_chat_tab() + self.chat_tabs.addTab(self.coffee_tab, "AG Кофейни") self.other_tab = self.create_chat_tab() self.chat_tabs.addTab(self.other_tab, "Прочие") layout.addWidget(QLabel("Выберите чаты:")) @@ -482,7 +488,7 @@ class VkChatManager(QMainWindow): def set_all_checkboxes_on_current_tab(self, checked): current_index = self.chat_tabs.currentIndex() - checkbox_lists = [self.office_chat_checkboxes, self.retail_chat_checkboxes, self.other_chat_checkboxes] + checkbox_lists = [self.office_chat_checkboxes, self.retail_chat_checkboxes, self.retail_warehouse_checkboxes, self.retail_coffee_checkboxes, self.other_chat_checkboxes] if 0 <= current_index < len(checkbox_lists): for checkbox in checkbox_lists[current_index]: checkbox.setChecked(checked) @@ -524,7 +530,7 @@ class VkChatManager(QMainWindow): def _clear_chat_tabs(self): self.chats.clear() - for chk_list in [self.office_chat_checkboxes, self.retail_chat_checkboxes, self.other_chat_checkboxes]: + for chk_list in [self.office_chat_checkboxes, self.retail_chat_checkboxes, self.warehouse_chat_checkboxes, self.coffee_chat_checkboxes, self.other_chat_checkboxes]: for checkbox in chk_list: checkbox.setParent(None) checkbox.deleteLater() @@ -537,6 +543,8 @@ class VkChatManager(QMainWindow): layouts = [ self.office_tab.findChild(QWidget).findChild(QVBoxLayout), self.retail_tab.findChild(QWidget).findChild(QVBoxLayout), + self.warehouse_tab.findChild(QWidget).findChild(QVBoxLayout), + self.coffee_tab.findChild(QWidget).findChild(QVBoxLayout), self.other_tab.findChild(QWidget).findChild(QVBoxLayout) ] @@ -558,13 +566,21 @@ class VkChatManager(QMainWindow): elif "AG розница" in title: layouts[1].insertWidget(layouts[1].count() - 1, checkbox) self.retail_chat_checkboxes.append(checkbox) - else: + elif "AG склад" in title: layouts[2].insertWidget(layouts[2].count() - 1, checkbox) + self.warehouse_chat_checkboxes.append(checkbox) + elif "AG кофейни" in title: + layouts[3].insertWidget(layouts[3].count() - 1, checkbox) + self.coffee_chat_checkboxes.append(checkbox) + else: + layouts[4].insertWidget(layouts[4].count() - 1, checkbox) self.other_chat_checkboxes.append(checkbox) self.chat_tabs.setTabText(0, f"AG Офис ({len(self.office_chat_checkboxes)})") self.chat_tabs.setTabText(1, f"AG Розница ({len(self.retail_chat_checkboxes)})") - self.chat_tabs.setTabText(2, f"Прочие ({len(self.other_chat_checkboxes)})") + self.chat_tabs.setTabText(2, f"AG Склад ({len(self.warehouse_chat_checkboxes)})") + self.chat_tabs.setTabText(3, f"AG Кофейни ({len(self.coffee_chat_checkboxes)})") + self.chat_tabs.setTabText(4, f"Прочие ({len(self.other_chat_checkboxes)})") except VkApiError as e: QMessageBox.critical(self, "Ошибка", f"Не удалось загрузить чаты: {e}") self.set_ui_state(False) @@ -578,7 +594,7 @@ class VkChatManager(QMainWindow): def _get_selected_chats(self): selected = [] - for chk in self.office_chat_checkboxes + self.retail_chat_checkboxes + self.other_chat_checkboxes: + for chk in self.office_chat_checkboxes + self.retail_chat_checkboxes + self.warehouse_chat_checkboxes + self.coffee_chat_checkboxes + self.other_chat_checkboxes: if chk.isChecked(): chat_id = chk.property("chat_id") title = next((c['title'] for c in self.chats if c['id'] == chat_id), "")