Commit 10a083c1 authored by con's avatar con
Browse files

Merge branch '0.9.2-rc1'

Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp
parents f679e80c fc8762e6
......@@ -215,8 +215,20 @@
\title The Code Editor
### SCREENSHOT of the editor in action
Qt Creator's code editor is designed to aid the developer to create, edit,
and navigate code. It is fully equipped with syntax highlighting, code
completion, context sensitive help, as well as inline error indicators
while you are typing. The screenshots below show the various dialogs within
which you can configure your editor.
\table
\row
\i \inlineimage qtcreator-texteditor-general.png
\i \inlineimage qtcreator-texteditor-fonts.png
\i \inlineimage qtcreator-texteditor-completion.png
\endtable
The table below lists keyboard shortcuts supported by the code editor.
\table
\row
......@@ -230,45 +242,47 @@
To deselect, use \key{Ctrl+Shift+U}.
\row
\i Moving lines up and down
\i
\i Use \key{Ctrl+Shift+Up} and \key{Ctrl+Shift+Down}
\row
\i Completion
\i
\i Use \key{Ctrl+Space}
\row
\i Indenting Blocks
\i
\i Use \key{Ctrl+I}
\row
\i Collapse
\i Use \key{Ctrl+\<}
\row
\i Commenting or uncommenting blocks
\i Use \key{Ctrl+\/}
\row
\i Commenting or Uncommenting Blocks
\i
\i Delete a line
\i Use \key{Shift+Del}
\row
\i Switch between Header and Source
\i Switch between header file and source file
\i Use \key{F4}.
\row
\i Increasing and Decreasing Font Size
\i Increasing and decreasing font size
\i Use \key{Ctrl+Scroll Wheel}
\row
\i Follow Symbols under The Cursor
\i Follow symbols under the cursor
\i Use \key{F2} and \key{Shift+F2}. This feature works with
namespaces, classes, methods, variables, include statements,
and macros.
\endtable
More:
Collapse
Up/Down/Page Up/Page Down - hold ctrl to prevent the cursor from moving
To switch to an external editor, select \gui{Open in external editor} from
the \gui{Edit -> Advanced} menu.
\row
\i Switch to an external editor
\i Select \gui{Open in external editor} from the
\gui{Edit -> Advanced} menu.
\endtable
*/
......@@ -1416,7 +1430,7 @@
colons, dollar signs, hash marks etc. may cause difficulties. This
is because some of the tools Qt Creator uses in the background have
restrictions on the characters allowed in file and directory names.
To be on the safe side, we recomment creating projects and project
To be on the safe side, we recommend creating projects and project
items with names consisting of plain characters, numbers,
underscores, and hyphens.
......
<plugin name="BinEditor" version="0.9.2" compatVersion="0.9.2">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008 Nokia Corporation</copyright>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license>
<description>Binary editor component.</description>
<url>http://www.trolltech.com/</url>
......
<plugin name="Bookmarks" version="0.9.2" compatVersion="0.9.2">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008 Nokia Corporation</copyright>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license>
<description>Bookmarks in text editors.</description>
<url>http://www.trolltech.com/</url>
......
<plugin name="CMakeProjectManager" version="0.9.2" compatVersion="0.9.2">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008 Nokia Corporation</copyright>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>### TODO</license>
<description>CMake support</description>
<url>http://www.trolltech.com/</url>
......
<plugin name="Core" version="0.9.2" compatVersion="0.9.2">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008 Nokia Corporation</copyright>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license>
<description>The core plugin for the Qt IDE.</description>
<url>http://www.trolltech.com/</url>
......
......@@ -3,10 +3,14 @@
<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>
......
......@@ -139,8 +139,31 @@ html, body {
margin:0;
padding:0;
width:100%;
height:100px;
margin-top:-100px;
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 {
......@@ -148,13 +171,16 @@ html, body {
background:none;
margin:0;
padding:0;
padding-left: 15px;
content:url(images/qt_logo.png);
}
.right-logo {
float:right;
background:none;
margin:0;
margin: 0;
margin-right: 15px;
margin-top: 25px;
padding:0;
content:url(images/nokia_logo.png);
}
......
......@@ -14,6 +14,8 @@
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>
<body>
......@@ -73,4 +75,8 @@
<li class="right-logo"/>
<li class="left-logo"/>
</ul>
<ul class="feedback-bar">
<img src="images/feedback-text.png" alt="Help us make Qt Creator better" style="margin-left: 10px; margin-top: 3px; float: left;"/>
<a class="btn_feedback img_link" href="http://www.qtsoftware.com/forms/feedback-forms/qt-creator-user-feedback/view" style="margin-top: 3px; margin-left: 4px;">&nbsp;</a>
</ul>
</body>
<plugin name="CodePaster" version="0.9.2" compatVersion="0.9.2">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008 Nokia Corporation</copyright>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license>
<description>Codepaster plugin for pushing/fetching diff from server</description>
<url>http://www.trolltech.com/</url>
......
......@@ -124,10 +124,23 @@ void CodepasterPlugin::extensionsInitialized()
->getObject<ProjectExplorer::ProjectExplorerPlugin>();
}
QString CodepasterPlugin::serverUrl() const
{
QString url = m_settingsPage->serverUrl().toString();
if (url.startsWith("http://"))
url = url.mid(7);
if (url.endsWith('/'))
url.chop(1);
return url;
}
void CodepasterPlugin::post()
{
if (m_poster)
// FIXME: The whole m_poster thing is de facto a simple function call.
if (m_poster) {
delete m_poster;
m_poster = 0;
}
IEditor* editor = EditorManager::instance()->currentEditor();
ITextEditor* textEditor = qobject_cast<ITextEditor*>(editor);
if (!textEditor)
......@@ -171,7 +184,8 @@ void CodepasterPlugin::post()
data = view.getContent();
// Submit to codepaster
m_poster = new CustomPoster(m_settingsPage->serverUrl().toString());
m_poster = new CustomPoster(serverUrl());
// Copied from cpaster. Otherwise lineendings will screw up
if (!data.contains("\r\n")) {
......@@ -185,9 +199,11 @@ void CodepasterPlugin::post()
void CodepasterPlugin::fetch()
{
if (m_fetcher)
if (m_fetcher) {
delete m_fetcher;
m_fetcher = new CustomFetcher(m_settingsPage->serverUrl().toString());
m_fetcher = 0;
}
m_fetcher = new CustomFetcher(serverUrl());
QDialog dialog;
Ui_PasteSelectDialog ui;
......@@ -208,7 +224,7 @@ void CodepasterPlugin::fetch()
return;
delete m_fetcher;
m_fetcher = new CustomFetcher(m_settingsPage->serverUrl().toString());
m_fetcher = new CustomFetcher(serverUrl());
m_fetcher->fetch(pasteID);
}
......
......@@ -70,6 +70,7 @@ public slots:
void fetch();
private:
QString serverUrl() const;
QAction *m_postAction;
QAction *m_fetchAction;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment