Renamed order to move for consistency

Author: Robin-K-Lynn

friture/controlbar.py

@@ -45,17 +45,17 @@ 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.move_previous = QtWidgets.QToolButton(self)
+        move_previous_icon = QtGui.QIcon()
+        move_previous_icon.addPixmap(QtGui.QPixmap(":/images-src/dock-move-previous.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.move_previous.setIcon(move_previous_icon)
+        self.move_previous.setToolTip("Move widget to previous slot")
+
+        self.move_next = QtWidgets.QToolButton(self)
+        move_next_icon = QtGui.QIcon()
+        move_next_icon.addPixmap(QtGui.QPixmap(":/images-src/dock-move-next.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.move_next.setIcon(move_next_icon)
+        self.move_next.setToolTip("Move widget to next slot")
 
         self.close_button = QtWidgets.QToolButton(self)
         close_icon = QtGui.QIcon()
@@ -65,8 +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.move_previous)
+        self.layout.addWidget(self.move_next)
         self.layout.addWidget(self.close_button)
         self.layout.addStretch()
 

friture/dock.py

@@ -50,8 +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.move_previous.clicked.connect(self.movePrevious)
+        self.control_bar.move_next.clicked.connect(self.moveNext)
         self.control_bar.close_button.clicked.connect(self.closeClicked)
 
         #self.dockwidget = QtWidgets.QWidget(self)

friture/ui_friture.py

@@ -1,18 +1,17 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'ui\friture.ui'
+# Form implementation generated from reading ui file 'ui/friture.ui'
 #
-# Created: Sat Feb 14 20:44:29 2015
-#      by: PyQt5 UI code generator 5.4
+# Created by: PyQt5 UI code generator 5.15.11
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# run again.  Do not edit this file unless you know what you are doing.
+
 
-from . import friture_rc
 from PyQt5 import QtCore, QtGui, QtWidgets
 
 
 class Ui_MainWindow(object):
-
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")
         MainWindow.resize(869, 573)
@@ -31,11 +30,11 @@ def setupUi(self, MainWindow):
         self.actionStart.setCheckable(True)
         self.actionStart.setChecked(True)
         icon1 = QtGui.QIcon()
+        icon1.addPixmap(QtGui.QPixmap(":/images-src/start.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon1.addPixmap(QtGui.QPixmap(":/images-src/stop.svg"), QtGui.QIcon.Normal, QtGui.QIcon.On)
         icon1.addPixmap(QtGui.QPixmap(":/images-src/stop.svg"), QtGui.QIcon.Disabled, QtGui.QIcon.On)
-        icon1.addPixmap(QtGui.QPixmap(":/images-src/stop.svg"), QtGui.QIcon.Selected, QtGui.QIcon.On)
-        icon1.addPixmap(QtGui.QPixmap(":/images-src/start.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon1.addPixmap(QtGui.QPixmap(":/images-src/stop.svg"), QtGui.QIcon.Active, QtGui.QIcon.On)
+        icon1.addPixmap(QtGui.QPixmap(":/images-src/stop.svg"), QtGui.QIcon.Selected, QtGui.QIcon.On)
         self.actionStart.setIcon(icon1)
         self.actionStart.setObjectName("actionStart")
         self.actionSettings = QtWidgets.QAction(MainWindow)
@@ -71,3 +70,4 @@ def retranslateUi(self, MainWindow):
         self.actionAbout.setText(_translate("MainWindow", "About Friture"))
         self.actionNew_dock.setText(_translate("MainWindow", "New dock"))
         self.actionNew_dock.setToolTip(_translate("MainWindow", "Add a new dock to Friture window"))
+from . import friture_rc

resources/friture.qrc

@@ -4,8 +4,8 @@
     <file>images-src/dock-settings.svg</file>
     <file>images-src/dock-dock.svg</file>
     <file>images-src/dock-close.svg</file>
-    <file>images-src/dock-order-previous.svg</file>
-    <file>images-src/dock-order-next.svg</file>
+    <file>images-src/dock-move-previous.svg</file>
+    <file>images-src/dock-move-next.svg</file>
     <file>images-src/about.svg</file>
     <file>images-src/log.svg</file>
     <file>images-src/dock-undock.svg</file>