aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDH42017-05-28 15:05:08 -0500
committerDH42017-05-28 15:05:08 -0500
commit719e9a4ddf306b06bce7a5dcf0f3028731db0664 (patch)
tree0bd4b0b672af3c46ab97120068810bd08175b7b8
parente3079f7a67ce8939ebb861b9580c281f81331181 (diff)
Implemented change list order
-rw-r--r--main.py31
-rw-r--r--mainwindow.ui27
2 files changed, 55 insertions, 3 deletions
diff --git a/main.py b/main.py
index d165fc5..8a9ba8c 100644
--- a/main.py
+++ b/main.py
@@ -166,6 +166,9 @@ class Main(QtCore.QObject):
window.comboBox_resolution.setCurrentIndex(currentRes)
window.comboBox_resolution.currentIndexChanged.connect(self.updateResolution)
+ self.window.pushButton_listMoveUp.clicked.connect(self.moveComponentUp)
+ self.window.pushButton_listMoveDown.clicked.connect(self.moveComponentDown)
+
'''
window.lineEdit_visColor.setText('%s,%s,%s' % self.visColor)
window.pushButton_visColor.clicked.connect(lambda: self.pickColor('vis'))
@@ -292,6 +295,7 @@ class Main(QtCore.QObject):
self.pages.append(self.selectedComponents[-1].widget(self))
self.window.listWidget_componentList.setCurrentRow(index)
self.window.stackedWidget.addWidget(self.pages[-1])
+ self.window.stackedWidget.setCurrentIndex(index)
self.selectedComponents[-1].update()
def removeComponent(self):
@@ -308,6 +312,33 @@ class Main(QtCore.QObject):
index = self.window.listWidget_componentList.row(selected[0])
self.window.stackedWidget.setCurrentIndex(index)
+ def moveComponentUp(self):
+ row = self.window.listWidget_componentList.currentRow()
+ if row > 0:
+ item = self.window.listWidget_componentList.takeItem(row)
+ self.window.listWidget_componentList.insertItem(row - 1, item)
+ page = self.pages[row]
+ self.pages.pop(row)
+ self.pages.insert(row - 1, page)
+ widget = self.window.stackedWidget.removeWidget(page)
+ self.window.stackedWidget.insertWidget(row - 1, page)
+ self.window.listWidget_componentList.setCurrentRow(row - 1)
+ self.window.stackedWidget.setCurrentIndex(row -1)
+
+ def moveComponentDown(self):
+ row = self.window.listWidget_componentList.currentRow()
+ if row < len(self.pages):
+ item = self.window.listWidget_componentList.takeItem(row)
+ self.window.listWidget_componentList.insertItem(row + 1, item)
+ page = self.pages[row]
+ self.pages.pop(row)
+ self.pages.insert(row + 1, page)
+ widget = self.window.stackedWidget.removeWidget(page)
+ self.window.stackedWidget.insertWidget(row + 1, page)
+ self.window.listWidget_componentList.setCurrentRow(row + 1)
+ self.window.stackedWidget.setCurrentIndex(row + 1)
+
+
def LoadDefaultSettings(self):
self.resolutions = [
'1920x1080',
diff --git a/mainwindow.ui b/mainwindow.ui
index ce8233e..b15cc8e 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -129,6 +129,13 @@
</property>
</widget>
</item>
+ <item>
+ <widget class="QPushButton" name="pushButton_saveAs">
+ <property name="text">
+ <string>Save As</string>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item>
@@ -142,7 +149,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>10</height>
+ <height>20</height>
</size>
</property>
</spacer>
@@ -168,14 +175,28 @@
<item>
<widget class="QPushButton" name="pushButton_addComponent">
<property name="text">
- <string>Add Component</string>
+ <string>Add</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_removeComponent">
<property name="text">
- <string>Remove Component</string>
+ <string>Remove</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_listMoveDown">
+ <property name="text">
+ <string>Down</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_listMoveUp">
+ <property name="text">
+ <string>Up</string>
</property>
</widget>
</item>