From a081f081f82418ff67ae51235fb2cda5b288fb42 Mon Sep 17 00:00:00 2001
From: stojce <stojce@me.com>
Date: Mon, 9 Sep 2013 23:27:03 +0200
Subject: [PATCH] popup layot
- center position
- resizable
---
.../resources/html/interface-welcome-allsvg.html | 2 ++
interface/src/InfoView.cpp | 15 +++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/interface/resources/html/interface-welcome-allsvg.html b/interface/resources/html/interface-welcome-allsvg.html
index 6ee14b7414..0b45a4d717 100644
--- a/interface/resources/html/interface-welcome-allsvg.html
+++ b/interface/resources/html/interface-welcome-allsvg.html
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div style="width: 780px; margin: 0 auto;">
<input type="hidden" id="version" value="1" />
<svg width="780px" height="754px" viewBox="0 0 780 754" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<title>Welcome to Interface</title>
@@ -135,3 +136,4 @@
</g>
</g>
</svg>
+<div>
diff --git a/interface/src/InfoView.cpp b/interface/src/InfoView.cpp
index 007ac0aea2..66b1b57482 100644
--- a/interface/src/InfoView.cpp
+++ b/interface/src/InfoView.cpp
@@ -12,6 +12,7 @@
#include <QtWebKitWidgets/QWebFrame>
#include <QtWebKit/QWebElement>
+#include <QDesktopWidget>
#define VIEW_FIXED_WIDTH 808
#define SETTINGS_KEY_VERSION "info-version"
@@ -52,8 +53,18 @@ void InfoView::loaded(bool ok)
settings->setValue(SETTINGS_KEY_VERSION, version);
}
- this->setWindowModality(Qt::WindowModal);
- this->setFixedSize(VIEW_FIXED_WIDTH, this->height());
+ QDesktopWidget* desktop = Application::getInstance()->desktop();
+
+ int h = desktop->height();
+ this->resize(VIEW_FIXED_WIDTH, h * 0.8);
+
+ int w = desktop->width();
+ int mw = this->size().width();
+ int mh = this->size().height();
+ int cw = (w/2) - (mw/2);
+ int ch = (h/2) - (mh/2);
+ this->move(cw, ch);
+
this->setWindowTitle(this->title());
this->show();
}