5 files changed, 32 insertions, 25 deletions
diff --git a/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp b/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp index 4eaf3a9..a75f9dc 100644 --- a/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp +++ b/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp | |||
@@ -6,11 +6,8 @@ | |||
6 | 6 | ||
7 | #include <qpe/qpeapplication.h> | 7 | #include <qpe/qpeapplication.h> |
8 | #include <opie/oapplicationfactory.h> | ||
9 | |||
10 | #include "../osplitter.h" | ||
11 | 8 | ||
9 | #include <opie2/oapplicationfactory.h> | ||
12 | #include "osplitter_mail.h" | 10 | #include "osplitter_mail.h" |
13 | 11 | ||
14 | |||
15 | OPIE_EXPORT_APP( OApplicationFactory<ListViews> ) | 12 | OPIE_EXPORT_APP( OApplicationFactory<ListViews> ) |
16 | 13 | ||
diff --git a/libopie2/examples/opieui/osplitter_example/osplitter_mail.h b/libopie2/examples/opieui/osplitter_example/osplitter_mail.h index b7e7efe..1447a92 100644 --- a/libopie2/examples/opieui/osplitter_example/osplitter_mail.h +++ b/libopie2/examples/opieui/osplitter_example/osplitter_mail.h | |||
@@ -15,4 +15,8 @@ | |||
15 | #include <qlistview.h> | 15 | #include <qlistview.h> |
16 | 16 | ||
17 | #include <opie2/osplitter.h> | ||
18 | |||
19 | using Opie::OSplitter; | ||
20 | |||
17 | class Folder; | 21 | class Folder; |
18 | class QLabel; | 22 | class QLabel; |
diff --git a/libopie2/examples/opieui/osplitter_example/osplitter_mail.pro b/libopie2/examples/opieui/osplitter_example/osplitter_mail.pro index ec6e626..dd1bef2 100644 --- a/libopie2/examples/opieui/osplitter_example/osplitter_mail.pro +++ b/libopie2/examples/opieui/osplitter_example/osplitter_mail.pro | |||
@@ -9,4 +9,4 @@ HEADERS = osplitter_mail.h | |||
9 | SOURCES = osplitter_mail.cpp | 9 | SOURCES = osplitter_mail.cpp |
10 | 10 | ||
11 | LIBS += -lqpe -lopie | 11 | LIBS += -lqpe -lopieui2 |
12 | include ( $(OPIEDIR)/include.pro ) | 12 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/libopie2/examples/opieui/oversatileviewdemo/.cvsignore b/libopie2/examples/opieui/oversatileviewdemo/.cvsignore new file mode 100644 index 0000000..8f7300c --- a/dev/null +++ b/libopie2/examples/opieui/oversatileviewdemo/.cvsignore | |||
@@ -0,0 +1,6 @@ | |||
1 | Makefile* | ||
2 | moc* | ||
3 | *moc | ||
4 | *.o | ||
5 | ~* | ||
6 | |||
diff --git a/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp b/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp index 197669c..f62729c 100644 --- a/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp +++ b/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp | |||
@@ -34,5 +34,5 @@ | |||
34 | 34 | ||
35 | #ifdef QWS | 35 | #ifdef QWS |
36 | #include <opie/odevice.h> | 36 | #include <opie2/odevice.h> |
37 | using namespace Opie; | 37 | using namespace Opie; |
38 | #endif | 38 | #endif |
@@ -57,5 +57,5 @@ OpieUIDemo::OpieUIDemo( QWidget* parent, const char* name, WFlags fl ) | |||
57 | : QMainWindow( parent, name, fl ) | 57 | : QMainWindow( parent, name, fl ) |
58 | { | 58 | { |
59 | 59 | ||
60 | QMenuBar* mbar = this->menuBar(); | 60 | QMenuBar* mbar = this->menuBar(); |
61 | OPopupMenu* demo = new OPopupMenu( this ); | 61 | OPopupMenu* demo = new OPopupMenu( this ); |
@@ -67,5 +67,5 @@ OpieUIDemo::OpieUIDemo( QWidget* parent, const char* name, WFlags fl ) | |||
67 | demo->setItemParameter( demo->insertItem( "OSelector", this, SLOT( demo(int) ) ), oselector ); | 67 | demo->setItemParameter( demo->insertItem( "OSelector", this, SLOT( demo(int) ) ), oselector ); |
68 | mbar->insertItem( "Demonstrate", demo ); | 68 | mbar->insertItem( "Demonstrate", demo ); |
69 | 69 | ||
70 | build(); | 70 | build(); |
71 | 71 | ||
@@ -81,5 +81,5 @@ void OpieUIDemo::build() | |||
81 | setCentralWidget( main ); | 81 | setCentralWidget( main ); |
82 | main->show(); | 82 | main->show(); |
83 | 83 | ||
84 | main->addTab( new OVersatileViewDemo( main ), "VersatileView" ); | 84 | main->addTab( new OVersatileViewDemo( main ), "VersatileView" ); |
85 | } | 85 | } |
@@ -103,5 +103,5 @@ void OpieUIDemo::demoOCompletionBox() | |||
103 | { | 103 | { |
104 | qDebug( "ocompletionbox" ); | 104 | qDebug( "ocompletionbox" ); |
105 | 105 | ||
106 | OCompletionBox* box = new OCompletionBox( 0 ); | 106 | OCompletionBox* box = new OCompletionBox( 0 ); |
107 | box->insertItem( "This CompletionBox" ); | 107 | box->insertItem( "This CompletionBox" ); |
@@ -110,8 +110,8 @@ void OpieUIDemo::demoOCompletionBox() | |||
110 | box->insertItem( "Additional Items" ); | 110 | box->insertItem( "Additional Items" ); |
111 | box->insertItem( "Complete Completion Box" ); | 111 | box->insertItem( "Complete Completion Box" ); |
112 | 112 | ||
113 | connect( box, SIGNAL( activated( const QString& ) ), this, SLOT( messageBox( const QString& ) ) ); | 113 | connect( box, SIGNAL( activated( const QString& ) ), this, SLOT( messageBox( const QString& ) ) ); |
114 | box->popup(); | 114 | box->popup(); |
115 | 115 | ||
116 | } | 116 | } |
117 | 117 | ||
@@ -119,7 +119,7 @@ void OpieUIDemo::demoOLineEdit() | |||
119 | { | 119 | { |
120 | qDebug( "olineedit" ); | 120 | qDebug( "olineedit" ); |
121 | 121 | ||
122 | OLineEdit *edit = new OLineEdit( 0, "lineedit" ); | 122 | OLineEdit *edit = new OLineEdit( 0, "lineedit" ); |
123 | 123 | ||
124 | edit->setCompletionMode( OGlobalSettings::CompletionPopup ); | 124 | edit->setCompletionMode( OGlobalSettings::CompletionPopup ); |
125 | OCompletion* comp = edit->completionObject(); | 125 | OCompletion* comp = edit->completionObject(); |
@@ -129,7 +129,7 @@ void OpieUIDemo::demoOLineEdit() | |||
129 | list << "mickey@tm.informatik.uni-frankfurt.de"; | 129 | list << "mickey@tm.informatik.uni-frankfurt.de"; |
130 | list << "mickey@vanille.de"; | 130 | list << "mickey@vanille.de"; |
131 | 131 | ||
132 | comp->setItems( list ); | 132 | comp->setItems( list ); |
133 | 133 | ||
134 | edit->show(); | 134 | edit->show(); |
135 | 135 | ||
@@ -139,7 +139,7 @@ void OpieUIDemo::demoOComboBox() | |||
139 | { | 139 | { |
140 | qDebug( "ocombobox" ); | 140 | qDebug( "ocombobox" ); |
141 | 141 | ||
142 | OComboBox *combo = new OComboBox( true, 0, "combobox" ); | 142 | OComboBox *combo = new OComboBox( true, 0, "combobox" ); |
143 | 143 | ||
144 | combo->setCompletionMode( OGlobalSettings::CompletionPopup ); | 144 | combo->setCompletionMode( OGlobalSettings::CompletionPopup ); |
145 | OCompletion* comp = combo->completionObject(); | 145 | OCompletion* comp = combo->completionObject(); |
@@ -150,5 +150,5 @@ void OpieUIDemo::demoOComboBox() | |||
150 | ilist << "groucho@handhelds.org"; | 150 | ilist << "groucho@handhelds.org"; |
151 | combo->insertStringList( ilist ); | 151 | combo->insertStringList( ilist ); |
152 | 152 | ||
153 | QStringList clist; | 153 | QStringList clist; |
154 | clist << "mickeyl@handhelds.org"; | 154 | clist << "mickeyl@handhelds.org"; |
@@ -156,5 +156,5 @@ void OpieUIDemo::demoOComboBox() | |||
156 | clist << "mickey@vanille.de"; | 156 | clist << "mickey@vanille.de"; |
157 | comp->setItems( clist ); | 157 | comp->setItems( clist ); |
158 | 158 | ||
159 | combo->show(); | 159 | combo->show(); |
160 | 160 | ||
@@ -164,7 +164,7 @@ void OpieUIDemo::demoOEditListBox() | |||
164 | { | 164 | { |
165 | qDebug( "oeditlistbox" ); | 165 | qDebug( "oeditlistbox" ); |
166 | 166 | ||
167 | OEditListBox* edit = new OEditListBox( "OEditListBox", 0, "editlistbox" ); | 167 | OEditListBox* edit = new OEditListBox( "OEditListBox", 0, "editlistbox" ); |
168 | 168 | ||
169 | edit->lineEdit()->setCompletionMode( OGlobalSettings::CompletionPopup ); | 169 | edit->lineEdit()->setCompletionMode( OGlobalSettings::CompletionPopup ); |
170 | OCompletion* comp = edit->lineEdit()->completionObject(); | 170 | OCompletion* comp = edit->lineEdit()->completionObject(); |
@@ -181,5 +181,5 @@ void OpieUIDemo::demoOEditListBox() | |||
181 | list << "mickeyl@handhelds.org"; | 181 | list << "mickeyl@handhelds.org"; |
182 | edit->insertStringList( list ); | 182 | edit->insertStringList( list ); |
183 | 183 | ||
184 | edit->show(); | 184 | edit->show(); |
185 | 185 | ||
@@ -189,10 +189,10 @@ void OpieUIDemo::demoOSelector() | |||
189 | { | 189 | { |
190 | qDebug( "oselector" ); | 190 | qDebug( "oselector" ); |
191 | 191 | ||
192 | OHSSelector* sel = new OHSSelector( 0, "gradientselector" ); | 192 | OHSSelector* sel = new OHSSelector( 0, "gradientselector" ); |
193 | //#sel->resize( QSize( 200, 30 ) ); | 193 | //#sel->resize( QSize( 200, 30 ) ); |
194 | //#sel->setColors( QColor( 90, 190, 60 ), QColor( 200, 55, 255 ) ); | 194 | //#sel->setColors( QColor( 90, 190, 60 ), QColor( 200, 55, 255 ) ); |
195 | //#sel->setText( "Dark", "Light" ); | 195 | //#sel->setText( "Dark", "Light" ); |
196 | 196 | ||
197 | sel->show(); | 197 | sel->show(); |
198 | } | 198 | } |