Merge with branch1.1

1 files changed, 64 insertions, 59 deletions

diff --git a/src/selectiondialog.cpp b/src/selectiondialog.cpp
index dbc10791..902b4d9c 100644
--- a/src/selectiondialog.cpp
+++ b/src/selectiondialog.cpp
@@ -17,62 +17,67 @@ You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "selectiondialog.h"

-#include "ui_selectiondialog.h"

-

-#include <QCommandLinkButton>

-

-SelectionDialog::SelectionDialog(const QString &description, QWidget *parent)

-  : QDialog(parent), ui(new Ui::SelectionDialog), m_Choice(NULL), m_ValidateByData(false)

-{

-  ui->setupUi(this);

-

-  ui->descriptionLabel->setText(description);

-}

-

-SelectionDialog::~SelectionDialog()

-{

-  delete ui;

-}

-

-

-void SelectionDialog::addChoice(const QString &buttonText, const QString &description, const QVariant &data)

-{

-  QCommandLinkButton *button = new QCommandLinkButton(buttonText, description, ui->buttonBox);

-  button->setProperty("data", data);

-  ui->buttonBox->addButton(button, QDialogButtonBox::AcceptRole);

-  if (data.isValid()) m_ValidateByData = true;

-}

-

-

-QVariant SelectionDialog::getChoiceData()

-{

-  return m_Choice->property("data");

-}

-

-

-QString SelectionDialog::getChoiceString()

-{

-  if ((m_Choice == NULL) ||

-      (m_ValidateByData && !m_Choice->property("data").isValid())) {

-    return QString();

-  } else {

-    return m_Choice->text();

-  }

-}

-

-

-void SelectionDialog::on_buttonBox_clicked(QAbstractButton *button)

-{

-  m_Choice = button;

-  if (!m_ValidateByData || m_Choice->property("data").isValid()) {

-    this->accept();

-  } else {

-    this->reject();

-  }

-}

-

-void SelectionDialog::on_cancelButton_clicked()

-{

-  this->reject();

-}

+#include "selectiondialog.h"
+#include "ui_selectiondialog.h"
+
+#include <QCommandLinkButton>
+
+SelectionDialog::SelectionDialog(const QString &description, QWidget *parent)
+  : QDialog(parent), ui(new Ui::SelectionDialog), m_Choice(NULL), m_ValidateByData(false)
+{
+  ui->setupUi(this);
+
+  ui->descriptionLabel->setText(description);
+}
+
+SelectionDialog::~SelectionDialog()
+{
+  delete ui;
+}
+
+
+void SelectionDialog::addChoice(const QString &buttonText, const QString &description, const QVariant &data)
+{
+  QCommandLinkButton *button = new QCommandLinkButton(buttonText, description, ui->buttonBox);
+  button->setProperty("data", data);
+  ui->buttonBox->addButton(button, QDialogButtonBox::AcceptRole);
+  if (data.isValid()) m_ValidateByData = true;
+}
+
+int SelectionDialog::numChoices() const
+{
+  return ui->buttonBox->findChildren<QCommandLinkButton*>(QString()).count();
+}
+
+
+QVariant SelectionDialog::getChoiceData()
+{
+  return m_Choice->property("data");
+}
+
+
+QString SelectionDialog::getChoiceString()
+{
+  if ((m_Choice == NULL) ||
+      (m_ValidateByData && !m_Choice->property("data").isValid())) {
+    return QString();
+  } else {
+    return m_Choice->text();
+  }
+}
+
+
+void SelectionDialog::on_buttonBox_clicked(QAbstractButton *button)
+{
+  m_Choice = button;
+  if (!m_ValidateByData || m_Choice->property("data").isValid()) {
+    this->accept();
+  } else {
+    this->reject();
+  }
+}
+
+void SelectionDialog::on_cancelButton_clicked()
+{
+  this->reject();
+}