summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-09 14:06:05 (UTC)
committer mickeyl <mickeyl>2004-04-09 14:06:05 (UTC)
commit5f294a018a0f44a6547485bc73a095cd0c153903 (patch) (unidiff)
treeea19ba0afea3e8d4a226719a3590cf11e5fc5178
parent208a155ee480e5c1ae0fd6e8876a6ffea7f1c4a5 (diff)
downloadopie-5f294a018a0f44a6547485bc73a095cd0c153903.zip
opie-5f294a018a0f44a6547485bc73a095cd0c153903.tar.gz
opie-5f294a018a0f44a6547485bc73a095cd0c153903.tar.bz2
libopie1 --> libopie2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-gutenbrowser/browserDialog.cpp9
-rw-r--r--noncore/apps/opie-gutenbrowser/config.in6
-rw-r--r--noncore/apps/opie-gutenbrowser/openetext.cpp35
-rw-r--r--noncore/apps/opie-gutenbrowser/opie-gutenbrowser.pro9
4 files changed, 32 insertions, 27 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
@@ -8,13 +8,16 @@ copyright 2001 by L.J. Potter ljp@llornkcor.com
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>
13using 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
18void optionsDialog::BrowserDlg( ) 21void optionsDialog::BrowserDlg( )
19{ 22{
20// setCaption( tr( "Choose Browser" ) ); 23// setCaption( tr( "Choose Browser" ) );
@@ -71,7 +74,7 @@ void optionsDialog::BrowseSelected() {
71} 74}
72 75
73void optionsDialog::setHttp(int index) { 76void optionsDialog::setHttp(int index) {
74 Config config("Gutenbrowser"); 77 Config config("Gutenbrowser");
75 config.setGroup( "HttpServer" ); 78 config.setGroup( "HttpServer" );
76 qDebug("writing http server"); 79 qDebug("writing http server");
77 if( index== 0) { 80 if( index== 0) {
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
@@ -16,15 +16,16 @@
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>
24using 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>
@@ -149,13 +150,13 @@ OpenFileButton->setDown(TRUE);
149// } 150// }
150 151
151 if( filer.right(4) == ".txt" 152 if( filer.right(4) == ".txt"
152 || filer.right(4) == ".TXT" 153 || filer.right(4) == ".TXT"
153 || filer.right(4) == ".etx" 154 || filer.right(4) == ".etx"
154 || filer.right(4) == ".ETX" 155 || filer.right(4) == ".ETX"
155 || filer.right(4) == ".etx" 156 || filer.right(4) == ".etx"
156 || filer.right(4) == ".ETX" 157 || filer.right(4) == ".ETX"
157 || filer.right(4) == ".zip" 158 || filer.right(4) == ".zip"
158 || filer.right(4) == ".ZIP" ) { 159 || filer.right(4) == ".ZIP" ) {
159 QFileInfo zipFile( filer); 160 QFileInfo zipFile( filer);
160 QString s_fileName = zipFile.fileName(); 161 QString s_fileName = zipFile.fileName();
161 QString cmd; 162 QString cmd;
@@ -178,10 +179,10 @@ OpenFileButton->setDown(TRUE);
178// qDebug("Filename is now "+fileName); 179// qDebug("Filename is now "+fileName);
179 } 180 }
180 } else 181 } else
181 fileName = str; 182 fileName = str;
182 183
183 FindTitle(fileName); 184 FindTitle(fileName);
184 185
185 QFileInfo fi( fileName); 186 QFileInfo fi( fileName);
186 name_file = fi.fileName(); 187 name_file = fi.fileName();
187 name_file = name_file.left(name_file.length() - 4); 188 name_file = name_file.left(name_file.length() - 4);
@@ -224,7 +225,7 @@ bool OpenEtext::FindTitle( QString filename)
224 // int Titlenumber=0; 225 // int Titlenumber=0;
225 226
226 if ( indexLib.open( IO_ReadOnly) ) { 227 if ( indexLib.open( IO_ReadOnly) ) {
227 qDebug("file opened successfully"); 228 qDebug("file opened successfully");
228 QTextStream indexStream( &indexLib ); 229 QTextStream indexStream( &indexLib );
229 QString target = "Project Gutenberg Etext of"; 230 QString target = "Project Gutenberg Etext of";
230 QString target2 = "Project Gutenberg Etext"; 231 QString target2 = "Project Gutenberg Etext";
@@ -264,8 +265,8 @@ bool OpenEtext::FindTitle( QString filename)
264// qDebug("Found the title 4 and it is %s", title.latin1()); 265// qDebug("Found the title 4 and it is %s", title.latin1());
265 } 266 }
266 } //endof file 267 } //endof file
267 indexLib.close(); 268 indexLib.close();
268 269
269 if( !findCheck || title.length() < 2) { 270 if( !findCheck || title.length() < 2) {
270 qDebug("Trying hard to find title from GUTINDEX.ALL"); 271 qDebug("Trying hard to find title from GUTINDEX.ALL");
271 title = titleFromLibrary( filename); 272 title = titleFromLibrary( filename);
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,6 +1,5 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG += qt warn_on release quick-app 2CONFIG += qt warn_on quick-app
3#CONFIG += qt warn_on release qpp
4HEADERS = LibraryDialog.h \ 3HEADERS = LibraryDialog.h \
5 SearchDialog.h \ 4 SearchDialog.h \
6 SearchResults.h \ 5 SearchResults.h \
@@ -11,7 +10,7 @@ HEADERS = LibraryDialog.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 \
16 gutenbrowser.h \ 15 gutenbrowser.h \
17 resource.h 16 resource.h
@@ -32,7 +31,7 @@ SOURCES = LibraryDialog.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
38TARGET = gutenbrowser 37TARGET = gutenbrowser
@@ -40,6 +39,6 @@ TARGET = gutenbrowser
40INCLUDEPATH += $(OPIEDIR)/include 39INCLUDEPATH += $(OPIEDIR)/include
41DEPENDPATH += $(OPIEDIR)/include 40DEPENDPATH += $(OPIEDIR)/include
42DESTDIR = $(OPIEDIR)/bin 41DESTDIR = $(OPIEDIR)/bin
43LIBS += -lqpe -lpthread -lftplib -lopie 42LIBS += -lqpe -lpthread -lftplib -lopiecore2 -lopieui2
44 43
45include ( $(OPIEDIR)/include.pro ) 44include ( $(OPIEDIR)/include.pro )