gui layout

Author: dalethomas81

Source/GUI/Qt.py

@@ -418,14 +418,14 @@ def create_control_panel(self):
         port_combo_qbox = QHBoxLayout()
         # create and add port label
         label = QLabel("Port:")
-        movable_widget(port_combo_qbox, label, [50,0,0,0], Qt.AlignmentFlag.AlignRight, Qt.AlignmentFlag.AlignCenter)
+        movable_widget(port_combo_qbox, label, [50,0,0,0], Qt.AlignmentFlag.AlignRight)
         # create and add port combobox
         self.port_combo = QComboBox()
-        movable_widget(port_combo_qbox, self.port_combo, [0,0,0,0], Qt.AlignmentFlag.AlignLeft, Qt.AlignmentFlag.AlignCenter)
+        movable_widget(port_combo_qbox, self.port_combo, [0,0,0,0], Qt.AlignmentFlag.AlignLeft)
         # create and add refresh button
         button = QPushButton("Refresh")
         button.clicked.connect(self.populate_serial_ports)
-        movable_widget(port_combo_qbox, button, [0,0,0,3], Qt.AlignmentFlag.AlignLeft, Qt.AlignmentFlag.AlignCenter)
+        movable_widget(port_combo_qbox, button, [0,0,0,2], Qt.AlignmentFlag.AlignLeft)
         # set spacing between all widgets in port layout
         port_combo_qbox.setSpacing(0)
         # add the port layout to the control row
@@ -439,12 +439,12 @@ def create_control_panel(self):
         baud_combo_qbox = QHBoxLayout()
         # create the baud label and add it to the port horizontal layout
         baud_label = QLabel("Baud:")
-        movable_widget(baud_combo_qbox, baud_label, [0,0,0,0], Qt.AlignmentFlag.AlignRight, Qt.AlignmentFlag.AlignCenter)
+        movable_widget(baud_combo_qbox, baud_label, [8,0,0,0], Qt.AlignmentFlag.AlignRight)
         # create the combobox
         self.baud_combo = QComboBox()
         self.baud_combo.addItems(["9600", "19200", "38400", "57600", "115200"])
         self.baud_combo.setCurrentText("115200")
-        movable_widget(baud_combo_qbox, self.baud_combo, [0,0,0,0], Qt.AlignmentFlag.AlignLeft, Qt.AlignmentFlag.AlignCenter)
+        movable_widget(baud_combo_qbox, self.baud_combo, [0,0,0,0], Qt.AlignmentFlag.AlignLeft)
         # set the spacing of all items in the port horizontal layout to 0 so they are all clos
         baud_combo_qbox.setSpacing(0)
         # finally, add the port horizontal layout to the control row horizontal layout
@@ -459,40 +459,58 @@ def create_control_panel(self):
         # create the connect button and add it to the connection horizontal layout
         self.connect_button = QPushButton("Connect")
         self.connect_button.clicked.connect(self.toggle_connection)
-        conn_combo_qbox.addWidget(self.connect_button)
+        movable_widget(conn_combo_qbox, self.connect_button, [0,0,0,2.5], Qt.AlignmentFlag.AlignRight)
         # create the baud label and add it to the port horizontal layout
-        conn_combo_qbox.addWidget(QLabel("Not connected"),alignment=Qt.AlignmentFlag.AlignRight)
-        # set the spacing of all items in the port horizontal layout to 0 so they are all clos
+        self.status_label = QLabel("Not connected")
+        movable_widget(conn_combo_qbox, self.status_label, [10,0,0,0], Qt.AlignmentFlag.AlignLeft)
+        # set the spacing of all items in the port horizontal layout to 0 so they are all close
         conn_combo_qbox.setSpacing(0)
         # finally, add the port horizontal layout to the control row horizontal layout
         control_row.addLayout(conn_combo_qbox)
 
         #
         control_row.setSpacing(0)
 
-        #
-        self.main_layout.setSpacing(0)
-
         #
         self.main_layout.addLayout(control_row)
 
     def create_command_panel(self):
         cmd_row = QHBoxLayout()
 
-        cmd_row.addWidget(QLabel("Command:"))
+        ###
+        # create a horizontal layout that will hold the command label and command combobox
+        cmd_combo_qbox = QHBoxLayout()
+        # create the command label and add it to the command horizontal layout
+        cmd_label = QLabel("Command:")
+        movable_widget(cmd_combo_qbox, cmd_label, [20,0,0,0], Qt.AlignmentFlag.AlignRight)
+        # create the command combobox and add it to the command horizontal layout
         self.command_input = QComboBox()
         self.command_input.setEditable(True)
         self.command_input.addItems(default_quick_commands)
         self.command_input.setCurrentIndex(-1)
         self.command_input.lineEdit().returnPressed.connect(self.send_serial_command)
         self.command_input.setFont(self.mono_font)
-        cmd_row.addWidget(self.command_input)
+        self.command_input.setMinimumWidth(800)
+        movable_widget(cmd_combo_qbox, self.command_input, [0,0,0,0], Qt.AlignmentFlag.AlignLeft)
+        # set the spacing of all items in the command horizontal layout to 0 so they are all close
+        cmd_combo_qbox.setSpacing(0)
+        # finally, add the command horizontal layout to the command row horizontal layout
+        cmd_row.addLayout(cmd_combo_qbox)
 
+        # add some spacing between the command layout and the send button
+        #cmd_row.addSpacing(20)
 
+        ###
+        # create a send button and add it directly to the command row horizontal layout
         self.send_button = QPushButton("Send")
         self.send_button.clicked.connect(self.send_serial_command)
-        cmd_row.addWidget(self.send_button)
+        #self.send_button.setMaximumWidth(100)
+        movable_widget(cmd_row, self.send_button, [8,0,0,0], Qt.AlignmentFlag.AlignLeft)
+
+        #
+        cmd_row.setSpacing(0)
 
+        #
         self.main_layout.addLayout(cmd_row)
 
     def create_tabs(self):