Commit 66868d47 authored by dt's avatar dt

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

parents 09533783 9789ee4a
......@@ -2529,7 +2529,11 @@ void *qDumpObjectData440(
int protocolVersion,
int token,
void *data,
#ifdef Q_CC_MSVC // CDB cannot handle boolean parameters
int dumpChildren,
#else
bool dumpChildren,
#endif
int extraInt0,
int extraInt1,
int extraInt2,
......
<RCC>
<qresource prefix="/core" >
<file>html/images/bg_site_header_dark_grey.png</file>
<file>html/images/body_bg_circles_bottom_right.png</file>
<file>html/images/body_bg_gradient.png</file>
<file>html/images/btn_feedback.png</file>
<file>html/images/btn_feedback_hover.png</file>
<file>html/images/btn_getting_started.png</file>
<file>html/images/btn_getting_started_hover.png</file>
<file>html/images/btn_restore_session.png</file>
<file>html/images/btn_restore_session_hover.png</file>
<file>html/images/feedback-bar-background.png</file>
<file>html/images/feedback-text.png</file>
<file>html/images/list_bullet_arrow.png</file>
<file>html/images/mode_Project.png</file>
<file>html/images/nokia_logo.png</file>
<file>html/images/product_logo.png</file>
<file>html/images/qt_logo.png</file>
<file>html/images/rc_bottom_left.png</file>
<file>html/images/rc_bottom_mid.png</file>
<file>html/images/rc_bottom_right.png</file>
<file>html/images/rc_mid_left.png</file>
<file>html/images/rc_mid_mid.png</file>
<file>html/images/rc_mid_right.png</file>
<file>html/images/rc_top_left.png</file>
<file>html/images/rc_top_mid.png</file>
<file>html/images/rc_top_right.png</file>
<file>html/qt.css</file>
<file>html/recent_projects.html</file>
<file>html/recent_sessions.html</file>
<file>html/welcome.html</file>
<file>images/clean_pane_small.png</file>
<file>images/clear.png</file>
<file>images/closebutton.png</file>
......@@ -73,5 +44,19 @@
<file>images/unlocked.png</file>
<file>images/extension.png</file>
<file>images/darkclosebutton.png</file>
<file>images/welcomemode/btn_feedback.png</file>
<file>images/welcomemode/btn_feedback_hover.png</file>
<file>images/welcomemode/btn_getting_started.png</file>
<file>images/welcomemode/btn_getting_started_hover.png</file>
<file>images/welcomemode/btn_restore_session.png</file>
<file>images/welcomemode/btn_restore_session_hover.png</file>
<file>images/welcomemode/feedback-bar-background.png</file>
<file>images/welcomemode/feedback-text.png</file>
<file>images/welcomemode/list_bullet_arrow.png</file>
<file>images/welcomemode/mode_project.png</file>
<file>images/welcomemode/nokia_logo.png</file>
<file>images/welcomemode/product_logo.png</file>
<file>images/welcomemode/qt_logo.png</file>
<file>images/welcomemode/rc_combined.png</file>
</qresource>
</RCC>
......@@ -38,10 +38,6 @@
#include <extensionsystem/pluginmanager.h>
#include <QtCore/QtPlugin>
#if !defined(QT_NO_WEBKIT)
#include <QtGui/QApplication>
#include <QtWebKit/QWebSettings>
#endif
using namespace Core::Internal;
......@@ -72,12 +68,6 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
Q_UNUSED(arguments);
const bool success = m_mainWindow->init(errorMessage);
if (success) {
#if !defined(QT_NO_WEBKIT)
QWebSettings *webSettings = QWebSettings::globalSettings();
const QFont applicationFont = QApplication::font();
webSettings->setFontFamily(QWebSettings::StandardFont, applicationFont.family());
//webSettings->setFontSize(QWebSettings::DefaultFontSize, applicationFont.pointSize());
#endif
m_welcomeMode = new WelcomeMode;
addObject(m_welcomeMode);
......
......@@ -75,6 +75,7 @@ SOURCES += mainwindow.cpp \
icore.cpp
HEADERS += mainwindow.h \
welcomemode.h \
welcomemode_p.h \
editmode.h \
tabpositionindicator.h \
fancyactionbar.h \
......@@ -155,14 +156,11 @@ FORMS += dialogs/newdialog.ui \
dialogs/saveitemsdialog.ui \
dialogs/openwithdialog.ui \
editormanager/openeditorsview.ui \
generalsettings.ui
generalsettings.ui \
welcomemode.ui
RESOURCES += core.qrc \
fancyactionbar.qrc
contains(QT_CONFIG, webkit) {
QT += webkit
}
linux-* {
images.files = images/qtcreator_logo_*.png
images.path = /share/pixmaps
......
/**************************************
Nokia, QT Software CSS - IDE Startseite
**************************************/
/**************************************
Reset
**************************************/
* {
vertical-align: baseline;
font-weight: inherit;
font-family: inherit;
font-style: inherit;
padding: 0;
margin: 0;
}
/*image link*/
a.img_link:link {text-decoration:none;}
a.img_link:visited {text-decoration:none}
a.img_link:active {text-decoration:none}
a.img_link:hover {text-decoration:none}
/*regular link*/
a:link {color:#5e5e5e; text-decoration:none;}
a:visited {color:#5e5e5e; text-decoration:none}
a:active {color:#5e5e5e; text-decoration:none}
a:hover {color:#5e5e5e; text-decoration:underline}
p{
font-size:9pt;
}
strong{
font-weight: bold;
}
em {
font-style: italic;
}
ul{
list-style-type: none;
margin:0px 0px;
padding:15px 0px;
}
li {
background:url(images/list_bullet_arrow.png) top left no-repeat;
font-size:9pt;
padding:1px 0px 0px 22px;
margin:0px 0px 15px 0px;
}
li:last-child{
margin:0px;
}
img {
border: 0 none;
}
/*Welcome Headline*/
h1{
font-size:2em;
font-weight:normal;
padding-bottom:22px;
color:#4d4d4d;
}
/*Headlines Recent...*/
h2{
font-size:18px;
font-weight:normal;
color:#7c92a1;
border-bottom:1px solid #a6b5c1;
padding:5px 0px 10px 0px;
}
.clear_float{
clear:both;
}
.clear_left{
clear:left;
}
.clear_right{
clear:right;
}
/**************************************
HTML / BODY
**************************************/
html, body {
font-family: Arial, Trebuchet, Lucida, sans-serif;
color: #5e5e5e;
background:#d7d7d7 url(images/body_bg_gradient.png) top left repeat-x;
height:100%;
}
/*Platzierung der Circles unten rechts*/
.global_container {
position:relative;
width:100%;
min-height:100%;
min-width:550px;
}
.footer {
position:relative;
list-style-type:none;
margin:0;
padding:0;
width:100%;
height:55px;
margin-top:-86px;
}
.feedback-bar {
position:relative;
list-style-type:none;
margin:0;
padding:0;
height: 31px;
width: 100%;
margin-top: 0px;
background-image: url(images/feedback-bar-background.png);
}
a.btn_feedback {
background-image:url(images/btn_feedback.png);
width:102px;
height:26px;
display:block;
float:left;
}
a.btn_feedback:hover {
background-image:url(images/btn_feedback_hover.png)
}
.left-logo {
float:left;
background:none;
margin:0;
padding:0;
padding-left: 15px;
content:url(images/qt_logo.png);
}
.right-logo {
float:right;
background:none;
margin: 0;
margin-right: 15px;
margin-top: 25px;
padding:0;
content:url(images/nokia_logo.png);
}
/**************************************
Site Header
**************************************/
.site_header{
height:21px;
background:#686868 url(images/bg_site_header_dark_grey.png) top left repeat-x;
}
.site_header p{
padding:3px 10px;
color:#fff;
}
/**************************************
Content
**************************************/
.content_container{
margin:0px auto;
/*CUSTOMIZE WIDTH*/
width:600px;
}
/**************************************
Layout TOP - Logo und Welcome Text
**************************************/
.layout_top{
padding-top:50px;
min-height:250px;
}
/*Product Logo*/
.layout_top .product_logo{
float:left;
width:210px;
}
.layout_top .product_logo img{
}
/*Welcome Text*/
.layout_top .welcome_text{
margin-left:210px;
padding-top:20px;
padding-bottom:30px;
}
.layout_top .welcome_text p{
font-size:9pt;
line-height:180%;
}
.layout_top .welcome_text .get_started_container{
border-top:1px solid #a8a8a8;
margin-top:20px;
padding:10px 0px;
}
/*Getting started Button inlusive CSS HOVER*/
a.btn_getting_started{
float:right;
display:block;
background-image:url(images/btn_getting_started.png);
width:133px;
height:29px;
}
a.btn_getting_started:hover{
background-image:url(images/btn_getting_started_hover.png)
};
/**************************************
Layout BOTTOM - Recent Projects und Recent Sessions
**************************************/
/*ROUNDED CORNER BOX - fluid layout compatible*/
.rc_box{}
.rc_box .top{height:8px;}
.rc_box .top .left{float:left; height:8px; width:8px; background:url(images/rc_top_left.png) top left no-repeat;}
.rc_box .top .mid{margin-left:8px; margin-right:8px; height:8px; background:url(images/rc_top_mid.png) top left repeat-x;}
.rc_box .top .right{float:right; height:8px; width:8px; background:url(images/rc_top_right.png) top left no-repeat;}
.rc_box .mid{}
.rc_box .mid .mid{padding:0px 20px 0px 10px; min-height:203px; background:#e6e6e6 url(images/rc_mid_mid.png) top left repeat-x; border-left:1px solid #a6b5c1; border-right:1px solid #a6b5c1;}
.rc_box .icon{
width:35px;
float:left;
padding-top:3px;
}
.rc_box .box_content{
margin-left:35px;
}
.rc_box .bottom{height:8px;}
.rc_box .bottom .left{float:left; height:8px; width:8px; background:url(images/rc_bottom_left.png) top left no-repeat;}
.rc_box .bottom .mid{margin-left:8px; margin-right:8px; height:8px; background:url(images/rc_bottom_mid.png) top left repeat-x;}
.rc_box .bottom .right{float:right; height:8px; width:8px; background:url(images/rc_bottom_right.png) top left no-repeat;}
/*Layout Bottom*/
.layout_bottom{ padding:10px 0px 50px 0px; }
/*Recent Projects*/
.layout_bottom .rec_proj_container{
margin-left:50%;
}
.layout_bottom .rec_proj_container .rec_proj_box{
margin-left:10px;
}
/*Recent Sessions*/
.layout_bottom .rec_sess_container{
width:50%;
float:left;
}
.layout_bottom .rec_sess_container .rec_sess_box{
margin-right:10px;
}
/*Restore Session Button inlusive CSS HOVER*/
a.restore_session{
float:right;
display:block;
background-image:url(images/btn_restore_session.png);
width:137px;
height:27px;
}
a.restore_session:hover{
background-image:url(images/btn_restore_session_hover.png)
};
<div class="rc_box rec_proj_container">
<div class="rec_proj_box">
<!-- top -->
<div class="top">
<div class="left"></div>
<div class="right"></div>
<div class="mid"></div>
</div>
<!-- mid -->
<div class="mid">
<div class="mid">
<div class="icon">
<img src="images/mode_Project.png"></img>
</div>
<div class="box_content">
<h2>Recent Projects</h2>
<ul>
<!-- RECENT PROJECTS LIST -->
<!--<li><p><a href="#">Project 1</a></p></li>
<li><p><a href="#">Project 2</a></p></li>
<li><p><a href="#">Project 3</a></p></li>
<li><p><a href="#">Project 4</a></p></li>
<li><p><a href="#">Project 5</a></p></li>-->
</ul>
</div>
</div>
</div>
<!-- bottom -->
<div class="bottom">
<div class="left"></div>
<div class="right"></div>
<div class="mid"></div>
</div>
</div>
</div>
<div class="rc_box rec_sess_container">
<div class="rec_sess_box">
<!-- top -->
<div class="top">
<div class="left"></div>
<div class="right"></div>
<div class="mid"></div>
</div>
<!-- mid -->
<div class="mid">
<div class="mid">
<div class="icon">
<img src="images/mode_Project.png"></img>
</div>
<div class="box_content">
<h2>Recent Sessions</h2>
<ul>
<!-- RECENT SESSIONS LIST -->
<!--<li><p><a href="#">Session 1</a></p></li>
<li><p><a href="#">Session 2</a></p></li>
<li><p><a href="#">Session 3</a></p></li>
<li><p><a href="#">Session 4</a></p></li>-->
</ul>
<a class="restore_session img_link" href="gh-session:LAST_SESSION">&nbsp;</a>
<div class="clear_right"></div>
</div>
</div>
</div>
<!-- bottom -->
<div class="bottom">
<div class="left"></div>
<div class="right"></div>
<div class="mid"></div>
</div>
</div>
</div>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Nokia, Qt Software</title>
<!--<meta name="expires" content="0">-->
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<link rel="stylesheet" type="text/css" href="qt.css">
<script type="text/javascript">
var preloadImg01 = new Image();
preloadImg01.src = "images/btn_getting_started_hover.png";
var preloadImg02 = new Image();
preloadImg02.src = "images/btn_restore_session_hover.png";
var preloadImg03 = new Image();
preloadImg03.src = "images/btn_feedback_hover.png";
</script>
</head>