Commit Graph

234 Commits

Author SHA1 Message Date
Thomas Hartmann eb19b84f5c WelcomePage: do not allow editing of default session
Being able to edit the default session does not make sense.


Change-Id: I45deee777827e9586ab2c23474f3ad0423f17f55
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-26 11:19:40 +02:00
Eike Ziller 7931159c09 Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/libs/qmljsdebugclient/qmlprofilereventlist.cpp
	src/libs/zeroconf/servicebrowser.cpp
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qmlprofilerengine.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp
	src/plugins/qmlprofiler/qmlprofilertraceview.h
	src/plugins/qmlprofiler/tracewindow.cpp

Change-Id: Ib5e7579efffe74f2bf6871690d1e398e1062f986
2012-03-21 09:57:56 +01:00
Alessandro Portale f0b122e3d2 Welcome screen: Turn the "Icon plus link" into a component
Change-Id: I65006bbd0c0b26f84eba2c38e511c53ae23753da
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-03-19 09:14:00 +01:00
Yuchen Deng d2d9a80b1d WelcomeScreen: Improve vertical lines showing
Use lighter color of vertical line, from the overall look is more
consistent.
At least, the current design did not feel very comfortable.

Change-Id: I92d1513d475b1aadfc5ac58fc33f4ba84e6a8478
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-03-16 11:52:54 +01:00
Eike Ziller e5e3f91ed2 Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/libs/qmljsdebugclient/qmlprofilereventlist.cpp

Change-Id: Ic6251d47ecd032ea1db4fc58dc80e19b6e6cf23d
2012-03-15 15:01:54 +01:00
Thomas Hartmann 51bfb7e351 WelcomePage: fix scrolling of sessions
Change-Id: I8a30d94040fa6fffe318c98782120123093d6666
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-15 13:08:48 +01:00
Thomas Hartmann 1b50cdce5c WelcomePage: turning widgets into a proper plugin
Change-Id: Ifffaa8f848777f6961b49dff048672b194570fff
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-15 12:56:34 +01:00
Thomas Hartmann 8beb42dec6 WelcomePage: adjust spacings
Change-Id: I920d763524f77b20518d26a46a11a3a3b0a131bd
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-15 12:56:22 +01:00
Eike Ziller 63f0c0a62f Merge remote-tracking branch 'origin/2.5'
Conflicts:
	qtcreator.pri

Change-Id: Ic24b756b41d2a13f3d696dee69553d2c3241ab95
2012-03-14 09:33:25 +01:00
Thomas Hartmann 037a229d64 WelcomePage: adjusting icons
Change-Id: I5f13fb38d7c647f7fed8a84fb0719651786483ca
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-13 11:52:34 +01:00
Thomas Hartmann 5c93baca45 WelcomePage: fix vertical "Scrollbar" lines
The lines are hidden now if the scrollbar gets visible. This avoids
visual artifacts depending on styling.

Change-Id: I2bce04273385c05c545fff3d5f1a8f0c898abdb9
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-12 16:14:00 +01:00
Eike Ziller 2ba3f6c929 Merge remote-tracking branch 'origin/2.5' 2012-03-12 15:10:32 +01:00
Thomas Hartmann b8ad123b5b WeclomePage: unifying look of sessions and recent projects
This is a slight change to spacing and also adds the subtle hover effects
to recent projects.

Change-Id: I3dce69033e782c6f87ef1ef8b251d944bcf9be6e
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-12 14:00:59 +01:00
Daniel Teske 6f45ec97f8 Automatically configure examples opened from the welcome page.
Each example can now provide a list of platforms by the examples manifest
.xml file. This list can control the target configuration of the example
when it is opened in the welcomepage.

Change-Id: I893230fd2850b7a1272db71a7f589044d52041d1
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-09 15:28:28 +01:00
Thomas Hartmann 2e2e165f3e WelcomePage: add icons to session inplace editor
Change-Id: I4f2b9f55f6738b379610685f58526ee21b0701f0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-03-08 10:36:08 +01:00
Thomas Hartmann 47e4caa386 WelcomePage: crash fix for windows
Change-Id: I77d69bdd11487388163723dffa56a6690ac14240
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-03-08 10:15:34 +01:00
Thomas Hartmann deeb8fe351 WelcomePlugin: java script fix
missing var

Change-Id: I3bce04272285c07c545fee3d5f1a8f0c898abdb7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-03-07 18:04:10 +01:00
Thomas Hartmann e2aebba8ed WelcomePage: proper line wrapping for paths in sessions
Since qml can only wrap at spaces we have to wrap at file separators
manually.

Change-Id: Id853ab140a46e06fff3abf777ab3b234e749e17c
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-07 17:51:30 +01:00
Thomas Hartmann 5e36568628 WelcomePage: fix scrollbars of grid view
Task-number: QTCREATORBUG-7012


Change-Id: I015db6f3ccff4a8b28b59f7eab530a07464e771d
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-06 12:48:43 +01:00
Alessandro Portale 9f05e6495d Crisper info icon
Change-Id: I4e0923034e40f94ac84f50617a0719895318a6ba
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-03-06 12:42:13 +01:00
Thomas Hartmann b4d79d2d25 WelcomePage: fix mouse area for sessions
Change-Id: I805ee99e075fe4873ce98ae5683729e806010ff8
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-03-06 09:13:01 +01:00
Thomas Hartmann aefb67e618 WelcomePage: replace context panel for session editing
This patch replaces the context panel by extendable list items.
This does not create any visual cluttering on hover and is more
user friendly.

Change-Id: Ib9b283f6972ea7e9ae3dc3155d0c3f1c8fe2e806
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-02 16:40:48 +01:00
Orgad Shaneh 014862b773 Rename Recent Sessions -> Sessions
All available sessions are displayed, not only recent

Change-Id: Ib2bc419526135eff414f7c997b2bf603424aa452
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-03-02 11:53:59 +01:00
Thomas Hartmann 9bc042e09f WelcomePage: Add tooltip for sessions
The tooltip allows renaming, cloning and deleting and shows
included projects.

The following method was added to Session:

QStringList projectsForSessionName(const QString &session) const;

I moved the SessionNameInputDialog into the header to reuse it.

I added new roles to SessionModel (ProjectsPathRole, ProjectsDisplayRole).
The following slots were added to SessionModel to expose the backend
functionality:

void cloneSession(const QString &session);
void deleteSession(const QString &session);
void renameSession(const QString &session);

Change-Id: I0182a26dc63b4f051ea948756decd5413c832c60
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-23 18:14:56 +01:00
Thomas Hartmann cf32f17777 WelcomePage: proper eliding for project paths
Change-Id: I198e3d16466663a2f714ef44f3d441d1d1395801
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-10 17:34:26 +01:00
Thomas Hartmann b64d103bfb WelcomePage: adjust scrolling in recent sessions
The avoid cutting of half an item vertically we snap
instead to full items.

Change-Id: Iaeda1e6ef010804a0f1df4b94057eefea4d75830
Reviewed-by: Virva Auvinen <virva.auvinen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-08 13:48:22 +01:00
Thomas Hartmann d74d03259b WelcomePage: use native Utils::StyledBar instead of border image
The native StyledBar follows the color theme.

Change-Id: I69983439e299376fe116984ca672ea34ecbceb87
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-08 13:47:58 +01:00
Thomas Hartmann 6a29d450cb WelcomePage: pixel perfection on Mac
We have to vertical align the text.

Change-Id: I96fa4f410c629d3b7beb4b9a19cbda3e54a63058
Reviewed-by: Virva Auvinen <virva.auvinen@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-08 10:03:22 +01:00
Thomas Hartmann b69217940a WelcomePage: adjusting font size and spacing
This patch adjusts the font size and spacing in the delegate
for the examples and tutorials view.

Virva Auvinen (Designer)

Change-Id: Ieec54d02effdfb6d9f3da9f6ad08fe4c3a6ff192
Reviewed-by: Virva Auvinen <virva.auvinen@nokia.com>
2012-02-07 17:04:26 +01:00
Thomas Hartmann e19505b71e WelcomePage: remove semi transparent rectangle in views
Requested by Virva Auvinen (Designer)

Change-Id: Iab7f2d3382a6cadd3f186583d9da51689cd6a0e8
Reviewed-by: Virva Auvinen <virva.auvinen@nokia.com>
2012-02-07 17:04:07 +01:00
hjk 2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
Thomas Hartmann a8890669b0 WelcomePage: layout fixes for the develop page
Change-Id: I5feacf276b4cfb781cda0e737c1f52d0057db298
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-01-23 13:30:44 +01:00
Thomas Hartmann 18dfe87ec9 Welcomepage: crashfix see QTBUG-23445
In combination with commit
fe068869b9
this seems to fix the issue.

Task-Number: QTCREATORBUG-6803

Change-Id: I845e18ff3abb55468b1afdae9785f74a4b522356
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-01-17 12:44:27 +01:00
Yuchen Deng 32d139f801 WelcomePage: Fix function parameters
Change-Id: I2dc2891380e1dbe0326abd3965c74cc94baf948f
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-01-16 12:12:01 +01:00
Thomas Hartmann af290c14e8 WelcomeScreen: layoutfix for different languages
The x offset was hardcoded. Using anchors instead.

Change-Id: Ie033395d7083dad3aa01e2f7367f3834389213f6
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-01-11 17:38:31 +01:00
Thomas Hartmann 085d0a1956 WelcomePage: fix platform glitch in tab bar
depending on the platform the tab was 1 or 2 pixels of.

Change-Id: I0f6cb3a629c4b5d586f88eefcab7c8de9ac88220
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-01-11 16:56:20 +01:00
Thomas Hartmann 37c8060132 WelcomeScreen: avoding too much white
This adds a light gray background and some vertical lines.

Task-number: QTCREATORBUG-6701
Change-Id: Icc29fd73890648b493d1eb52ab8281e5afbf7f68
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-01-03 14:29:12 +01:00
Alessandro Portale 7694cf65a8 WelcomeScreen: updating the getting started screen
New icons and fixing some glitches.
The new icons file sizes were optimized with pngout.

Change-Id: Ia98791260c3fbee776db3db0fb3a449bcc009b20
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-01-03 13:16:13 +01:00
Thomas Hartmann 3807b0fae5 WelcomePage: optimizing GridView
Instead of placing the "complete" GridView to a ScrollArea we now add
a ScrollBar to the GridView. This means that only visible delegates are
instanciated and the GridView gets alot faster.

Change-Id: I63b8593b260acd4d3a786a99c7dd58507c12e221
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-12-08 11:23:23 +01:00
Thomas Hartmann 5ff9d60433 Welcome Page: logo fix
Aligning the font and position.

Change-Id: Id8b3116dd2c8585365dd7a24e6f2ddcf8c63fb46
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-12-05 12:45:36 +01:00
Thomas Hartmann ed63ac274e WelcomePage: adding typical creator bar
Adding the typical creator bar at the top

Change-Id: I80e4190e007a960543f0ae0c4aa42fd9737d1fb3
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-12-01 09:48:37 +01:00
Alessandro Portale 6c36a2a9ad Cropping the examples screen shots to "Areas of interest".
The cropping coordinates are stored in a file
images_areasofinterest.xml. A tool to create/maintain the cropping
coordinates is included in this patch.

Then changes to Delegate.qml prevent QML from scaling the image.
If scaling is needed it is now the job of the Image provider.
dropshadow.png had to be adjusted because the border had different
widths and heights.

Change-Id: Ib25db896d40eeec0e0a373c971931dc5cabf3cbe
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-11-25 17:12:58 +01:00
Thomas Hartmann f7fc5820c5 WelcomePage: add better thumbnails for tutorials
Adding customized thumbnails for tutorials

Change-Id: Ide75daadff24180f7d3274c5a6b08bbce630281c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-11-25 11:58:34 +01:00
Thomas Hartmann 5a8c968d6c WelcomePage: fix for the logo
Using a proper logo now

Change-Id: I57da3e046e7b662d034632a530ab9aaf6ec6eafe
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-25 11:58:04 +01:00
Thomas Hartmann 2fc8c10b8f new design of the welcomepage
Design done by: Virva Auvinen

Change-Id: I94ca75f50d3924088bc7d9be6cc884975480bcac
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-23 13:57:13 +01:00
Eike Ziller 144aaa8b9b Fix irritating shadow.
Task-number: QTCREATORBUG-6444

Change-Id: Ife3fd7f469be6d4d937d75d782c13e06eea9d0a7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-11-08 15:27:54 +01:00
hjk dfcb0529fd welcome: remove unused RatingBar, ExampleLineEdit and TagBrowser
Change-Id: Ia254ca5147f9d1976f3e19311a1aa31c2b151d00
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-04 12:26:19 +01:00
hjk dea23cd73e welcomescreen: remove bottom gradient in develop.qml
Change-Id: Ia22e503a750c5475466579a3101ebc2adb13416d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-11-03 14:51:24 +01:00
hjk 31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
Thomas Hartmann 0c3f3c009a WelcomePage: layout fix
Fixes a regression introduced in
44928237af

Task-number: QTCREATORBUG-6444
Change-Id: Ie92ba0be9e888e065aaa52aac41bf3338bf8aeb6
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-02 17:08:03 +01:00