UI: ProgramEdit: Tweak layout

src/ui/form/prog/programeditdialog.cpp

@@ -330,6 +330,9 @@ QLayout *ProgramEditDialog::setupMainLayout()
 
     setupActionsGroup();
 
+    // Zones
+    auto zonesRulesLayout = setupZonesRulesLayout();
+
     // Schedule
     auto scheduleLayout = setupScheduleLayout();
 
@@ -345,6 +348,8 @@ QLayout *ProgramEditDialog::setupMainLayout()
     layout->addWidget(ControlUtil::createSeparator());
     layout->addStretch();
     layout->addLayout(actionsLayout);
+    layout->addWidget(ControlUtil::createHSeparator());
+    layout->addLayout(zonesRulesLayout);
     layout->addWidget(ControlUtil::createSeparator());
     layout->addLayout(scheduleLayout);
     layout->addStretch();
@@ -496,22 +501,26 @@ void ProgramEditDialog::setupAdvancedOptions()
     // Use Group Perm.
     m_cbUseGroupPerm = new QCheckBox();
 
+    // Parked
+    m_cbParked = new QCheckBox();
+    m_cbParked->setIcon(IconCache::icon(":/icons/parking.png"));
+
     // Child Options
-    auto childLayout = setupChildLayout();
+    setupChildOptions();
 
-    // Log
+    // Log Options
-    auto logLayout = setupLogLayout();
+    setupLogOptions();
 
-    // Zones
+    auto layout = ControlUtil::createVLayoutByWidgets({
-    auto zonesLayout = setupZonesLayout();
+            m_cbUseGroupPerm,
-
+            m_cbParked,
-    auto layout = new QVBoxLayout();
+            ControlUtil::createHSeparator(),
-    layout->addWidget(m_cbUseGroupPerm);
+            m_cbApplyChild,
-    layout->addLayout(childLayout);
+            m_cbKillChild,
-    layout->addWidget(ControlUtil::createHSeparator());
+            ControlUtil::createHSeparator(),
-    layout->addLayout(logLayout);
+            m_cbLogBlocked,
-    layout->addWidget(ControlUtil::createHSeparator());
+            m_cbLogConn,
-    layout->addLayout(zonesLayout);
+    });
 
     auto menu = ControlUtil::createMenuByLayout(layout, this);
 
@@ -520,43 +529,33 @@ void ProgramEditDialog::setupAdvancedOptions()
     m_btOptions->setMenu(menu);
 }
 
-QLayout *ProgramEditDialog::setupChildLayout()
+void ProgramEditDialog::setupChildOptions()
 {
     // Apply Child
     m_cbApplyChild = new QCheckBox();
 
     // Kill Child
     m_cbKillChild = new QCheckBox();
+    m_cbKillChild->setIcon(IconCache::icon(":/icons/scull.png"));
+
     connect(m_cbKillChild, &QCheckBox::clicked, this, &ProgramEditDialog::warnDangerousOption);
-
-    auto layout = ControlUtil::createHLayoutByWidgets(
-            { m_cbApplyChild, ControlUtil::createVSeparator(), m_cbKillChild });
-
-    return layout;
 }
 
-QLayout *ProgramEditDialog::setupLogLayout()
+void ProgramEditDialog::setupLogOptions()
 {
-    // Parked
-    m_cbParked = new QCheckBox();
-
     // Log Blocked
     m_cbLogBlocked = new QCheckBox();
 
     // Log Conn
     m_cbLogConn = new QCheckBox();
     m_cbLogConn->setVisible(false); // TODO: Collect allowed connections
-
-    auto layout = ControlUtil::createHLayoutByWidgets({ m_cbParked, ControlUtil::createVSeparator(),
-            m_cbLogBlocked, m_cbLogConn, /*stretch*/ nullptr });
-
-    return layout;
 }
 
-QLayout *ProgramEditDialog::setupZonesLayout()
+QLayout *ProgramEditDialog::setupZonesRulesLayout()
 {
     // LAN Only
     m_cbLanOnly = new QCheckBox();
+    m_cbLanOnly->setIcon(IconCache::icon(":/icons/hostname.png"));
 
     // Zones
     m_btZones = new ZonesSelector();
@@ -599,6 +598,7 @@ QLayout *ProgramEditDialog::setupScheduleLayout()
 void ProgramEditDialog::setupCbSchedule()
 {
     m_cbSchedule = new QCheckBox();
+    m_cbSchedule->setIcon(IconCache::icon(":/icons/time.png"));
 
     const auto refreshScheduleEnabled = [&](bool checked) {
         m_comboScheduleAction->setEnabled(checked);

src/ui/form/prog/programeditdialog.h

@@ -78,9 +78,9 @@ private:
     QLayout *setupActionsLayout();
     void setupActionsGroup();
     void setupAdvancedOptions();
-    QLayout *setupChildLayout();
+    void setupChildOptions();
-    QLayout *setupLogLayout();
+    void setupLogOptions();
-    QLayout *setupZonesLayout();
+    QLayout *setupZonesRulesLayout();
     QLayout *setupScheduleLayout();
     void setupCbSchedule();
     void setupComboScheduleType();