-rw-r--r-- | noncore/net/ubrowser/main.cpp | 13 | ||||
-rw-r--r-- | noncore/net/ubrowser/mainview.cpp | 2 | ||||
-rw-r--r-- | noncore/net/ubrowser/mainview.h | 3 | ||||
-rw-r--r-- | noncore/net/ubrowser/ubrowser.pro | 4 |
4 files changed, 8 insertions, 14 deletions
diff --git a/noncore/net/ubrowser/main.cpp b/noncore/net/ubrowser/main.cpp index e4a873d..0488cfd 100644 --- a/noncore/net/ubrowser/main.cpp +++ b/noncore/net/ubrowser/main.cpp | |||
@@ -9,21 +9,16 @@ version. | |||
9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the | 9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the |
10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | 10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <qpe/qpeapplication.h> | 17 | #include <qpe/qpeapplication.h> |
18 | 18 | ||
19 | #include "mainview.h" | 19 | #include "mainview.h" |
20 | 20 | ||
21 | int main( int argc, char **argv ) | 21 | #include <opie/oapplicationfactory.h> |
22 | { | 22 | |
23 | QPEApplication a( argc, argv ); | 23 | OPIE_EXPORT_APP( OApplicationFactory<MainView> ) |
24 | MainView w; | 24 | |
25 | |||
26 | //a.setMainWidget( &w ); | ||
27 | a.showMainDocumentWidget( &w ); | ||
28 | return a.exec(); | ||
29 | } | ||
diff --git a/noncore/net/ubrowser/mainview.cpp b/noncore/net/ubrowser/mainview.cpp index 9302f05..0d3f171 100644 --- a/noncore/net/ubrowser/mainview.cpp +++ b/noncore/net/ubrowser/mainview.cpp | |||
@@ -8,25 +8,25 @@ version. | |||
8 | 8 | ||
9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the | 9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the |
10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | 10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | 17 | ||
18 | #include "mainview.h" | 18 | #include "mainview.h" |
19 | 19 | ||
20 | MainView::MainView(QWidget *parent, const char *name) : QMainWindow(parent, name) | 20 | MainView::MainView(QWidget *parent, const char *name, WFlags fl) : QMainWindow(parent, name, fl) |
21 | { | 21 | { |
22 | setIcon( Resource::loadPixmap( "remote" ) ); | 22 | setIcon( Resource::loadPixmap( "remote" ) ); |
23 | setCaption(tr("uBrowser")); | 23 | setCaption(tr("uBrowser")); |
24 | 24 | ||
25 | setToolBarsMovable( false ); | 25 | setToolBarsMovable( false ); |
26 | 26 | ||
27 | QPEToolBar *toolbar = new QPEToolBar(this, "toolbar"); | 27 | QPEToolBar *toolbar = new QPEToolBar(this, "toolbar"); |
28 | back = new QToolButton(Resource::loadPixmap("ubrowser/back"), 0, 0, 0, 0, toolbar, "back"); | 28 | back = new QToolButton(Resource::loadPixmap("ubrowser/back"), 0, 0, 0, 0, toolbar, "back"); |
29 | forward = new QToolButton(Resource::loadPixmap("ubrowser/forward"), 0, 0, 0, 0, toolbar, "forward"); | 29 | forward = new QToolButton(Resource::loadPixmap("ubrowser/forward"), 0, 0, 0, 0, toolbar, "forward"); |
30 | home = new QToolButton(Resource::loadPixmap("ubrowser/home"), 0, 0, 0, 0, toolbar, "home"); | 30 | home = new QToolButton(Resource::loadPixmap("ubrowser/home"), 0, 0, 0, 0, toolbar, "home"); |
31 | location = new QComboBox(true, toolbar, "location"); | 31 | location = new QComboBox(true, toolbar, "location"); |
32 | go = new QToolButton(Resource::loadPixmap("ubrowser/go"), 0, 0, 0, 0, toolbar, "go"); | 32 | go = new QToolButton(Resource::loadPixmap("ubrowser/go"), 0, 0, 0, 0, toolbar, "go"); |
diff --git a/noncore/net/ubrowser/mainview.h b/noncore/net/ubrowser/mainview.h index 20e2c70..cc63729 100644 --- a/noncore/net/ubrowser/mainview.h +++ b/noncore/net/ubrowser/mainview.h | |||
@@ -27,25 +27,26 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
27 | #include <qlayout.h> | 27 | #include <qlayout.h> |
28 | #include <qlineedit.h> | 28 | #include <qlineedit.h> |
29 | #include <qdir.h> | 29 | #include <qdir.h> |
30 | 30 | ||
31 | #include <stdio.h> | 31 | #include <stdio.h> |
32 | 32 | ||
33 | #include "httpfactory.h" | 33 | #include "httpfactory.h" |
34 | 34 | ||
35 | class MainView : public QMainWindow | 35 | class MainView : public QMainWindow |
36 | { | 36 | { |
37 | Q_OBJECT | 37 | Q_OBJECT |
38 | public: | 38 | public: |
39 | MainView(QWidget *parent=0, const char *name=0); | 39 | static QString appName() { return QString::fromLatin1("ubrowser"); } |
40 | MainView(QWidget *parent=0, const char *name=0, WFlags fl = 0); | ||
40 | public slots: | 41 | public slots: |
41 | void goClicked(); | 42 | void goClicked(); |
42 | void textChanged(); | 43 | void textChanged(); |
43 | void setDocument( const QString& applnk_filename ); | 44 | void setDocument( const QString& applnk_filename ); |
44 | private: | 45 | private: |
45 | QToolButton *back; | 46 | QToolButton *back; |
46 | QToolButton *forward; | 47 | QToolButton *forward; |
47 | QToolButton *home; | 48 | QToolButton *home; |
48 | QToolButton *go; | 49 | QToolButton *go; |
49 | QComboBox *location; | 50 | QComboBox *location; |
50 | QTextBrowser *browser; | 51 | QTextBrowser *browser; |
51 | HttpFactory *http; | 52 | HttpFactory *http; |
diff --git a/noncore/net/ubrowser/ubrowser.pro b/noncore/net/ubrowser/ubrowser.pro index a6943dd..ed00047 100644 --- a/noncore/net/ubrowser/ubrowser.pro +++ b/noncore/net/ubrowser/ubrowser.pro | |||
@@ -1,13 +1,11 @@ | |||
1 | TEMPLATE=app | 1 | CONFIG +=qt warn_on release quick-app |
2 | CONFIG +=qt warn_on release | ||
3 | DESTDIR =../../../bin | ||
4 | HEADERS = mainview.h httpfactory.h | 2 | HEADERS = mainview.h httpfactory.h |
5 | SOURCES = main.cpp mainview.cpp httpfactory.cpp | 3 | SOURCES = main.cpp mainview.cpp httpfactory.cpp |
6 | INCLUDEPATH+=../../../include | 4 | INCLUDEPATH+=../../../include |
7 | DEPENDPATH+=../../../include | 5 | DEPENDPATH+=../../../include |
8 | LIBS += -lqpe | 6 | LIBS += -lqpe |
9 | TARGET = ubrowser | 7 | TARGET = ubrowser |
10 | 8 | ||
11 | 9 | ||
12 | 10 | ||
13 | include ( $(OPIEDIR)/include.pro ) | 11 | include ( $(OPIEDIR)/include.pro ) |