-rw-r--r-- | noncore/apps/opie-gutenbrowser/browserDialog.cpp | 7 | ||||
-rw-r--r-- | noncore/apps/opie-gutenbrowser/config.in | 6 | ||||
-rw-r--r-- | noncore/apps/opie-gutenbrowser/openetext.cpp | 9 | ||||
-rw-r--r-- | noncore/apps/opie-gutenbrowser/opie-gutenbrowser.pro | 5 |
4 files changed, 16 insertions, 11 deletions
diff --git a/noncore/apps/opie-gutenbrowser/browserDialog.cpp b/noncore/apps/opie-gutenbrowser/browserDialog.cpp index 5c48da1..81dd516 100644 --- a/noncore/apps/opie-gutenbrowser/browserDialog.cpp +++ b/noncore/apps/opie-gutenbrowser/browserDialog.cpp | |||
@@ -1,29 +1,32 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | copyright 2001 by L.J. Potter ljp@llornkcor.com | 2 | copyright 2001 by L.J. Potter ljp@llornkcor.com |
3 | copyright : (C) 2000 -2004 by llornkcor | 3 | copyright : (C) 2000 -2004 by llornkcor |
4 | email : ljp@llornkcor.com | 4 | email : ljp@llornkcor.com |
5 | 5 | ||
6 | ****************************************************************************/ | 6 | ****************************************************************************/ |
7 | 7 | ||
8 | #include "optionsDialog.h" | 8 | #include "optionsDialog.h" |
9 | //#include "fileBrowser.h" | 9 | //#include "fileBrowser.h" |
10 | 10 | ||
11 | /* OPIE */ | ||
12 | #include <opie2/ofiledialog.h> | ||
13 | using namespace Opie::Ui; | ||
14 | |||
15 | /* QT */ | ||
11 | #include <qlabel.h> | 16 | #include <qlabel.h> |
12 | #include <qlistbox.h> | 17 | #include <qlistbox.h> |
13 | #include <qpushbutton.h> | 18 | #include <qpushbutton.h> |
14 | #include <qlayout.h> | 19 | #include <qlayout.h> |
15 | 20 | ||
16 | #include <opie/ofiledialog.h> | ||
17 | |||
18 | void optionsDialog::BrowserDlg( ) | 21 | void optionsDialog::BrowserDlg( ) |
19 | { | 22 | { |
20 | // setCaption( tr( "Choose Browser" ) ); | 23 | // setCaption( tr( "Choose Browser" ) ); |
21 | http_ListBox1->insertItem( tr( "Opera")); | 24 | http_ListBox1->insertItem( tr( "Opera")); |
22 | http_ListBox1->insertItem( tr( "Konqueror")); | 25 | http_ListBox1->insertItem( tr( "Konqueror")); |
23 | http_ListBox1->insertItem( tr( "wget")); | 26 | http_ListBox1->insertItem( tr( "wget")); |
24 | } | 27 | } |
25 | 28 | ||
26 | void optionsDialog::select_title(int) { | 29 | void optionsDialog::select_title(int) { |
27 | browserName = http_ListBox1->currentText(); | 30 | browserName = http_ListBox1->currentText(); |
28 | Config config("Gutenbrowser"); | 31 | Config config("Gutenbrowser"); |
29 | config.setGroup( "Browser" ); | 32 | config.setGroup( "Browser" ); |
diff --git a/noncore/apps/opie-gutenbrowser/config.in b/noncore/apps/opie-gutenbrowser/config.in index ec67d6e..d2a3033 100644 --- a/noncore/apps/opie-gutenbrowser/config.in +++ b/noncore/apps/opie-gutenbrowser/config.in | |||
@@ -1,4 +1,6 @@ | |||
1 | config OPIE-GUTENBROWSER | 1 | config GUTENBROWSER |
2 | boolean "gutenbrowser - Gutenberg Project etext reader and selector" | 2 | boolean "gutenbrowser - Gutenberg Project etext reader and selector" |
3 | default "n" | 3 | default "n" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && FTPLIB | 4 | depends ( LIBQPE || LIBQPE-X11 ) && FTPLIB && LIBOPIE2CORE && LIBOPIE2UI |
5 | comment "gutenbrowser needs a libqpe, ftplib, libopie2core and libopie2ui" | ||
6 | depends !(( LIBQPE || LIBQPE-X11 ) && FTPLIB && LIBOPIE2CORE && LIBOPIE2UI) | ||
diff --git a/noncore/apps/opie-gutenbrowser/openetext.cpp b/noncore/apps/opie-gutenbrowser/openetext.cpp index 40f35d6..bd44ce6 100644 --- a/noncore/apps/opie-gutenbrowser/openetext.cpp +++ b/noncore/apps/opie-gutenbrowser/openetext.cpp | |||
@@ -7,33 +7,34 @@ | |||
7 | ***************************************************************************/ | 7 | ***************************************************************************/ |
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * This program is free software; you can redistribute it and/or modify * | 9 | * This program is free software; you can redistribute it and/or modify * |
10 | * it under the terms of the GNU General Public License as published by * | 10 | * it under the terms of the GNU General Public License as published by * |
11 | * the Free Software Foundation; either version 2 of the License, or * | 11 | * the Free Software Foundation; either version 2 of the License, or * |
12 | * (at your option) any later version. * | 12 | * (at your option) any later version. * |
13 | ***************************************************************************/ | 13 | ***************************************************************************/ |
14 | 14 | ||
15 | #include "gutenbrowser.h" | 15 | #include "gutenbrowser.h" |
16 | #include "openetext.h" | 16 | #include "openetext.h" |
17 | #include "editTitle.h" | 17 | #include "editTitle.h" |
18 | 18 | ||
19 | #include <qfileinfo.h> | 19 | /* OPIE */ |
20 | #include <opie2/ofiledialog.h> | ||
20 | #include <qpe/applnk.h> | 21 | #include <qpe/applnk.h> |
22 | #include <qpe/config.h> | ||
21 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | using namespace Opie::Ui; | ||
22 | 25 | ||
23 | #include <stdlib.h> | 26 | #include <stdlib.h> |
24 | #include <qtextstream.h> | 27 | #include <qtextstream.h> |
25 | #include <qpe/config.h> | 28 | #include <qfileinfo.h> |
26 | |||
27 | #include <opie/ofiledialog.h> | ||
28 | 29 | ||
29 | #if defined(_WS_WIN_) | 30 | #if defined(_WS_WIN_) |
30 | #include <windows.h> | 31 | #include <windows.h> |
31 | #else | 32 | #else |
32 | #include <unistd.h> | 33 | #include <unistd.h> |
33 | #include "sys/stat.h" | 34 | #include "sys/stat.h" |
34 | #endif | 35 | #endif |
35 | 36 | ||
36 | OpenEtext::OpenEtext(QWidget *parent, QString name) : QDialog(parent,name,true) | 37 | OpenEtext::OpenEtext(QWidget *parent, QString name) : QDialog(parent,name,true) |
37 | { | 38 | { |
38 | local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/"; | 39 | local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/"; |
39 | local_index=local_library+"GUTINDEX.ALL"; | 40 | local_index=local_library+"GUTINDEX.ALL"; |
diff --git a/noncore/apps/opie-gutenbrowser/opie-gutenbrowser.pro b/noncore/apps/opie-gutenbrowser/opie-gutenbrowser.pro index e34e922..5c1d0c4 100644 --- a/noncore/apps/opie-gutenbrowser/opie-gutenbrowser.pro +++ b/noncore/apps/opie-gutenbrowser/opie-gutenbrowser.pro | |||
@@ -1,15 +1,14 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | CONFIG += qt warn_on release quick-app | 2 | CONFIG += qt warn_on quick-app |
3 | #CONFIG += qt warn_on release qpp | ||
4 | HEADERS = LibraryDialog.h \ | 3 | HEADERS = LibraryDialog.h \ |
5 | SearchDialog.h \ | 4 | SearchDialog.h \ |
6 | SearchResults.h \ | 5 | SearchResults.h \ |
7 | helpme.h \ | 6 | helpme.h \ |
8 | multiline_ex.h \ | 7 | multiline_ex.h \ |
9 | openetext.h \ | 8 | openetext.h \ |
10 | editTitle.h \ | 9 | editTitle.h \ |
11 | fontDialog.h \ | 10 | fontDialog.h \ |
12 | optionsDialog.h \ | 11 | optionsDialog.h \ |
13 | helpwindow.h \ | 12 | helpwindow.h \ |
14 | output.h \ | 13 | output.h \ |
15 | NetworkDialog.h \ | 14 | NetworkDialog.h \ |
@@ -31,15 +30,15 @@ SOURCES = LibraryDialog.cpp \ | |||
31 | optionsDialogData.cpp \ | 30 | optionsDialogData.cpp \ |
32 | helpwindow.cpp \ | 31 | helpwindow.cpp \ |
33 | output.cpp \ | 32 | output.cpp \ |
34 | NetworkDialog.cpp \ | 33 | NetworkDialog.cpp \ |
35 | gutenbrowserData.cpp \ | 34 | gutenbrowserData.cpp \ |
36 | gutenbrowser.cpp \ | 35 | gutenbrowser.cpp \ |
37 | main.cpp | 36 | main.cpp |
38 | TARGET = gutenbrowser | 37 | TARGET = gutenbrowser |
39 | 38 | ||
40 | INCLUDEPATH += $(OPIEDIR)/include | 39 | INCLUDEPATH += $(OPIEDIR)/include |
41 | DEPENDPATH += $(OPIEDIR)/include | 40 | DEPENDPATH += $(OPIEDIR)/include |
42 | DESTDIR = $(OPIEDIR)/bin | 41 | DESTDIR = $(OPIEDIR)/bin |
43 | LIBS += -lqpe -lpthread -lftplib -lopie | 42 | LIBS += -lqpe -lpthread -lftplib -lopiecore2 -lopieui2 |
44 | 43 | ||
45 | include ( $(OPIEDIR)/include.pro ) | 44 | include ( $(OPIEDIR)/include.pro ) |