-rw-r--r-- | libopie2/opiecore/oapplication.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiecore/oapplication.h | 6 | ||||
-rw-r--r-- | libopie2/opiecore/oglobal.h | 3 | ||||
-rw-r--r-- | libopie2/opiecore/oglobalsettings.h | 5 |
4 files changed, 13 insertions, 3 deletions
diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp index d3e04ba..ce26420 100644 --- a/libopie2/opiecore/oapplication.cpp +++ b/libopie2/opiecore/oapplication.cpp | |||
@@ -102,23 +102,23 @@ void OApplication::setMainWidget( QWidget* widget ) | |||
102 | void OApplication::showMainWidget( QWidget* widget, bool nomax ) | 102 | void OApplication::showMainWidget( QWidget* widget, bool nomax ) |
103 | { | 103 | { |
104 | #ifdef Q_WS_QWS | 104 | #ifdef Q_WS_QWS |
105 | QPEApplication::showMainWidget( widget, nomax ); | 105 | QPEApplication::showMainWidget( widget, nomax ); |
106 | #else | 106 | #else |
107 | QApplication::setMainWidget( widget ); | 107 | QApplication::setMainWidget( widget ); |
108 | widget->show(); | 108 | widget->show(); |
109 | #endif | 109 | #endif |
110 | widget->setCaption( _appname ); | 110 | widget->setCaption( _appname ); |
111 | } | 111 | } |
112 | 112 | ||
113 | 113 | ||
114 | void OApplication::setTitle( QString title ) const | 114 | void OApplication::setTitle( const QString& title ) const |
115 | { | 115 | { |
116 | if ( mainWidget() ) | 116 | if ( mainWidget() ) |
117 | { | 117 | { |
118 | if ( !title.isNull() ) | 118 | if ( !title.isNull() ) |
119 | mainWidget()->setCaption( QString(_appname) + QString( " - " ) + title ); | 119 | mainWidget()->setCaption( QString(_appname) + QString( " - " ) + title ); |
120 | else | 120 | else |
121 | mainWidget()->setCaption( _appname ); | 121 | mainWidget()->setCaption( _appname ); |
122 | } | 122 | } |
123 | } | 123 | } |
124 | 124 | ||
diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h index 4d25202..8326847 100644 --- a/libopie2/opiecore/oapplication.h +++ b/libopie2/opiecore/oapplication.h | |||
@@ -24,37 +24,41 @@ | |||
24 | -_. . . )=. = Library General Public License along with | 24 | -_. . . )=. = Library General Public License along with |
25 | -- :-=` this library; see the file COPYING.LIB. | 25 | -- :-=` this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #ifndef OAPPLICATION_H | 31 | #ifndef OAPPLICATION_H |
32 | #define OAPPLICATION_H | 32 | #define OAPPLICATION_H |
33 | 33 | ||
34 | #define oApp OApplication::oApplication() | 34 | #define oApp OApplication::oApplication() |
35 | 35 | ||
36 | // the below stuff will fail with moc because moc does not pre process headers | ||
37 | // This will make usage of signal and slots hard inside QPEApplication -zecke | ||
38 | |||
36 | #ifdef QWS | 39 | #ifdef QWS |
37 | #include <qpe/qpeapplication.h> | 40 | #include <qpe/qpeapplication.h> |
38 | #define OApplicationBaseClass QPEApplication | 41 | #define OApplicationBaseClass QPEApplication |
39 | #else | 42 | #else |
40 | #include <qapplication.h> | 43 | #include <qapplication.h> |
41 | #define OApplicationBaseClass QApplication | 44 | #define OApplicationBaseClass QApplication |
42 | #endif | 45 | #endif |
43 | 46 | ||
44 | class OApplicationPrivate; | 47 | class OApplicationPrivate; |
45 | class OConfig; | 48 | class OConfig; |
46 | 49 | ||
47 | class OApplication: public OApplicationBaseClass | 50 | class OApplication: public OApplicationBaseClass |
48 | { | 51 | { |
52 | // Q_OBJECT would fail -zecke | ||
49 | public: | 53 | public: |
50 | 54 | ||
51 | /** | 55 | /** |
52 | * Constructor. Parses command-line arguments and sets the window caption. | 56 | * Constructor. Parses command-line arguments and sets the window caption. |
53 | * | 57 | * |
54 | * @param rAppName application name. Will be used for finding the | 58 | * @param rAppName application name. Will be used for finding the |
55 | * associated message, icon and configuration files | 59 | * associated message, icon and configuration files |
56 | * | 60 | * |
57 | */ | 61 | */ |
58 | OApplication( int& argc, char** argv, const QCString& rAppName ); | 62 | OApplication( int& argc, char** argv, const QCString& rAppName ); |
59 | /** | 63 | /** |
60 | * Destructor. Destroys the application object and its children. | 64 | * Destructor. Destroys the application object and its children. |
@@ -105,25 +109,25 @@ class OApplication: public OApplicationBaseClass | |||
105 | * | 109 | * |
106 | * @param mainWidget the widget to become the main widget | 110 | * @param mainWidget the widget to become the main widget |
107 | * @see QWidget object | 111 | * @see QWidget object |
108 | */ | 112 | */ |
109 | virtual void showMainWidget( QWidget* widget, bool nomax = false ); | 113 | virtual void showMainWidget( QWidget* widget, bool nomax = false ); |
110 | 114 | ||
111 | /** | 115 | /** |
112 | * Set the application title. The application title will be concatenated | 116 | * Set the application title. The application title will be concatenated |
113 | * to the application name given in the constructor. | 117 | * to the application name given in the constructor. |
114 | * | 118 | * |
115 | * @param title the title. If not given, resets caption to appname | 119 | * @param title the title. If not given, resets caption to appname |
116 | */ | 120 | */ |
117 | virtual void setTitle( QString title = QString::null ) const; | 121 | virtual void setTitle( const QString& title = QString::null ) const; |
118 | //virtual void setTitle() const; | 122 | //virtual void setTitle() const; |
119 | 123 | ||
120 | protected: | 124 | protected: |
121 | void init(); | 125 | void init(); |
122 | 126 | ||
123 | private: | 127 | private: |
124 | const QCString _appname; | 128 | const QCString _appname; |
125 | static OApplication* _instance; | 129 | static OApplication* _instance; |
126 | OConfig* _config; | 130 | OConfig* _config; |
127 | OApplicationPrivate* d; | 131 | OApplicationPrivate* d; |
128 | }; | 132 | }; |
129 | 133 | ||
diff --git a/libopie2/opiecore/oglobal.h b/libopie2/opiecore/oglobal.h index 8345c6a..34f211e 100644 --- a/libopie2/opiecore/oglobal.h +++ b/libopie2/opiecore/oglobal.h | |||
@@ -28,21 +28,22 @@ | |||
28 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #ifndef OGLOBAL_H | 31 | #ifndef OGLOBAL_H |
32 | #define OGLOBAL_H | 32 | #define OGLOBAL_H |
33 | 33 | ||
34 | #include <qpe/global.h> | 34 | #include <qpe/global.h> |
35 | #include <opie2/oconfig.h> | 35 | #include <opie2/oconfig.h> |
36 | 36 | ||
37 | static OConfig globalconfig = OConfig( "global" ); | 37 | static OConfig globalconfig = OConfig( "global" ); |
38 | 38 | ||
39 | //FIXME: Is it wise or even necessary to inherit OGlobal from Global? | 39 | //FIXME: Is it wise or even necessary to inherit OGlobal from Global? |
40 | // once we totally skip libqpe it should ideally swallow Global -zecke | ||
40 | 41 | ||
41 | class OGlobal : public Global | 42 | class OGlobal : public Global |
42 | { | 43 | { |
43 | public: | 44 | public: |
44 | 45 | // do we want to put that into OApplication as in KApplication -zecke | |
45 | static OConfig* config(); | 46 | static OConfig* config(); |
46 | }; | 47 | }; |
47 | 48 | ||
48 | #endif // OGLOBAL_H | 49 | #endif // OGLOBAL_H |
diff --git a/libopie2/opiecore/oglobalsettings.h b/libopie2/opiecore/oglobalsettings.h index 6481251..d3f357e 100644 --- a/libopie2/opiecore/oglobalsettings.h +++ b/libopie2/opiecore/oglobalsettings.h | |||
@@ -38,24 +38,25 @@ | |||
38 | 38 | ||
39 | #define OPIE_DEFAULT_SINGLECLICK true | 39 | #define OPIE_DEFAULT_SINGLECLICK true |
40 | #define OPIE_DEFAULT_INSERTTEAROFFHANDLES true | 40 | #define OPIE_DEFAULT_INSERTTEAROFFHANDLES true |
41 | #define OPIE_DEFAULT_AUTOSELECTDELAY -1 | 41 | #define OPIE_DEFAULT_AUTOSELECTDELAY -1 |
42 | #define OPIE_DEFAULT_CHANGECURSOR true | 42 | #define OPIE_DEFAULT_CHANGECURSOR true |
43 | #define OPIE_DEFAULT_LARGE_CURSOR false | 43 | #define OPIE_DEFAULT_LARGE_CURSOR false |
44 | #define OPIE_DEFAULT_VISUAL_ACTIVATE true | 44 | #define OPIE_DEFAULT_VISUAL_ACTIVATE true |
45 | #define OPIE_DEFAULT_VISUAL_ACTIVATE_SPEED 50 | 45 | #define OPIE_DEFAULT_VISUAL_ACTIVATE_SPEED 50 |
46 | 46 | ||
47 | //FIXME: There's still a whole lot of stuff in here which has to be revised | 47 | //FIXME: There's still a whole lot of stuff in here which has to be revised |
48 | //FIXME: before public usage... lack of time to do it at once - so it will | 48 | //FIXME: before public usage... lack of time to do it at once - so it will |
49 | //FIXME: happen step-by-step. ML. | 49 | //FIXME: happen step-by-step. ML. |
50 | // we should not habe too much configure options!!!!!! -zecke | ||
50 | 51 | ||
51 | /** | 52 | /** |
52 | * Access the OPIE global configuration settings. | 53 | * Access the OPIE global configuration settings. |
53 | * | 54 | * |
54 | */ | 55 | */ |
55 | class OGlobalSettings | 56 | class OGlobalSettings |
56 | { | 57 | { |
57 | public: | 58 | public: |
58 | 59 | ||
59 | /** | 60 | /** |
60 | * Returns a threshold in pixels for drag & drop operations. | 61 | * Returns a threshold in pixels for drag & drop operations. |
61 | * As long as the mouse movement has not exceeded this number | 62 | * As long as the mouse movement has not exceeded this number |
@@ -90,39 +91,41 @@ class OGlobalSettings | |||
90 | * int cell = posToCell(mOldPos); // Find color at mOldPos | 91 | * int cell = posToCell(mOldPos); // Find color at mOldPos |
91 | * if ((cell != -1) && colors[cell].isValid()) | 92 | * if ((cell != -1) && colors[cell].isValid()) |
92 | * { | 93 | * { |
93 | * OColorDrag *d = OColorDrag::makeDrag( colors[cell], this); | 94 | * OColorDrag *d = OColorDrag::makeDrag( colors[cell], this); |
94 | * d->dragCopy(); | 95 | * d->dragCopy(); |
95 | * } | 96 | * } |
96 | * } | 97 | * } |
97 | * } | 98 | * } |
98 | * </pre> | 99 | * </pre> |
99 | * | 100 | * |
100 | */ | 101 | */ |
101 | 102 | ||
103 | // we do not support DND at the momemt -zecke | ||
102 | static int dndEventDelay(); | 104 | static int dndEventDelay(); |
103 | 105 | ||
104 | /** | 106 | /** |
105 | * Returns whether OPIE runs in single (default) or double click | 107 | * Returns whether OPIE runs in single (default) or double click |
106 | * mode. | 108 | * mode. |
107 | * | 109 | * |
108 | * @return @p true if single click mode, or @p false if double click mode. | 110 | * @return @p true if single click mode, or @p false if double click mode. |
109 | * | 111 | * |
110 | * see @ref http://opie.handhelds.org/documentation/standards/opie/style/mouse/index.html | 112 | * see @ref http://opie.handhelds.org/documentation/standards/opie/style/mouse/index.html |
111 | **/ | 113 | **/ |
112 | static bool singleClick(); | 114 | static bool singleClick(); |
113 | 115 | ||
114 | /** | 116 | /** |
115 | * Returns whether tear-off handles are inserted in OPopupMenus. | 117 | * Returns whether tear-off handles are inserted in OPopupMenus. |
116 | **/ | 118 | **/ |
119 | // would clutter the small screen -zecke | ||
117 | static bool insertTearOffHandle(); | 120 | static bool insertTearOffHandle(); |
118 | 121 | ||
119 | /** | 122 | /** |
120 | * @return the OPIE setting for "change cursor over icon" | 123 | * @return the OPIE setting for "change cursor over icon" |
121 | */ | 124 | */ |
122 | static bool changeCursorOverIcon(); | 125 | static bool changeCursorOverIcon(); |
123 | 126 | ||
124 | /** | 127 | /** |
125 | * @return whether to show some feedback when an item (specifically an | 128 | * @return whether to show some feedback when an item (specifically an |
126 | * icon) is activated. | 129 | * icon) is activated. |
127 | */ | 130 | */ |
128 | static bool visualActivate(); | 131 | static bool visualActivate(); |
@@ -242,34 +245,36 @@ class OGlobalSettings | |||
242 | enum { RightHanded = 0, LeftHanded = 1 }; | 245 | enum { RightHanded = 0, LeftHanded = 1 }; |
243 | int handed; // left or right | 246 | int handed; // left or right |
244 | }; | 247 | }; |
245 | 248 | ||
246 | /** | 249 | /** |
247 | * This returns the current mouse settings. | 250 | * This returns the current mouse settings. |
248 | */ | 251 | */ |
249 | static OMouseSettings & mouseSettings(); | 252 | static OMouseSettings & mouseSettings(); |
250 | 253 | ||
251 | /** | 254 | /** |
252 | * The path to the desktop directory of the current user. | 255 | * The path to the desktop directory of the current user. |
253 | */ | 256 | */ |
257 | // below handled by Global stuff and QPEApplication | ||
254 | static QString desktopPath() { initStatic(); return *s_desktopPath; } | 258 | static QString desktopPath() { initStatic(); return *s_desktopPath; } |
255 | 259 | ||
256 | /** | 260 | /** |
257 | * The path to the autostart directory of the current user. | 261 | * The path to the autostart directory of the current user. |
258 | */ | 262 | */ |
259 | static QString autostartPath() { initStatic(); return *s_autostartPath; } | 263 | static QString autostartPath() { initStatic(); return *s_autostartPath; } |
260 | 264 | ||
261 | /** | 265 | /** |
262 | * The path to the trash directory of the current user. | 266 | * The path to the trash directory of the current user. |
263 | */ | 267 | */ |
268 | // we do not have that concept -zecke | ||
264 | static QString trashPath() { initStatic(); return *s_trashPath; } | 269 | static QString trashPath() { initStatic(); return *s_trashPath; } |
265 | 270 | ||
266 | /** | 271 | /** |
267 | * The path where documents are stored of the current user. | 272 | * The path where documents are stored of the current user. |
268 | */ | 273 | */ |
269 | static QString documentPath() { initStatic(); return *s_documentPath; } | 274 | static QString documentPath() { initStatic(); return *s_documentPath; } |
270 | 275 | ||
271 | 276 | ||
272 | /** | 277 | /** |
273 | * The default color to use when highlighting toolbar buttons | 278 | * The default color to use when highlighting toolbar buttons |
274 | */ | 279 | */ |
275 | static QColor toolBarHighlightColor(); | 280 | static QColor toolBarHighlightColor(); |