diff --git a/ribbon/__init__.py b/ribbon/__init__.py index 3adf72bc..39ffb514 100644 --- a/ribbon/__init__.py +++ b/ribbon/__init__.py @@ -3,8 +3,8 @@ RibbonCategoryScrollAreaContents) from .gallery import RibbonGallery, RibbonGalleryListWidget, RibbonGalleryButton, RibbonGalleryPopupListWidget from .mainwindow import RibbonMainWindow -from .panel import RibbonPanel, RibbonPanelTitle, SpaceFindMode, GridLayoutManager, RibbonPanelItemWidget -from .panel import SpaceFindMode +from .panel import RibbonPanel, RibbonPanelTitle, RibbonSpaceFindMode, RibbonGridLayoutManager, RibbonPanelItemWidget +from .panel import RibbonSpaceFindMode from .ribbonbar import RibbonBar, RibbonStyle from .separator import RibbonSeparator, RibbonHorizontalSeparator, RibbonVerticalSeparator from .tabbar import RibbonTabBar diff --git a/ribbon/panel.py b/ribbon/panel.py index 309afe57..fb5b8eb2 100644 --- a/ribbon/panel.py +++ b/ribbon/panel.py @@ -15,13 +15,13 @@ class RibbonPanelTitle(QtWidgets.QLabel): pass -class SpaceFindMode(IntEnum): +class RibbonSpaceFindMode(IntEnum): """Mode to find available space in a grid layout, ColumnWise or RowWise.""" ColumnWise = 0 RowWise = 1 -class GridLayoutManager(object): +class RibbonGridLayoutManager(object): """Grid Layout Manager.""" def __init__(self, rows: int): @@ -32,7 +32,7 @@ def __init__(self, rows: int): self.rows = rows self.cells = np.ones((rows, 1), dtype=bool) - def request_cells(self, rowSpan: int = 1, colSpan: int = 1, mode=SpaceFindMode.ColumnWise): + def request_cells(self, rowSpan: int = 1, colSpan: int = 1, mode=RibbonSpaceFindMode.ColumnWise): """Request a number of available cells from the grid. :param rowSpan: The number of rows the cell should span. @@ -42,7 +42,7 @@ def request_cells(self, rowSpan: int = 1, colSpan: int = 1, mode=SpaceFindMode.C """ if rowSpan > self.rows: raise ValueError("RowSpan is too large") - if mode == SpaceFindMode.ColumnWise: + if mode == RibbonSpaceFindMode.ColumnWise: for row in range(self.cells.shape[0] - rowSpan + 1): for col in range(self.cells.shape[1] - colSpan + 1): if self.cells[row: row + rowSpan, col: col + colSpan].all(): @@ -104,7 +104,7 @@ class RibbonPanel(QtWidgets.QFrame): #: maximal number of rows _maxRows: int #: GridLayout manager to request available cells. - _gridLayoutManager: GridLayoutManager + _gridLayoutManager: RibbonGridLayoutManager #: widgets that are added to the panel _widgets: typing.List[QtWidgets.QWidget] = [] @@ -124,7 +124,7 @@ def __init__(self, title: str, maxRows=6, parent=None): """ super().__init__(parent) self._maxRows = maxRows - self._gridLayoutManager = GridLayoutManager(self._maxRows) + self._gridLayoutManager = RibbonGridLayoutManager(self._maxRows) self._widgets = [] # Main layout @@ -190,7 +190,7 @@ def addWidget( widget: QtWidgets.QWidget, rowSpan: int = 2, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ): """Add a widget to the panel. @@ -215,7 +215,7 @@ def addWidget( def addSmallWidget( self, widget: QtWidgets.QWidget, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ): """Add a small widget to the panel. @@ -230,7 +230,7 @@ def addSmallWidget( def addMediumWidget( self, widget: QtWidgets.QWidget, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ): """Add a medium widget to the panel. @@ -244,7 +244,7 @@ def addMediumWidget( def addLargeWidget( self, widget: QtWidgets.QWidget, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ): """Add a large widget to the panel. @@ -278,7 +278,7 @@ def addButton( shortcut=None, tooltip=None, statusTip=None, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> RibbonToolButton: """Add a button to the panel. @@ -336,7 +336,7 @@ def addSmallButton( shortcut=None, tooltip=None, statusTip=None, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> RibbonToolButton: """Add a small button to the panel. @@ -365,7 +365,7 @@ def addMediumButton( shortcut=None, tooltip=None, statusTip=None, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> RibbonToolButton: """Add a medium button to the panel. @@ -394,7 +394,7 @@ def addLargeButton( shortcut=None, tooltip=None, statusTip=None, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> RibbonToolButton: """Add a large button to the panel. @@ -424,7 +424,7 @@ def addToggleButton( shortcut=None, tooltip=None, statusTip=None, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> RibbonToolButton: """Add a toggle button to the panel. @@ -456,7 +456,7 @@ def addSmallToggleButton( shortcut=None, tooltip=None, statusTip=None, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> RibbonToolButton: """Add a small toggle button to the panel. @@ -486,7 +486,7 @@ def addMediumToggleButton( shortcut=None, tooltip=None, statusTip=None, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> RibbonToolButton: """Add a medium toggle button to the panel. @@ -516,7 +516,7 @@ def addLargeToggleButton( shortcut=None, tooltip=None, statusTip=None, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> RibbonToolButton: """Add a large toggle button to the panel. @@ -541,7 +541,7 @@ def addComboBox( items: typing.List[str], rowSpan: int = 2, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> QtWidgets.QComboBox: """Add a combo box to the panel. @@ -561,7 +561,7 @@ def addFontComboBox( self, rowSpan: int = 2, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> QtWidgets.QFontComboBox: """Add a font combo box to the panel. @@ -579,7 +579,7 @@ def addLineEdit( self, rowSpan: int = 2, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> QtWidgets.QLineEdit: """Add a line edit to the panel. @@ -597,7 +597,7 @@ def addTextEdit( self, rowSpan: int = 2, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> QtWidgets.QTextEdit: """Add a text edit to the panel. @@ -615,7 +615,7 @@ def addPlainTextEdit( self, rowSpan: int = 2, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> QtWidgets.QPlainTextEdit: """Add a plain text edit to the panel. @@ -634,7 +634,7 @@ def addLabel( text: str, rowSpan: int = 2, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> QtWidgets.QLabel: """Add a label to the panel. @@ -654,7 +654,7 @@ def addProgressBar( self, rowSpan: int = 2, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> QtWidgets.QProgressBar: """Add a progress bar to the panel. @@ -672,7 +672,7 @@ def addSlider( self, rowSpan: int = 2, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> QtWidgets.QSlider: """Add a slider to the panel. @@ -691,7 +691,7 @@ def addSpinBox( self, rowSpan: int = 2, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> QtWidgets.QSpinBox: """Add a spin box to the panel. @@ -709,7 +709,7 @@ def addDoubleSpinBox( self, rowSpan: int = 2, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> QtWidgets.QDoubleSpinBox: """Add a double spin box to the panel. @@ -727,7 +727,7 @@ def addDateEdit( self, rowSpan: int = 2, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> QtWidgets.QDateEdit: """Add a date edit to the panel. @@ -745,7 +745,7 @@ def addTimeEdit( self, rowSpan: int = 2, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> QtWidgets.QTimeEdit: """Add a time edit to the panel. @@ -763,7 +763,7 @@ def addDateTimeEdit( self, rowSpan: int = 2, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> QtWidgets.QDateTimeEdit: """Add a date time edit to the panel. @@ -781,7 +781,7 @@ def addTableWidget( self, rowSpan: int = 6, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> QtWidgets.QTableWidget: """Add a table widget to the panel. @@ -799,7 +799,7 @@ def addTreeWidget( self, rowSpan: int = 6, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> QtWidgets.QTreeWidget: """Add a tree widget to the panel. @@ -817,7 +817,7 @@ def addListWidget( self, rowSpan: int = 6, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> QtWidgets.QListWidget: """Add a list widget to the panel. @@ -835,7 +835,7 @@ def addCalendarWidget( self, rowSpan: int = 6, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> QtWidgets.QCalendarWidget: """Add a calendar widget to the panel. @@ -855,7 +855,7 @@ def addSeparator( width=6, rowSpan: int = 6, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> typing.Union[RibbonHorizontalSeparator, RibbonVerticalSeparator]: """Add a separator to the panel. @@ -878,7 +878,7 @@ def addHorizontalSeparator( linewidth=6, rowSpan: int = 1, colSpan: int = 2, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> RibbonHorizontalSeparator: """Add a horizontal separator to the panel. @@ -897,7 +897,7 @@ def addVerticalSeparator( linewidth=6, rowSpan: int = 6, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise, + mode=RibbonSpaceFindMode.ColumnWise, alignment=QtCore.Qt.AlignCenter, ) -> RibbonVerticalSeparator: """Add a vertical separator to the panel. @@ -917,7 +917,7 @@ def addGallery( popupHideOnClick=False, rowSpan: int = 6, colSpan: int = 1, - mode=SpaceFindMode.ColumnWise + mode=RibbonSpaceFindMode.ColumnWise ) -> RibbonGallery: """Add a gallery to the panel.