Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions friture/controlbar.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,18 @@ def __init__(self, parent):
settings_icon.addPixmap(QtGui.QPixmap(":/images-src/dock-settings.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.settings_button.setIcon(settings_icon)

self.order_previous = QtWidgets.QToolButton(self)
order_previous_icon = QtGui.QIcon()
order_previous_icon.addPixmap(QtGui.QPixmap(":/images-src/dock-order-previous.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.order_previous.setIcon(order_previous_icon)
self.order_previous.setToolTip("Move widget to previous slot")

self.order_next = QtWidgets.QToolButton(self)
order_next_icon = QtGui.QIcon()
order_next_icon.addPixmap(QtGui.QPixmap(":/images-src/dock-order-next.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.order_next.setIcon(order_next_icon)
self.order_next.setToolTip("Move widget to next slot")

self.close_button = QtWidgets.QToolButton(self)
close_icon = QtGui.QIcon()
close_icon.addPixmap(QtGui.QPixmap(":/images-src/dock-close.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
Expand All @@ -53,6 +65,8 @@ def __init__(self, parent):

self.layout.addWidget(self.combobox_select)
self.layout.addWidget(self.settings_button)
self.layout.addWidget(self.order_previous)
self.layout.addWidget(self.order_next)
self.layout.addWidget(self.close_button)
self.layout.addStretch()

Expand Down
29 changes: 28 additions & 1 deletion friture/dock.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ def __init__(

self.control_bar.combobox_select.activated.connect(self.indexChanged)
self.control_bar.settings_button.clicked.connect(self.settings_slot)
self.control_bar.order_previous.clicked.connect(self.movePrevious)
self.control_bar.order_next.clicked.connect(self.moveNext)
self.control_bar.close_button.clicked.connect(self.closeClicked)

#self.dockwidget = QtWidgets.QWidget(self)
Expand All @@ -73,9 +75,34 @@ def __init__(
def closeEvent(self, event):
self.dockmanager.close_dock(self)

def closeClicked(self, checked):
def closeClicked(self):
self.close()

def movePrevious(self):
layout = self.parent().parent().centralLayout
itemList = layout.itemList

for i, item in enumerate(itemList):
if item.widget() is self:
if i > 0 and i < len(itemList):
itemList.insert(i-1, itemList.pop(i))
self.dockmanager.docks.insert(i-1, self.dockmanager.docks.pop(i))
layout.update()

break

def moveNext(self):
layout = self.parent().parent().centralLayout
itemList = layout.itemList

for i, item in enumerate(itemList):
if item.widget() is self:
if i >= 0 and i < len(itemList)-1:
itemList.insert(i+1, itemList.pop(i))
self.dockmanager.docks.insert(i+1, self.dockmanager.docks.pop(i))
layout.update()
break

# slot
def indexChanged(self, index):
if index > len(widgetIds()):
Expand Down
Loading