1 files changed, 16 insertions, 1 deletions
diff --git a/Swift/QtUI/QtHighlightEditor.cpp b/Swift/QtUI/QtHighlightEditor.cpp
index df9f6b2..c6e4319 100644
--- a/Swift/QtUI/QtHighlightEditor.cpp
+++ b/Swift/QtUI/QtHighlightEditor.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -38,6 +38,7 @@ QtHighlightEditor::QtHighlightEditor(QtSettingsProvider* settings, QWidget* pare
 	connect(ui_.buttonBox->button(QDialogButtonBox::Apply), SIGNAL(clicked()), SLOT(onApplyButtonClick()));
 	connect(ui_.buttonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), SLOT(onCancelButtonClick()));
 	connect(ui_.buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), SLOT(onOkButtonClick()));
+	connect(ui_.buttonBox->button(QDialogButtonBox::RestoreDefaults), SIGNAL(clicked()), SLOT(onResetToDefaultRulesClicked()));
 
 	connect(ui_.noColorRadio, SIGNAL(clicked()), SLOT(colorOtherSelect()));
 	connect(ui_.customColorRadio, SIGNAL(clicked()), SLOT(colorCustomSelect()));
@@ -122,6 +123,8 @@ void QtHighlightEditor::show()
 		selectRow(0);
 	}
 
+	updateResetToDefaultRulesVisibility();
+
 	/* prepare default states */
 	widgetClick();
 
@@ -246,6 +249,8 @@ void QtHighlightEditor::onCurrentRowChanged(int currentRow)
 	}
 
 	previousRow_ = currentRow;
+
+	updateResetToDefaultRulesVisibility();
 }
 
 void QtHighlightEditor::onApplyButtonClick()
@@ -350,6 +355,12 @@ void QtHighlightEditor::selectSoundFile()
 	ui_.soundFile->setText(path);
 }
 
+void QtHighlightEditor::onResetToDefaultRulesClicked() {
+	highlightManager_->resetToDefaultRulesList();
+	populateList();
+	updateResetToDefaultRulesVisibility();
+}
+
 void QtHighlightEditor::handleOnUserSelected(const Contact::ref& contact) {
 	/* this might seem like it should be standard behaviour for the suggesting input box, but is not desirable in all cases */
 	if (contact->jid.isValid()) {
@@ -539,4 +550,8 @@ void QtHighlightEditor::ruleToDialog(const HighlightRule& rule)
 	setChildWidgetStates();
 }
 
+void QtHighlightEditor::updateResetToDefaultRulesVisibility() {
+	ui_.buttonBox->button(QDialogButtonBox::RestoreDefaults)->setVisible(!highlightManager_->isDefaultRulesList());
+}
+
 }