PySide2-Fluent-Widgets 1.7.2__tar.gz → 1.7.4__tar.gz

{pyside2_fluent_widgets-1.7.2 → pyside2_fluent_widgets-1.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySide2-Fluent-Widgets
-Version: 1.7.2
+Version: 1.7.4
 Summary: A fluent design widgets library based on PySide2
 Home-page: https://qfluentwidgets.com
 Author: zhiyiYo
@@ -65,7 +65,7 @@ The [Pro version](https://qfluentwidgets.com/pages/pro) library contains more ad
 
 C++ QFluentWidgets require purchasing a license from the [official website](https://qfluentwidgets.com/price). You can also download the compiled demo `C++_QFluentWidgets.zip` from the [release page](https://github.com/zhiyiYo/PyQt-Fluent-Widgets/releases).
 
-> **Warning**
+> [!Warning]
 > Don't install PyQt-Fluent-Widgets, PyQt6-Fluent-Widgets, PySide2-Fluent-Widgets and PySide6-Fluent-Widgets at the same time, because their package names are all `qfluentwidgets`.
 
 

{pyside2_fluent_widgets-1.7.2 → pyside2_fluent_widgets-1.7.4}/PySide2_Fluent_Widgets.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySide2-Fluent-Widgets
-Version: 1.7.2
+Version: 1.7.4
 Summary: A fluent design widgets library based on PySide2
 Home-page: https://qfluentwidgets.com
 Author: zhiyiYo
@@ -65,7 +65,7 @@ The [Pro version](https://qfluentwidgets.com/pages/pro) library contains more ad
 
 C++ QFluentWidgets require purchasing a license from the [official website](https://qfluentwidgets.com/price). You can also download the compiled demo `C++_QFluentWidgets.zip` from the [release page](https://github.com/zhiyiYo/PyQt-Fluent-Widgets/releases).
 
-> **Warning**
+> [!Warning]
 > Don't install PyQt-Fluent-Widgets, PyQt6-Fluent-Widgets, PySide2-Fluent-Widgets and PySide6-Fluent-Widgets at the same time, because their package names are all `qfluentwidgets`.
 
 

{pyside2_fluent_widgets-1.7.2 → pyside2_fluent_widgets-1.7.4}/README.md

@@ -40,7 +40,7 @@ The [Pro version](https://qfluentwidgets.com/pages/pro) library contains more ad
 
 C++ QFluentWidgets require purchasing a license from the [official website](https://qfluentwidgets.com/price). You can also download the compiled demo `C++_QFluentWidgets.zip` from the [release page](https://github.com/zhiyiYo/PyQt-Fluent-Widgets/releases).
 
-> **Warning**
+> [!Warning]
 > Don't install PyQt-Fluent-Widgets, PyQt6-Fluent-Widgets, PySide2-Fluent-Widgets and PySide6-Fluent-Widgets at the same time, because their package names are all `qfluentwidgets`.
 
 

{pyside2_fluent_widgets-1.7.2 → pyside2_fluent_widgets-1.7.4}/qfluentwidgets/__init__.py

@@ -12,7 +12,7 @@ Examples are available at https://github.com/zhiyiYo/PyQt-Fluent-Widgets/tree/Py
 :license: GPLv3 for non-commercial project, see README for more details.
 """
 
-__version__ = "1.7.2"
+__version__ = "1.7.4"
 __author__ = "zhiyiYo"
 
 from .components import *

{pyside2_fluent_widgets-1.7.2 → pyside2_fluent_widgets-1.7.4}/qfluentwidgets/components/date_time/fast_calendar_view.py

@@ -325,16 +325,18 @@ class FastDayScrollView(FastScrollViewBase):
                 self.item(i).setFlags(Qt.ItemFlag.NoItemFlags)
 
         currentDate = left
-        for i in range(left.daysTo(right) - 1):
+        for i in range(left.daysTo(right)):
             item = self.item(i + bias if self.currentPage == 0 else i)
-            item.setText(str(currentDate.day()))
-            item.setData(Qt.ItemDataRole.UserRole, currentDate)
-            currentDate = currentDate.addDays(1)
+            if item:
+                item.setText(str(currentDate.day()))
+                item.setData(Qt.ItemDataRole.UserRole, currentDate)
+                currentDate = currentDate.addDays(1)
 
     def mouseReleaseEvent(self, e):
         super().mouseReleaseEvent(e)
         item = self.currentItem()
-        self._setSelectedDate(item.data(Qt.ItemDataRole.UserRole))
+        if item:
+            self._setSelectedDate(item.data(Qt.ItemDataRole.UserRole))
 
     def pageCount(self):
         return (self.maxYear - self.minYear + 1) * 12

{pyside2_fluent_widgets-1.7.2 → pyside2_fluent_widgets-1.7.4}/qfluentwidgets/components/navigation/navigation_bar.py

@@ -12,7 +12,7 @@ from ...common.icon import drawIcon, FluentIconBase, toQIcon
 from ...common.icon import FluentIcon as FIF
 from ...common.router import qrouter
 from ...common.style_sheet import FluentStyleSheet
-from ..widgets.scroll_area import SingleDirectionScrollArea
+from ..widgets.scroll_area import ScrollArea
 from .navigation_widget import NavigationPushButton, NavigationWidget
 from .navigation_panel import RouteKeyError, NavigationItemPosition
 
@@ -82,7 +82,11 @@ class NavigationBarPushButton(NavigationPushButton):
                                QPainter.TextAntialiasing | QPainter.SmoothPixmapTransform)
         painter.setPen(Qt.NoPen)
 
-        # draw background
+        self._drawBackground(painter)
+        self._drawIcon(painter)
+        self._drawText(painter)
+
+    def _drawBackground(self, painter: QPainter):
         if self.isSelected:
             painter.setBrush(QColor(255, 255, 255, 42) if isDarkTheme() else Qt.white)
             painter.drawRoundedRect(self.rect(), 5, 5)
@@ -99,7 +103,7 @@ class NavigationBarPushButton(NavigationPushButton):
             painter.setBrush(QColor(c, c, c, alpha))
             painter.drawRoundedRect(self.rect(), 5, 5)
 
-        # draw icon
+    def _drawIcon(self, painter: QPainter):
         if (self.isPressed or not self.isEnter) and not self.isSelected:
             painter.setOpacity(0.6)
         if not self.isEnabled():
@@ -119,10 +123,10 @@ class NavigationBarPushButton(NavigationPushButton):
         else:
             drawIcon(self._icon, painter, rect)
 
+    def _drawText(self, painter: QPainter):
         if self.isSelected and not self._isSelectedTextVisible:
             return
 
-        # draw text
         if self.isSelected:
             painter.setPen(themeColor())
         else:
@@ -149,7 +153,7 @@ class NavigationBar(QWidget):
     def __init__(self, parent=None):
         super().__init__(parent=parent)
 
-        self.scrollArea = SingleDirectionScrollArea(self)
+        self.scrollArea = ScrollArea(self)
         self.scrollWidget = QWidget()
 
         self.vBoxLayout = QVBoxLayout(self)
@@ -169,6 +173,7 @@ class NavigationBar(QWidget):
 
         self.scrollArea.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
         self.scrollArea.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+        self.scrollArea.horizontalScrollBar().setEnabled(False)
         self.scrollArea.setWidget(self.scrollWidget)
         self.scrollArea.setWidgetResizable(True)
 

{pyside2_fluent_widgets-1.7.2 → pyside2_fluent_widgets-1.7.4}/qfluentwidgets/components/navigation/navigation_panel.py

@@ -9,7 +9,7 @@ from PySide2.QtWidgets import QWidget, QVBoxLayout, QFrame, QApplication, QHBoxL
 from .navigation_widget import (NavigationTreeWidgetBase, NavigationToolButton, NavigationWidget, NavigationSeparator,
                                 NavigationTreeWidget, NavigationFlyoutMenu)
 from ..widgets.acrylic_label import AcrylicBrush
-from ..widgets.scroll_area import SingleDirectionScrollArea
+from ..widgets.scroll_area import ScrollArea
 from ..widgets.tool_tip import ToolTipFilter
 from ..widgets.flyout import Flyout, FlyoutAnimationType, FlyoutViewBase, SlideRightFlyoutAnimationManager
 from ..material.acrylic_flyout import AcrylicFlyout, AcrylicFlyoutViewBase
@@ -71,7 +71,7 @@ class NavigationPanel(QFrame):
 
         self.acrylicBrush = AcrylicBrush(self, 30)
 
-        self.scrollArea = SingleDirectionScrollArea(self)
+        self.scrollArea = ScrollArea(self)
         self.scrollWidget = QWidget()
 
         self.menuButton = NavigationToolButton(FIF.MENU, self)
@@ -107,6 +107,7 @@ class NavigationPanel(QFrame):
 
         self.scrollArea.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
         self.scrollArea.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+        self.scrollArea.horizontalScrollBar().setEnabled(False)
         self.scrollArea.setWidget(self.scrollWidget)
         self.scrollArea.setWidgetResizable(True)
 
@@ -142,7 +143,7 @@ class NavigationPanel(QFrame):
         self.scrollLayout.setSpacing(4)
 
         self.vBoxLayout.addLayout(self.topLayout, 0)
-        self.vBoxLayout.addWidget(self.scrollArea, 1, Qt.AlignTop)
+        self.vBoxLayout.addWidget(self.scrollArea, 1)
         self.vBoxLayout.addLayout(self.bottomLayout, 0)
 
         self.vBoxLayout.setAlignment(Qt.AlignTop)
@@ -568,15 +569,6 @@ class NavigationPanel(QFrame):
     def isCollapsed(self):
         return self.displayMode == NavigationDisplayMode.COMPACT
 
-    def resizeEvent(self, e: QResizeEvent):
-        if e.oldSize().height() == self.height():
-            return
-
-        th = self.topLayout.minimumSize().height()
-        bh = self.bottomLayout.minimumSize().height()
-        h = self.height()-th-bh-20
-        self.scrollArea.setFixedHeight(max(h, 36))
-
     def eventFilter(self, obj, e: QEvent):
         if obj is not self.window() or not self._isCollapsible:
             return super().eventFilter(obj, e)

{pyside2_fluent_widgets-1.7.2 → pyside2_fluent_widgets-1.7.4}/qfluentwidgets/components/settings/__init__.py

@@ -1,7 +1,7 @@
 from .setting_card import (SettingCard, SwitchSettingCard, RangeSettingCard,
                            PushSettingCard, ColorSettingCard, HyperlinkCard,
                            PrimaryPushSettingCard, ColorPickerButton, ComboBoxSettingCard)
-from .expand_setting_card import ExpandSettingCard, ExpandGroupSettingCard
+from .expand_setting_card import ExpandSettingCard, ExpandGroupSettingCard, SimpleExpandGroupSettingCard
 from .folder_list_setting_card import FolderListSettingCard
 from .options_setting_card import OptionsSettingCard
 from .custom_color_setting_card import CustomColorSettingCard

{pyside2_fluent_widgets-1.7.2 → pyside2_fluent_widgets-1.7.4}/qfluentwidgets/components/settings/expand_setting_card.py

@@ -375,3 +375,15 @@ class ExpandGroupSettingCard(ExpandSettingCard):
 
         if self.isExpand:
             self.setFixedHeight(self.card.height()+h)
+
+
+class SimpleExpandGroupSettingCard(ExpandGroupSettingCard):
+    """ Simple expand group setting card """
+
+    def _adjustViewSize(self):
+        """ adjust view size """
+        h = self.viewLayout.sizeHint().height()
+        self.spaceWidget.setFixedHeight(h)
+
+        if self.isExpand:
+            self.setFixedHeight(self.card.height()+h)

{pyside2_fluent_widgets-1.7.2 → pyside2_fluent_widgets-1.7.4}/qfluentwidgets/components/widgets/combo_box.py

@@ -18,7 +18,7 @@ from ...common.style_sheet import FluentStyleSheet
 class ComboItem:
     """ Combo box item """
 
-    def __init__(self, text: str, icon: Union[str, QIcon, FluentIconBase] = None, userData=None):
+    def __init__(self, text: str, icon: Union[str, QIcon, FluentIconBase] = None, userData=None, isEnabled=True):
         """ add item
 
         Parameters
@@ -31,10 +31,14 @@ class ComboItem:
 
         userData: Any
             user data
+
+        isEnabled: bool
+            whether to enable the item
         """
         self.text = text
         self.userData = userData
         self.icon = icon
+        self.isEnabled = isEnabled
 
     @property
     def icon(self):
@@ -224,6 +228,11 @@ class ComboBoxBase:
         if 0 <= index < len(self.items):
             self.items[index].icon = icon
 
+    def setItemEnabled(self, index: int, isEnabled: bool):
+        """ Sets the enabled status of the item on the given index """
+        if 0 <= index < len(self.items):
+            self.items[index].isEnabled = isEnabled
+
     def findData(self, data):
         """ Returns the index of the item containing the given data, otherwise returns -1 """
         for i, item in enumerate(self.items):
@@ -306,8 +315,9 @@ class ComboBoxBase:
 
         menu = self._createComboMenu()
         for i, item in enumerate(self.items):
-            menu.addAction(
-                QAction(item.icon, item.text, triggered=lambda x=i: self._onItemClicked(x)))
+            action = QAction(item.icon, item.text, triggered=lambda x=i: self._onItemClicked(x))
+            action.setEnabled(item.isEnabled)
+            menu.addAction(action)
 
         if menu.view.width() < self.width():
             menu.view.setMinimumWidth(self.width())

{pyside2_fluent_widgets-1.7.2 → pyside2_fluent_widgets-1.7.4}/qfluentwidgets/components/widgets/tool_tip.py

@@ -444,6 +444,7 @@ class ItemViewToolTipDelegate(ToolTipFilter):
         if event.type() == QEvent.Type.ToolTip:
             text = index.data(Qt.ItemDataRole.ToolTipRole)
             if not text:
+                self.hideToolTip()
                 return False
 
             self.text = text

{pyside2_fluent_widgets-1.7.2 → pyside2_fluent_widgets-1.7.4}/setup.py

@@ -6,7 +6,7 @@ with open('README.md', encoding='utf-8') as f:
 
 setuptools.setup(
     name="PySide2-Fluent-Widgets",
-    version="1.7.2",
+    version="1.7.4",
     keywords="pyside2 fluent widgets",
     author="zhiyiYo",
     author_email="shokokawaii@outlook.com",