projects
/
dorian
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix forward navigation control on Linux.
[dorian]
/
settingswindow.h
diff --git
a/settingswindow.h
b/settingswindow.h
index
e2b3353
..
c3f5232
100644
(file)
--- a/
settingswindow.h
+++ b/
settingswindow.h
@@
-1,10
+1,11
@@
#ifndef SETTINGSWINDOW_H
#define SETTINGSWINDOW_H
#ifndef SETTINGSWINDOW_H
#define SETTINGSWINDOW_H
-#include <QMainWindow>
#include <QLabel>
#include <QSlider>
#include <QLabel>
#include <QSlider>
+#include "adopterwindow.h"
+
class QPushButton;
class QFontComboBox;
class QFont;
class QPushButton;
class QFontComboBox;
class QFont;
@@
-14,13
+15,13
@@
class QLabel;
class ToolButtonBox;
/** Display settings. */
class ToolButtonBox;
/** Display settings. */
-class SettingsWindow: public QMainWindow
+class SettingsWindow: public AdopterWindow
{
Q_OBJECT
public:
explicit SettingsWindow(QWidget *parent = 0);
{
Q_OBJECT
public:
explicit SettingsWindow(QWidget *parent = 0);
- enum {SchemeDefault, SchemeDay, SchemeNight, SchemeSand};
+ enum {SchemeDay, SchemeNight, SchemeSand};
enum {OrientationPortrait, OrientationLandscape};
signals:
enum {OrientationPortrait, OrientationLandscape};
signals:
@@
-34,15
+35,12
@@
public slots:
void onGrabVolumeToggled(bool enable);
protected:
void onGrabVolumeToggled(bool enable);
protected:
-#ifdef Q_WS_MAEMO_5
void closeEvent(QCloseEvent *e);
void closeEvent(QCloseEvent *e);
-#endif
private:
QSlider *zoomSlider;
QLabel *zoomLabel;
QFontComboBox *fontButton;
private:
QSlider *zoomSlider;
QLabel *zoomLabel;
QFontComboBox *fontButton;
- ToolButtonBox *orientationBox;
};
#endif // SETTINGSWINDOW_H
};
#endif // SETTINGSWINDOW_H