From 3bf080b3a2732a5d6c5dd82b18510d50fc8f80cc Mon Sep 17 00:00:00 2001
From: wys <wys@prod-haski-v2-x86-deb-builder-0>
Date: Wed, 7 Aug 2024 22:37:01 +0800
Subject: [PATCH 1/3] .gitignore

---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2d1450f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+/debian/files
+/debian/nfs-ai.debhelper.log
+/debian/nfs-ai.substvars
+/debian/.debhelper
+/debian/nfs-ai
-- 
Gitee


From 6af08cc139e7c021808af2e8d86c178ad9e25f98 Mon Sep 17 00:00:00 2001
From: wys <1377030423@qq.com>
Date: Thu, 8 Aug 2024 11:20:51 +0800
Subject: [PATCH 2/3] setting memu finished

---
 usr/share/aiassistant/data/icon_setting.png | Bin 0 -> 3662 bytes
 usr/share/aiassistant/mainwin.py            |  77 +++++++++++++++++++-
 2 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 usr/share/aiassistant/data/icon_setting.png

diff --git a/usr/share/aiassistant/data/icon_setting.png b/usr/share/aiassistant/data/icon_setting.png
new file mode 100644
index 0000000000000000000000000000000000000000..54d88bf0bf53dfce77c8c24a0b8ba6c27cfdcb44
GIT binary patch
literal 3662
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
U?c05zZSzRlSlU~Znt7f37c>fM&j0`b

literal 0
HcmV?d00001

diff --git a/usr/share/aiassistant/mainwin.py b/usr/share/aiassistant/mainwin.py
index bd63409..514e636 100644
--- a/usr/share/aiassistant/mainwin.py
+++ b/usr/share/aiassistant/mainwin.py
@@ -81,6 +81,7 @@ class ShadowWindow(QWidget):
         title_spacer = QSpacerItem(40, 10, QSizePolicy.Expanding, QSizePolicy.Minimum)
         title_layout.addItem(title_spacer)
 
+        # home button
         home_btn = QPushButton(title)
         home_btn.setFixedSize(24, 24)
         home_btn.setFlat(True)
@@ -97,7 +98,28 @@ class ShadowWindow(QWidget):
         )
         home_btn.setFixedSize(24, 24)
         title_layout.addWidget(home_btn)
-
+        
+        # setting_ button
+        setting_btn = QPushButton(title)
+        setting_btn.setIcon(QIcon('./data/icon_setting.png'))
+        setting_btn.setIconSize(QSize(24, 24)); 
+        setting_btn.setFixedSize(24, 24)
+        title_layout.addWidget(setting_btn)
+        setting_btn.setStyleSheet(
+            '''
+            QPushButton{background-color:transparent;border:none;color:white;}
+            '''
+        )
+        
+        
+        menu = SettingMenu(self)
+        menu.addAction("显示模式")
+        menu.addAction("设置")
+        menu.addSeparator()
+        menu.addAction("关于")  
+        setting_btn.setMenu(menu)
+        
+        # close  button
         close_btn = QPushButton(title)
         close_btn.setFixedSize(24, 24)
         close_btn.setStyleSheet(
@@ -675,3 +697,56 @@ class Mainwin(QWidget):
 #     widget.show()
 #     app.exec_()
 
+
+class SettingMenu(QMenu):
+    def __init__(self, *args, **kwargs):
+        super(SettingMenu, self).__init__()
+        self.radius = 5
+        self.setStyleSheet(
+            '''
+            QMenu {{
+                /* 半透明效果 */
+                border-radius: {radius};
+                border: 2px solid rgb(255, 255, 255);
+                background-color: rgba(255, 255, 255, 230);
+            }}
+
+            QMenu::item {{
+                border-radius: {radius};
+                /* 这个距离很麻烦需要根据菜单的长度和图标等因素微调 */
+                padding: 8px 48px 8px 12px; /* 36px是文字距离左侧距离*/
+                background-color: transparent;
+            }}
+
+            /* 鼠标悬停和按下效果 */
+            QMenu::item:selected {{
+                border-radius: {radius};
+                /* 半透明效果 */
+                background-color: rgba(230, 240, 255, 232);
+            }}
+
+            /* 禁用效果 */
+            QMenu::item:disabled {{
+                border-radius: {radius};
+                background-color: transparent;
+            }}
+
+            /* 图标距离左侧距离 */
+            QMenu::icon {{
+                left: 15px;
+            }}
+
+            /* 分割线效果 */
+            QMenu::separator {{
+                height: 1px;
+                background-color: rgb(232, 236, 243);
+            }}
+        '''.format(radius=self.radius))
+
+    def resizeEvent(self, event):
+        # 添加蒙版
+        path = QPainterPath()
+        path.addRoundedRect(QRectF(self.rect()), self.radius, self.radius)
+        region = QRegion(path.toFillPolygon(QTransform()).toPolygon())
+        self.setMask(region)
+
-- 
Gitee


From 9fd7ebcfbe36fc7967c3fed1e0e4510ce70f847d Mon Sep 17 00:00:00 2001
From: wuyuesong <1377030423@qq.com>
Date: Sun, 27 Oct 2024 23:04:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=A8=A1=E5=BC=8F=E4=BA=8C=E7=BA=A7=E5=AD=90=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 usr/share/aiassistant/mainwin.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/share/aiassistant/mainwin.py b/usr/share/aiassistant/mainwin.py
index 514e636..a1a4c0e 100644
--- a/usr/share/aiassistant/mainwin.py
+++ b/usr/share/aiassistant/mainwin.py
@@ -113,7 +113,9 @@ class ShadowWindow(QWidget):
         
         
         menu = SettingMenu(self)
-        menu.addAction("显示模式")
+        sub_menu = menu.addMenu("显示模式")
+        sub_menu.addAction("窗口模式")
+        sub_menu.addAction("侧边栏模式")
         menu.addAction("设置")
         menu.addSeparator()
         menu.addAction("关于")  
-- 
Gitee