From ba4ef52e9ead8d33edb30d4bd23796706c6f3ba8 Mon Sep 17 00:00:00 2001
From: thez3ro <io@thezero.org>
Date: Fri, 19 Jan 2018 00:50:22 +0100
Subject: [PATCH] improve Window Associations UI/UX

---
 src/gui/entry/EditEntryWidget.cpp        | 21 ++++++++-------------
 src/gui/entry/EditEntryWidgetAutoType.ui | 12 ++----------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
index c146da69..71366651 100644
--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -170,8 +170,7 @@ void EditEntryWidget::setupAutoType()
 
     m_autoTypeDefaultSequenceGroup->addButton(m_autoTypeUi->inheritSequenceButton);
     m_autoTypeDefaultSequenceGroup->addButton(m_autoTypeUi->customSequenceButton);
-    m_autoTypeWindowSequenceGroup->addButton(m_autoTypeUi->defaultWindowSequenceButton);
-    m_autoTypeWindowSequenceGroup->addButton(m_autoTypeUi->customWindowSequenceButton);
+    //m_autoTypeWindowSequenceGroup->addButton(m_autoTypeUi->customWindowSequenceButton);
     m_autoTypeAssocModel->setAutoTypeAssociations(m_autoTypeAssoc);
     m_autoTypeUi->assocView->setModel(m_autoTypeAssocModel);
     m_autoTypeUi->assocView->setColumnHidden(1, true);
@@ -190,8 +189,6 @@ void EditEntryWidget::setupAutoType()
     connect(m_autoTypeAssocModel, SIGNAL(modelReset()), SLOT(clearCurrentAssoc()));
     connect(m_autoTypeUi->windowTitleCombo, SIGNAL(editTextChanged(QString)),
             SLOT(applyCurrentAssoc()));
-    connect(m_autoTypeUi->defaultWindowSequenceButton, SIGNAL(toggled(bool)),
-            SLOT(applyCurrentAssoc()));
     connect(m_autoTypeUi->windowSequenceEdit, SIGNAL(textChanged(QString)),
             SLOT(applyCurrentAssoc()));
 }
@@ -644,7 +641,7 @@ void EditEntryWidget::setForms(const Entry* entry, bool restore)
     }
     m_autoTypeUi->sequenceEdit->setText(entry->effectiveAutoTypeSequence());
     m_autoTypeUi->windowTitleCombo->lineEdit()->clear();
-    m_autoTypeUi->defaultWindowSequenceButton->setChecked(true);
+    m_autoTypeUi->customWindowSequenceButton->setChecked(false);
     m_autoTypeUi->windowSequenceEdit->setText("");
     m_autoTypeAssoc->copyDataFrom(entry->autoTypeAssociations());
     m_autoTypeAssocModel->setEntry(entry);
@@ -998,7 +995,6 @@ void EditEntryWidget::updateAutoTypeEnabled()
 
     m_autoTypeUi->windowTitleLabel->setEnabled(autoTypeEnabled && validIndex);
     m_autoTypeUi->windowTitleCombo->setEnabled(autoTypeEnabled && validIndex);
-    m_autoTypeUi->defaultWindowSequenceButton->setEnabled(!m_history && autoTypeEnabled && validIndex);
     m_autoTypeUi->customWindowSequenceButton->setEnabled(!m_history && autoTypeEnabled && validIndex);
     m_autoTypeUi->windowSequenceEdit->setEnabled(autoTypeEnabled && validIndex
                                                  && m_autoTypeUi->customWindowSequenceButton->isChecked());
@@ -1029,16 +1025,15 @@ void EditEntryWidget::loadCurrentAssoc(const QModelIndex& current)
         AutoTypeAssociations::Association assoc = m_autoTypeAssoc->get(current.row());
         m_autoTypeUi->windowTitleCombo->setEditText(assoc.window);
         if (assoc.sequence.isEmpty()) {
-            m_autoTypeUi->defaultWindowSequenceButton->setChecked(true);
-        }
-        else {
+            m_autoTypeUi->customWindowSequenceButton->setChecked(false);
+            m_autoTypeUi->windowSequenceEdit->setText(m_entry->effectiveAutoTypeSequence());
+        } else {
             m_autoTypeUi->customWindowSequenceButton->setChecked(true);
+            m_autoTypeUi->windowSequenceEdit->setText(assoc.sequence);
         }
-        m_autoTypeUi->windowSequenceEdit->setText(assoc.sequence);
 
         updateAutoTypeEnabled();
-    }
-    else {
+    } else {
         clearCurrentAssoc();
     }
 }
@@ -1047,7 +1042,7 @@ void EditEntryWidget::clearCurrentAssoc()
 {
     m_autoTypeUi->windowTitleCombo->setEditText("");
 
-    m_autoTypeUi->defaultWindowSequenceButton->setChecked(true);
+    m_autoTypeUi->customWindowSequenceButton->setChecked(false);
     m_autoTypeUi->windowSequenceEdit->setText("");
 
     updateAutoTypeEnabled();
diff --git a/src/gui/entry/EditEntryWidgetAutoType.ui b/src/gui/entry/EditEntryWidgetAutoType.ui
index a8090f76..3d4ec7a3 100644
--- a/src/gui/entry/EditEntryWidgetAutoType.ui
+++ b/src/gui/entry/EditEntryWidgetAutoType.ui
@@ -203,16 +203,9 @@
          </spacer>
         </item>
         <item>
-         <widget class="QRadioButton" name="defaultWindowSequenceButton">
+         <widget class="QCheckBox" name="customWindowSequenceButton">
           <property name="text">
-           <string>Use default se&amp;quence</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QRadioButton" name="customWindowSequenceButton">
-          <property name="text">
-           <string>Set custo&amp;m sequence:</string>
+           <string>Use a specific sequence for this association:</string>
           </property>
          </widget>
         </item>
@@ -277,7 +270,6 @@
   <tabstop>sequenceEdit</tabstop>
   <tabstop>assocView</tabstop>
   <tabstop>windowTitleCombo</tabstop>
-  <tabstop>defaultWindowSequenceButton</tabstop>
   <tabstop>customWindowSequenceButton</tabstop>
   <tabstop>windowSequenceEdit</tabstop>
   <tabstop>assocAddButton</tabstop>