| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/demos.pro
mkspecs/features/resources.prf
mkspecs/features/uic.prf
src/corelib/io/qurl.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/util/qsystemtrayicon_win.cpp
src/multimedia/audio/qaudioinput.cpp
tests/auto/qhostinfo/qhostinfo.pro
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QS60Style tries to rotate branch graphics around the x-axis, when
it is running in RtoL UI direction. This makes the "L-shaped" branch
indicators to point to too high at the item view item.
Branch indicators should be mirrored across the x-axis to make
them look fine.
Task-number: QTBUG-9844
Reviewed-by: Alessandro Portale
|
| |
| |
| |
| |
| |
| |
| | |
Fix whitespace, remove unneeded code, break very long lines to
two rows.
Reviewed-by: Alessandro Portale
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/openvg/qpaintengine_vg.cpp
src/script/bridge/qscriptqobject_p.h
tests/auto/bic/tst_bic.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QMenu and QComboBoxListView differ somewhat from their native
equivalents. First, the font is not correct. It uses a default font,
when style should polish the widgets to use "AVKON primary" font.
Second, the background graphic is not the same as on native side.
Finally, and most importantly, menu items should be lot taller when
using touch enabled S60 UI.
Task-number: QT-3295
Reviewed-by: Janne Anttila
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is due to default mask depth in QS60Style. It is currently set as
default EGray2 and then inquiried from S60SkinServer. For 3.1 devices,
skinserver does not explicitly set the mask depth (even though default
is 8bit mask), so no value is returned and default value is used.
This leads to a situation where style uses 2bit masks for 9 or 3 part
frame graphics.
Corrected by changing the default value to 8bit mask (EGray256).
Task-number: QTBUG-9927
Reviewed-by: Janne Anttila
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/script/api/qscriptengine.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Final commit for this task.
For widgets that use the highlighted list/table graphic, style now
supports pressed state for the highlight. Style filters mouse press and
release events and sets the highlight graphics to be correct based
on mouse events (i.e. touch) it gets.
Task-number: QT-2298
Reviewed-by: Alessandro Portale
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Due to incorrect initialization of CFbsBitmap, graphic frames (9-part,
or 3-part ones) are drawn with white non-transparent rect below them.
Initialization corrected.
Task-number: QT-3185
Reviewed-by: Janne Anttila
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Messageboxes are smaller than native ones.
This is due to that native ones have a lot of empty space.
To fix this, we define a new custom pixel metrics that is the minimum
height of one text line messagebox (aka AknPopUp) on the native side.
Then we ensure that the QMessageBox is at least of this height.
Additionally we do some minor styling for QMessageBox:
- the corners graphics are now as rounded as on native side
- the font is set to match the native side
- the top margin space is doubled for dialogs, which is rather good
approximation of native side
Task-number: QTBUG-4875
Reviewed-by: Janne Anttila
|
| |
| |
| |
| |
| |
| |
| | |
Commit 47902b7587d66c0941bacf08b31b8caae264f09a was missing one enum
rename in qs60style_s60.cpp
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| | |
Remove unnecessary #include, remove unnecessary integer, correct
spelling issues in comments and replace tabs with spaces.
Reviewed-by: Alessandro Portale
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is due that the size of the pixel metrics table is stored in some
object file and the file is not updated, even if we increase the table
size integer. Removing direct calls from internal methods to member
variable data[] removes the need to do whole rebuild when adding
values.
Relates to task #9247.
Task-number: QTBUG-9247
Reviewed-by: Alessandro Portale
|
|\ \ |
|
| | | |
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure.exe
mkspecs/common/symbian/symbian.conf
src/gui/graphicsview/qgraphicswidget.h
src/gui/kernel/qapplication.cpp
src/gui/text/qtextlayout.cpp
src/openvg/qpixmapdata_vg.cpp
src/s60installs/s60installs.pro
tools/runonphone/main.cpp
tools/runonphone/serenum_unix.cpp
qtextlayout.cpp fixed up together with Eskil.
Kept the configure.exe from 4.7 without recompile.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QS60Style asserts that a given index is correct when setting theme
colors. Unfortunately it uses less-and-equal-to operator ('<='), which
is incorrect. It should use less-than ('<')operator, otherwise the
assert fails when index is equal to number of items in the color
table.
Task-number: QT-3078
Reviewed-by: Alessandro Portale
|
|\ \ \
| |/ /
| | /
| |/
|/| |
Conflicts:
src/gui/styles/qs60style_s60.cpp
|
| |
| |
| |
| |
| |
| |
| | |
Part of QtP delta reduction effort.
Task-number: QT-3055
Reviewed-by: Janne Koskinen
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/symbian/symmake.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
tests/benchmarks/benchmarks.pro
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Very recent change for QS60Style breaks compilation of the style for
3.1. This is due to that style refers to a skin item ID that is not
existing on 3.1 environment. Fixed by referring to the skin ID with
its internal values.
Task-number: QTBUG-8193
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When Drag-n-Dropping elements in itemviews QS60Style draws drop area
as a black rect. Change this so that native graphics are used instead.
This change only affects touch-devices as non-touch 3.x devices
do not have the native graphics defined. In 3.x non-touch devices,
style still uses QCommonStyle to draw the DropArea.
Task-number: QTBUG-8193
Reviewed-by: Alessandro Portale
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Removes one compiler warning caused by animation support additions
(member variables are initialized in incorrect order in default
constructor). Also, removing unnecessary struct variable and
one unnecessary scope definition.
Reviewed-by: Alessandro Portale
|
| |
| |
| |
| |
| |
| |
| |
| | |
Set StyleHint SH_ItemView_ActivateItemOnSingleClick inactive for 3.x
and 5th edition S60.
Task-number: QTBUG-6182
Reviewed-by: Alessandro Portale
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add support of theme animations to AVKON-based QS60Style.
Currently only QProgressBar's have animations, but adding others
with same kind of S60 theming (mainly note animations) would be
really easy to do.
Task-number: QTBUG-4050
Reviewed-by: Alessandro Portale
|
|\ \
| |/
|/|
| |
| |
| |
| |
| | |
Conflicts:
doc/src/getting-started/installation.qdoc
src/gui/dialogs/qfiledialog_win.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/assistant/tools/assistant/helpviewer.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed the host detection in qmake profiles.
Improving parts of commit 2d8d855d.
qmake: add Linux host support to Symbian generator
Fixed indentation.
Add Linux host support to Symbian mkspecs.
Linux support for platform specific commands in .pro files.
Add createpackage.bat equivalent for Unix systems.
Make all Symbian #includes lower case.
mkspecs: fix warning when calling qmake
Fix portability problems in bin/createpackage.pl.
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
bin/createpackage.pl
mkspecs/features/symbian/application_icon.prf
qmake/generators/symbian/symmake_abld.cpp
src/gui/text/qfontdatabase_s60.cpp
src/s60main/s60main.pro
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: axis <qt-info@nokia.com>
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
If Avkon components support transparency then dialog background is transparent
enabling rounded corners.
Reviewed-by: Sami Merila
|
|\ \ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tests/auto/linguist/lupdate/testlupdate.cpp
|
| |/ /
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
|/ /
| |
| |
| | |
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Currently what happens when orientation changes is:
1. Application gets notification that status pane size has changed.
2. Qt resizes S60Data to new size, and sends resize event.
3. Application redraws itself. But style is still using incorrect
screen size internally, so background brush is incorrect. Redrawing
thus might showup white rect on-screen.
4. Style gets notification that orientation is changed and style then
deletes existing background brush.
5. Style creates a new background brush and sends events to all toplevel
widgets that style has changed
6. Widgets might draw themselves with new style background brush.
What this fix changes is:
1. When application first tries to redraw itself, style notices that
the background brush size does not match to active screen size.
2. Style immediately re-creates background brush
3. Since cachekey for pixmaps won't match, new background is not drawn
until after background brush has been updated to application palette.
4. Due to #1 style needs to remove deletion of background brush from
clearCaches to avoid deleting (and re-creating) background twice.
Task-number: QTBUG-6428
Reviewed-by: Janne Koskinen
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Currently QS60Style stores pixel metrics values (96 of them for each
layout) in a static lookup table. There is one "line" for each
screensize, orientation and layout direction (ten in total).
This fix removes the layout direction specific "lines" as there are
only two pixel metrics values that differ depending on direction.
We can handle those two inside QS60Style::pixelMetrics() and
thus remove half of the rows, and thus gain 16*96*5 ~ 8kB of RAM.
Task-number: QTBUG-6803
Reviewed-by: Alessandro Portale
|
| |
| |
| |
| |
| |
| | |
These were missed from previous fix.
Reviewed-by: Alessandro Portale
|
| |
| |
| |
| |
| |
| |
| |
| | |
3.1 does not have theme graphics IDs that we use in style, so it
cannot be compiled in 3.1. As a fallback, 3.1 will use the previous
method of drawing a slider.
Reviewed-by: Alessandro Portale
|
| |
| |
| |
| |
| |
| |
| |
| | |
Currently there is no visual clue that slider is "sunken" (pressed
state). There is S60 theme graphic for it, so lets use it.
Task-number: QTBUG-6722
Reviewed-by: Janne Koskinen
|
| |
| |
| |
| |
| |
| |
| |
| | |
Style uses just a line as slider groove, when S60 provides themed
graphics for it as well.
Task-number: QTBUG-6723
Reviewed-by: Janne Koskinen
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is due to NGA API changes in Tb9.2. Because of API changes,
S60Style needs to have a lot of internal changes. First, the changed
style no longer itself tries to uncompress and handle CFbsBitmaps,
but instead uses the QPixmap backend for it. Second, all references
to CFbsBitmap::DataAddress() have been removed. Third, the lookup
table for theme parts has been cleaned up.
Task-number: QTBUG-4644
Reviewed-by: Janne Koskinen
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fixing previous fixes of QS60StylePrivate::setBackgroundTexture with
commit SHAs a80e58335e69c8ce96d1596e0ed2d14e424a0d5e and
d4089399a3ab7548a864d5a399e08df85c444783
Now, the palette gets the updated background brush and the palette is
actually set as application palette.
Also making sure that QS60StylePrivate::handleDynamicLayoutVariantSwitch
does the right things in the right order. So that Table headers are not
broken after orientaion switch.
Task-number: QTBUG-6125
Task-number: QT-1478
Reviewed-by: Shane Kearns
|
| |
| |
| |
| |
| |
| | |
The word 'module' was missing.
Reviewed-By: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QS60Style::setStyleProperty() and QS60Style::styleProperty() were
intended as generic property setter/getters, but are not needed
anymore.
Reviewed-by: Sami Merila
modified: src/gui/styles/qs60style.cpp
modified: src/gui/styles/qs60style.h
modified: src/gui/styles/qs60style_p.h
modified: src/gui/styles/qs60style_s60.cpp
modified: src/gui/styles/qs60style_simulated.cpp
modified: src/s60installs/eabi/QtGuiu.def
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In S60 the single line and multi line editors have same theme
background. We should share one as well. Now we are using fancy
notepad graphic with QTextEdit, but it makes QTextEdits to look
apart from QLineEdits and in some themes it is styled rather badly
(as it is not a central graphic item in a theme). Therefore it is
better to use one and same graphic for both widgets.
Task-number: QTBUG-5259
Reviewed-by: Alessandro Portale
|
| |
| |
| |
| |
| |
| | |
Leaving function called without a TRAP
Reviewed-by: Sami Merila
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QS60Style basically ignores user set / stylesheet set palettes.
Now, tested with:
* QLineEdit
* QPushButton
* QSpinBox
* QComboBox
* QAbstractScrollArea
* QCheckBox
* QRadioButton
* QGroupBox
* QFrame
* QTreeView
* QTableView
* QHeaderView
* QProgressBar
* QScrollBar
* QSplitter
* QSlider
* QTabWidget
* QToolButton
* QToolBar
and fixed QS60Style so that it obeys externally set palettes.
Task-number: QTBUG-4820
Reviewed-by: Janne Koskinen
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
TabWidget for S60Style is too small for touch use, it is rather hard to
accurately touch the tabpane to switch the active tab.
To fix this, we ask the native tabpane height from AVKON and set the
QTabWiget's pane height to native height (or bigger).
Task-number: QTBUG-4243
Reviewed-by: Alessandro Portale
|