author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (unidiff) | |
tree | 6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/menubutton.h | |
parent | d10cddb3c9ce75bc90b14add14bc133737fe35aa (diff) | |
download | opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.zip opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.gz opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.bz2 |
Qtopia1-6 merge
still to test
bic changes to be resolved
more changes to be made?
-rw-r--r-- | library/menubutton.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/menubutton.h b/library/menubutton.h index e9c91b7..6582b1e 100644 --- a/library/menubutton.h +++ b/library/menubutton.h | |||
@@ -1,52 +1,52 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef MENUBUTTON_H | 20 | #ifndef MENUBUTTON_H |
21 | #define MENUBUTTON_H | 21 | #define MENUBUTTON_H |
22 | 22 | ||
23 | #include <qpushbutton.h> | 23 | #include <qpushbutton.h> |
24 | #include <qstringlist.h> | 24 | #include <qstringlist.h> |
25 | 25 | ||
26 | class MenuButton : public QPushButton { | 26 | class MenuButton : public QPushButton { |
27 | Q_OBJECT | 27 | Q_OBJECT |
28 | public: | 28 | public: |
29 | MenuButton( QWidget* parent, const char* name=0); | 29 | MenuButton( QWidget* parent, const char* name=0); |
30 | MenuButton( const QStringList& items, QWidget* parent, const char* name=0); | 30 | MenuButton( const QStringList& items, QWidget* parent, const char* name=0); |
31 | 31 | ||
32 | void clear(); | 32 | void clear(); |
33 | 33 | ||
34 | int currentItem() const; | 34 | int currentItem() const; |
35 | QString currentText() const; | 35 | QString currentText() const; |
36 | 36 | ||
37 | void insertItems( const QStringList& items ); | 37 | void insertItems( const QStringList& items ); |
38 | void insertItem( const QIconSet& icon, const QString& text=QString::null ); | 38 | void insertItem( const QIconSet& icon, const QString& text=QString::null ); |
39 | void insertItem( const QString& text ); | 39 | void insertItem( const QString& text ); |
40 | void insertSeparator(); | 40 | void insertSeparator(); |
41 | 41 | ||
42 | void setLabel(const QString& label); | 42 | void setLabel(const QString& label); |
43 | 43 | ||
44 | signals: | 44 | signals: |
45 | void selected(int); | 45 | void selected(int); |
46 | void selected(const QString&); | 46 | void selected(const QString&); |
47 | 47 | ||
48 | public slots: | 48 | public slots: |
49 | void select(int); | 49 | void select(int); |
50 | void select(const QString&); | 50 | void select(const QString&); |
51 | 51 | ||
52 | private: | 52 | private: |