Merge with branch1.1

1 files changed, 56 insertions, 48 deletions

diff --git a/src/lockeddialog.cpp b/src/lockeddialog.cpp
index 4c19c615..065d9270 100644
--- a/src/lockeddialog.cpp
+++ b/src/lockeddialog.cpp
@@ -17,51 +17,59 @@ 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 "lockeddialog.h"

-#include "ui_lockeddialog.h"

-#include <QResizeEvent>

-

-

-LockedDialog::LockedDialog(QWidget *parent) :

-    QDialog(parent),

-  ui(new Ui::LockedDialog), m_UnlockClicked(false)

-{

-  ui->setupUi(this);

-

-  this->setWindowFlags(this->windowFlags() | Qt::ToolTip | Qt::FramelessWindowHint);

-

-  if (parent != NULL) {

-    QPoint position = parent->mapToGlobal(QPoint(parent->width() / 2, parent->height() / 2));

-    position.rx() -= this->width() / 2;

-    position.ry() -= this->height() / 2;

-    move(position);

-  }

-}

-

-LockedDialog::~LockedDialog()

-{

-    delete ui;

-}

-

-

-void LockedDialog::setProcessName(const QString &name)

-{

-  ui->processLabel->setText(name);

-}

-

-

-void LockedDialog::resizeEvent(QResizeEvent *event)

-{

-  QWidget *par = parentWidget();

-  if (par != NULL) {

-    QPoint position = par->mapToGlobal(QPoint(par->width() / 2, par->height() / 2));

-    position.rx() -= event->size().width() / 2;

-    position.ry() -= event->size().height() / 2;

-    move(position);

-  }

-}

-

-void LockedDialog::on_unlockButton_clicked()

-{

-  m_UnlockClicked = true;

-}

+#include "lockeddialog.h"
+#include "ui_lockeddialog.h"
+#include <QResizeEvent>
+
+
+LockedDialog::LockedDialog(QWidget *parent, const QString &text, bool unlockButton)
+  : QDialog(parent)
+  , ui(new Ui::LockedDialog)
+  , m_UnlockClicked(false)
+{
+  ui->setupUi(this);
+
+  this->setWindowFlags(this->windowFlags() | Qt::ToolTip | Qt::FramelessWindowHint);
+
+  if (parent != NULL) {
+    QPoint position = parent->mapToGlobal(QPoint(parent->width() / 2, parent->height() / 2));
+    position.rx() -= this->width() / 2;
+    position.ry() -= this->height() / 2;
+    move(position);
+  }
+
+  if (text.length() > 0) {
+    ui->label->setText(text);
+  }
+  if (!unlockButton) {
+    ui->unlockButton->hide();
+  }
+}
+
+LockedDialog::~LockedDialog()
+{
+    delete ui;
+}
+
+
+void LockedDialog::setProcessName(const QString &name)
+{
+  ui->processLabel->setText(name);
+}
+
+
+void LockedDialog::resizeEvent(QResizeEvent *event)
+{
+  QWidget *par = parentWidget();
+  if (par != NULL) {
+    QPoint position = par->mapToGlobal(QPoint(par->width() / 2, par->height() / 2));
+    position.rx() -= event->size().width() / 2;
+    position.ry() -= event->size().height() / 2;
+    move(position);
+  }
+}
+
+void LockedDialog::on_unlockButton_clicked()
+{
+  m_UnlockClicked = true;
+}