summaryrefslogtreecommitdiff
path: root/src/gui/dialogs/qdialog.h
diff options
context:
space:
mode:
authorSami Merilä <sami.merila@nokia.com>2009-09-18 19:06:46 +0300
committerJason Barron <jbarron@trolltech.com>2009-09-21 10:06:19 +0200
commit58b92a951899f74b63048a36c451d3355c0c5a7f (patch)
treefec4e8be5ca11570979e3f0a8de3f6a7407c661f /src/gui/dialogs/qdialog.h
parent75c4d11b8260ab74bcbf403c32333b81e5ef30e3 (diff)
downloadqt4-tools-58b92a951899f74b63048a36c451d3355c0c5a7f.tar.gz
S60 native looking dialog support.
Related to QTSSIXTY-63 "Make Qt dialogs look native" S60 dialog support: * Positioning according S60 rules: - in portrait dialogs at the bottom of the screen, - in landscape positioned in the center of the screen [unless device supports bottom softkeys], so that softkeys are not covered by the dialog * If dialog shows extension, then dialog is re-positioned * Dialog size: - in portrait screen wide dialog, height can change - in landscape width is the same size as width in portrait (some dialogs are maximized) * No push buttons or DialogButtonBoxes in internal qt dialogs (QWizard, QInputDialog, QFileDialog, QFontDialog, QColorDialog, QProgressDialog, QErrorMessage, QMessageBox), instead signals are remapped to softkeys. * Globally, dialogbuttonboxes are converted automatically to softkeys. OPEN: * Needs to be re-factored slightly after softkey API refactoring is finished. BUGS: QWizard layout switch is wonky - dialog is not re-sized correctly. QFontDialog will not fit into device screen (too much widgets in it). Some effort needed to be make it smaller. Cannot set one softkey at the time softkeys => Options menu and right softkey cannot be set separately [SoftKey re-factoring will help] Dialogs cannot get touch events to softkeys [SoftKey re-factoring will help] Reviewed-by: Alessandro Portale Reviewed-by: Jason Barron Reviewed-by: mread Reviewed-by: Shane Kearns
Diffstat (limited to 'src/gui/dialogs/qdialog.h')
-rw-r--r--src/gui/dialogs/qdialog.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/dialogs/qdialog.h b/src/gui/dialogs/qdialog.h
index 65aba0601c..694bff79cb 100644
--- a/src/gui/dialogs/qdialog.h
+++ b/src/gui/dialogs/qdialog.h
@@ -107,7 +107,7 @@ public Q_SLOTS:
protected:
QDialog(QDialogPrivate &, QWidget *parent, Qt::WindowFlags f = 0);
-#ifdef Q_WS_WINCE
+#if defined(Q_WS_WINCE) || defined(Q_WS_S60)
bool event(QEvent *e);
#endif
void keyPressEvent(QKeyEvent *);
@@ -119,11 +119,15 @@ protected:
#endif
bool eventFilter(QObject *, QEvent *);
void adjustPosition(QWidget*);
-
private:
Q_DECLARE_PRIVATE(QDialog)
Q_DISABLE_COPY(QDialog)
+#if defined(Q_WS_S60)
+ bool s60AdjustedPosition();
+#endif
+
+
#ifdef Q_WS_WINCE_WM
Q_PRIVATE_SLOT(d_func(), void _q_doneAction())
#endif