diff options
| -rw-r--r-- | mainwindow.py | 60 | ||||
| -rw-r--r-- | mainwindow.ui | 147 | ||||
| -rw-r--r-- | presetmanager.ui | 104 |
3 files changed, 200 insertions, 111 deletions
diff --git a/mainwindow.py b/mainwindow.py index 78809be..27c8f6e 100644 --- a/mainwindow.py +++ b/mainwindow.py @@ -141,7 +141,6 @@ class MainWindow(QtCore.QObject): window.spinBox_vBitrate.valueChanged.connect(self.updateCodecSettings) window.spinBox_aBitrate.valueChanged.connect(self.updateCodecSettings) - self.previewWindow = PreviewWindow(self, os.path.join( os.path.dirname(os.path.realpath(__file__)), "background.png")) window.verticalLayout_previewWrapper.addWidget(self.previewWindow) @@ -169,23 +168,44 @@ class MainWindow(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) - self.window.pushButton_savePreset.clicked.connect( + + '''self.window.pushButton_savePreset.clicked.connect( self.openSavePresetDialog) self.window.comboBox_openPreset.currentIndexChanged.connect( - self.openPreset) - self.window.pushButton_saveAs.clicked.connect( + self.openPreset)''' + + # Configure the Projects Menu + self.projectMenu = QMenu() + action = self.projectMenu.addAction("New Project") + action.triggered[()].connect(self.createNewProject) + + action = self.projectMenu.addAction("Open Project") + action.triggered[()].connect(self.openOpenProjectDialog) + + action = self.projectMenu.addAction("Save Project") + action.triggered[()].connect(self.saveCurrentProject) + + action = self.projectMenu.addAction("Save Project As") + action.triggered[()].connect(self.openSaveProjectDialog) + + self.window.pushButton_projects.setMenu(self.projectMenu) + + # Configure the Presets Button + self.window.pushButton_presets.clicked.connect( + self.openPresetManager + ) + + '''self.window.pushButton_saveAs.clicked.connect( self.openSaveProjectDialog) self.window.pushButton_saveProject.clicked.connect( self.saveCurrentProject) self.window.pushButton_openProject.clicked.connect( - self.openOpenProjectDialog) + self.openOpenProjectDialog)''' # show the window and load current project window.show() @@ -327,10 +347,8 @@ class MainWindow(QtCore.QObject): self.window.pushButton_removeComponent.setEnabled(False) self.window.pushButton_listMoveDown.setEnabled(False) self.window.pushButton_listMoveUp.setEnabled(False) - self.window.comboBox_openPreset.setEnabled(False) - self.window.pushButton_removePreset.setEnabled(False) - self.window.pushButton_savePreset.setEnabled(False) - self.window.pushButton_openProject.setEnabled(False) + self.window.comboBox_Presets.setEnabled(False) + '''self.window.pushButton_openProject.setEnabled(False)''' self.window.listWidget_componentList.setEnabled(False) else: self.window.pushButton_createVideo.setEnabled(True) @@ -348,10 +366,8 @@ class MainWindow(QtCore.QObject): self.window.pushButton_removeComponent.setEnabled(True) self.window.pushButton_listMoveDown.setEnabled(True) self.window.pushButton_listMoveUp.setEnabled(True) - self.window.comboBox_openPreset.setEnabled(True) - self.window.pushButton_removePreset.setEnabled(True) - self.window.pushButton_savePreset.setEnabled(True) - self.window.pushButton_openProject.setEnabled(True) + self.window.comboBox_Presets.setEnabled(True) + '''self.window.pushButton_openProject.setEnabled(True)''' self.window.listWidget_componentList.setEnabled(True) def progressBarSetText(self, value): @@ -401,7 +417,7 @@ class MainWindow(QtCore.QObject): self.window.stackedWidget.addWidget(self.pages[-1]) self.window.stackedWidget.setCurrentIndex(index) self.selectedComponents[-1].update() - self.updateOpenPresetComboBox(self.selectedComponents[-1]) + '''self.updateOpenPresetComboBox(self.selectedComponents[-1])''' def insertComponent(self, moduleIndex): self.selectedComponents.insert( @@ -413,7 +429,7 @@ class MainWindow(QtCore.QObject): self.window.stackedWidget.insertWidget(0, self.pages[0]) self.window.stackedWidget.setCurrentIndex(0) self.selectedComponents[0].update() - self.updateOpenPresetComboBox(self.selectedComponents[0]) + '''self.updateOpenPresetComboBox(self.selectedComponents[0])''' def removeComponent(self): for selected in self.window.listWidget_componentList.selectedItems(): @@ -430,7 +446,7 @@ class MainWindow(QtCore.QObject): if selected: index = self.window.listWidget_componentList.row(selected[0]) self.window.stackedWidget.setCurrentIndex(index) - self.updateOpenPresetComboBox(self.selectedComponents[index]) + '''self.updateOpenPresetComboBox(self.selectedComponents[index])''' def moveComponentUp(self): row = self.window.listWidget_componentList.currentRow() @@ -466,6 +482,11 @@ class MainWindow(QtCore.QObject): self.window.stackedWidget.setCurrentIndex(row + 1) self.drawPreview() + # Preset manager for importing, exporting, renaming, + # and deleting presets. + def openPresetManager(self): + return + def updateOpenPresetComboBox(self, component): self.window.comboBox_openPreset.clear() self.window.comboBox_openPreset.addItem("Component Presets") @@ -547,6 +568,9 @@ class MainWindow(QtCore.QObject): self.selectedComponents[index].loadPreset(saveValueStore) self.drawPreview() + def createNewProject(self): + return + def saveCurrentProject(self): if self.currentProject: self.createProjectFile(self.currentProject) diff --git a/mainwindow.ui b/mainwindow.ui index c010caf..62e0632 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -108,23 +108,32 @@ <enum>QLayout::SetMinimumSize</enum> </property> <item> - <widget class="QPushButton" name="pushButton_openProject"> - <property name="text"> - <string>Open Project</string> + <spacer name="horizontalSpacer_6"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> </property> - </widget> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>140</width> + <height>20</height> + </size> + </property> + </spacer> </item> <item> - <widget class="QPushButton" name="pushButton_saveProject"> + <widget class="QPushButton" name="pushButton_projects"> <property name="text"> - <string>Save Project</string> + <string>Projects</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="pushButton_saveAs"> + <widget class="QPushButton" name="pushButton_presets"> <property name="text"> - <string>Save As</string> + <string>Presets</string> </property> </widget> </item> @@ -141,54 +150,12 @@ <property name="sizeHint" stdset="0"> <size> <width>20</width> - <height>15</height> + <height>2</height> </size> </property> </spacer> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_14"> - <item> - <widget class="QPushButton" name="pushButton_addComponent"> - <property name="text"> - <string>Add</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="pushButton_removeComponent"> - <property name="text"> - <string>Remove</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="pushButton_listMoveUp"> - <property name="text"> - <string>Up</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="pushButton_listMoveDown"> - <property name="text"> - <string>Down</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_7"> - <property name="leftMargin"> - <number>4</number> - </property> - <property name="rightMargin"> - <number>2</number> - </property> - <item> <widget class="QListWidget" name="listWidget_componentList"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Expanding"> @@ -231,54 +198,48 @@ </property> </widget> </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_14"> + <item> + <widget class="QPushButton" name="pushButton_addComponent"> + <property name="text"> + <string>Add</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton_removeComponent"> + <property name="text"> + <string>Remove</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton_listMoveUp"> + <property name="text"> + <string>Up</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton_listMoveDown"> + <property name="text"> + <string>Down</string> + </property> + </widget> + </item> + </layout> + </item> </layout> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_15"> + <layout class="QHBoxLayout" name="horizontalLayout_7"> <property name="leftMargin"> + <number>4</number> + </property> + <property name="rightMargin"> <number>2</number> </property> - <item> - <widget class="QComboBox" name="comboBox_openPreset"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>180</width> - <height>0</height> - </size> - </property> - <item> - <property name="text"> - <string>Component Presets</string> - </property> - </item> - </widget> - </item> - <item> - <widget class="QPushButton" name="pushButton_savePreset"> - <property name="minimumSize"> - <size> - <width>0</width> - <height>0</height> - </size> - </property> - <property name="text"> - <string>Save</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="pushButton_removePreset"> - <property name="text"> - <string>Remove</string> - </property> - </widget> - </item> </layout> </item> </layout> diff --git a/presetmanager.ui b/presetmanager.ui new file mode 100644 index 0000000..7496169 --- /dev/null +++ b/presetmanager.ui @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>presetmanager</class> + <widget class="QWidget" name="presetmanager"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>542</width> + <height>360</height> + </rect> + </property> + <property name="windowTitle"> + <string>Preset Manager</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QLineEdit" name="lineEdit"> + <property name="text"> + <string>Search</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="comboBox"> + <property name="minimumSize"> + <size> + <width>200</width> + <height>0</height> + </size> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QListWidget" name="listWidget_2"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="sizeConstraint"> + <enum>QLayout::SetMinimumSize</enum> + </property> + <item> + <widget class="QPushButton" name="pushButton"> + <property name="text"> + <string>Import</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton_2"> + <property name="text"> + <string>Export</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="pushButton_3"> + <property name="text"> + <string>Rename</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton_4"> + <property name="text"> + <string>Delete</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> |