Merge with branch1.1

1 files changed, 48 insertions, 48 deletions

diff --git a/src/lockeddialog.h b/src/lockeddialog.h
index 5be398bc..0f3b29b0 100644
--- a/src/lockeddialog.h
+++ b/src/lockeddialog.h
@@ -17,51 +17,51 @@ You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef LOCKEDDIALOG_H

-#define LOCKEDDIALOG_H

-

-#include <QDialog>

-

-namespace Ui {

-    class LockedDialog;

-}

-

-/**

- * a small borderless dialog displayed while the Mod Organizer UI is locked

- * The dialog contains only a label and a button to force the UI to be unlocked

- * 

- * The UI gets locked while running external applications since they may modify the

- * data on which Mod Organizer works. After the UI is unlocked (manually or after the

- * external application closed) MO will refresh all of its data sources

- **/

-class LockedDialog : public QDialog

-{

-    Q_OBJECT

-

-public:

-  explicit LockedDialog(QWidget *parent = 0);

-  ~LockedDialog();

-

-  /**

-   * @brief see if the user clicked the unlock-button

-   *

-   * @return true if the user clicked the unlock button

-   **/

-  bool unlockClicked() const { return m_UnlockClicked; }

-

-  void setProcessName(const QString &name);

-

-protected:

-

-  virtual void resizeEvent(QResizeEvent *event);

-

-private slots:

-

-  void on_unlockButton_clicked();

-

-private:

-  Ui::LockedDialog *ui;

-  bool m_UnlockClicked;

-};

-

-#endif // LOCKEDDIALOG_H

+#ifndef LOCKEDDIALOG_H
+#define LOCKEDDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+    class LockedDialog;
+}
+
+/**
+ * a small borderless dialog displayed while the Mod Organizer UI is locked
+ * The dialog contains only a label and a button to force the UI to be unlocked
+ * 
+ * The UI gets locked while running external applications since they may modify the
+ * data on which Mod Organizer works. After the UI is unlocked (manually or after the
+ * external application closed) MO will refresh all of its data sources
+ **/
+class LockedDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+  explicit LockedDialog(QWidget *parent = 0, const QString &text = "", bool unlockButton = true);
+  ~LockedDialog();
+
+  /**
+   * @brief see if the user clicked the unlock-button
+   *
+   * @return true if the user clicked the unlock button
+   **/
+  bool unlockClicked() const { return m_UnlockClicked; }
+
+  void setProcessName(const QString &name);
+
+protected:
+
+  virtual void resizeEvent(QResizeEvent *event);
+
+private slots:
+
+  void on_unlockButton_clicked();
+
+private:
+  Ui::LockedDialog *ui;
+  bool m_UnlockClicked;
+};
+
+#endif // LOCKEDDIALOG_H