Merge with branch1.2

1 files changed, 4 insertions, 1 deletions

diff --git a/src/selectiondialog.h b/src/selectiondialog.h
index fe148859..43ba9767 100644
--- a/src/selectiondialog.h
+++ b/src/selectiondialog.h
@@ -33,7 +33,7 @@ class SelectionDialog : public QDialog
   

 public:

 

-  explicit SelectionDialog(const QString &description, QWidget *parent = 0);

+  explicit SelectionDialog(const QString &description, QWidget *parent = 0, const QSize &iconSize = QSize());

 

   ~SelectionDialog();

 

@@ -46,6 +46,8 @@ public:
    */

   void addChoice(const QString &buttonText, const QString &description, const QVariant &data);

 

+  void addChoice(const QIcon &icon, const QString &buttonText, const QString &description, const QVariant &data);

+

   int numChoices() const;

 

   QVariant getChoiceData();

@@ -62,6 +64,7 @@ private:
   Ui::SelectionDialog *ui;

   QAbstractButton *m_Choice;

   bool m_ValidateByData;

+  QSize m_IconSize;

 

 };