summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-reader/AportisCodec.mak166
-rw-r--r--noncore/apps/opie-reader/AportisCodec.omak139
-rw-r--r--noncore/apps/opie-reader/AportisCodec.wmak127
-rw-r--r--noncore/apps/opie-reader/AportisCodec.wpro17
-rw-r--r--noncore/apps/opie-reader/AportisCodec.zmak127
-rw-r--r--noncore/apps/opie-reader/AportisCodec.zpro17
-rw-r--r--noncore/apps/opie-reader/CDrawBuffer.cpp1
-rw-r--r--noncore/apps/opie-reader/CHM.mak177
-rw-r--r--noncore/apps/opie-reader/CHM.omak140
-rw-r--r--noncore/apps/opie-reader/CHM.zmak140
-rw-r--r--noncore/apps/opie-reader/CHM.zpro16
-rw-r--r--noncore/apps/opie-reader/FontControl.cpp1
-rw-r--r--noncore/apps/opie-reader/HTMLFilter.mak170
-rw-r--r--noncore/apps/opie-reader/HTMLFilter.omak131
-rw-r--r--noncore/apps/opie-reader/HTMLFilter.wmak131
-rw-r--r--noncore/apps/opie-reader/HTMLFilter.wpro17
-rw-r--r--noncore/apps/opie-reader/HTMLFilter.zmak131
-rw-r--r--noncore/apps/opie-reader/HTMLFilter.zpro17
-rw-r--r--noncore/apps/opie-reader/PluckerCodec.mak176
-rw-r--r--noncore/apps/opie-reader/PluckerCodec.omak138
-rw-r--r--noncore/apps/opie-reader/PluckerCodec.wmak138
-rw-r--r--noncore/apps/opie-reader/PluckerCodec.wpro16
-rw-r--r--noncore/apps/opie-reader/PluckerCodec.zmak138
-rw-r--r--noncore/apps/opie-reader/PluckerCodec.zpro16
-rw-r--r--noncore/apps/opie-reader/QTReaderApp.cpp9931
-rw-r--r--noncore/apps/opie-reader/WeaselCodec.mak166
-rw-r--r--noncore/apps/opie-reader/WeaselCodec.omak127
-rw-r--r--noncore/apps/opie-reader/WeaselCodec.wmak127
-rw-r--r--noncore/apps/opie-reader/WeaselCodec.wpro15
-rw-r--r--noncore/apps/opie-reader/WeaselCodec.zmak127
-rw-r--r--noncore/apps/opie-reader/WeaselCodec.zpro15
-rw-r--r--noncore/apps/opie-reader/codeclib.mak195
-rw-r--r--noncore/apps/opie-reader/codeclib.omak160
-rw-r--r--noncore/apps/opie-reader/codeclib.wmak160
-rw-r--r--noncore/apps/opie-reader/codeclib.wpro15
-rw-r--r--noncore/apps/opie-reader/codeclib.zmak160
-rw-r--r--noncore/apps/opie-reader/codeclib.zpro15
-rw-r--r--noncore/apps/opie-reader/iSiloCodec.mak162
-rw-r--r--noncore/apps/opie-reader/iSiloCodec.omak123
-rw-r--r--noncore/apps/opie-reader/iSiloCodec.wmak123
-rw-r--r--noncore/apps/opie-reader/iSiloCodec.wpro17
-rw-r--r--noncore/apps/opie-reader/iSiloCodec.zmak123
-rw-r--r--noncore/apps/opie-reader/iSiloCodec.zpro17
-rw-r--r--noncore/apps/opie-reader/opie-reader.pro2
-rw-r--r--noncore/apps/opie-reader/pdblib.mak161
-rw-r--r--noncore/apps/opie-reader/pdblib.omak122
-rw-r--r--noncore/apps/opie-reader/pdblib.wmak122
-rw-r--r--noncore/apps/opie-reader/pdblib.wpro14
-rw-r--r--noncore/apps/opie-reader/pdblib.zmak122
-rw-r--r--noncore/apps/opie-reader/pdblib.zpro14
-rw-r--r--noncore/apps/opie-reader/pluckerbaselib.mak169
-rw-r--r--noncore/apps/opie-reader/pluckerbaselib.omak131
-rw-r--r--noncore/apps/opie-reader/pluckerbaselib.wmak131
-rw-r--r--noncore/apps/opie-reader/pluckerbaselib.wpro14
-rw-r--r--noncore/apps/opie-reader/pluckerbaselib.zmak131
-rw-r--r--noncore/apps/opie-reader/pluckerbaselib.zpro14
-rw-r--r--noncore/apps/opie-reader/ppmsCodec.mak178
-rw-r--r--noncore/apps/opie-reader/ppmsCodec.omak141
-rw-r--r--noncore/apps/opie-reader/ppmsCodec.wmak141
-rw-r--r--noncore/apps/opie-reader/ppmsCodec.wpro17
-rw-r--r--noncore/apps/opie-reader/ppmsCodec.zmak141
-rw-r--r--noncore/apps/opie-reader/ppmsCodec.zpro17
-rw-r--r--noncore/apps/opie-reader/reader.mak591
-rw-r--r--noncore/apps/opie-reader/reader.omak605
-rw-r--r--noncore/apps/opie-reader/reader.staticmak846
-rw-r--r--noncore/apps/opie-reader/reader.staticzmak862
-rw-r--r--noncore/apps/opie-reader/reader.wmak604
-rw-r--r--noncore/apps/opie-reader/reader.wpro93
-rw-r--r--noncore/apps/opie-reader/reader.zmak605
-rw-r--r--noncore/apps/opie-reader/reader.zpro95
-rw-r--r--noncore/apps/opie-reader/reader/reader.pro12
-rw-r--r--noncore/apps/opie-reader/static.h0
-rw-r--r--noncore/apps/opie-reader/useqpe.h0
73 files changed, 4970 insertions, 15190 deletions
diff --git a/noncore/apps/opie-reader/AportisCodec.mak b/noncore/apps/opie-reader/AportisCodec.mak
deleted file mode 100644
index 89bf57d..0000000
--- a/noncore/apps/opie-reader/AportisCodec.mak
+++ b/dev/null
@@ -1,166 +0,0 @@
1#############################################################################
2# Makefile for building: libAportis.so.1.0.0
3# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:36:46 2004
4# Project: AportisCodec.pro
5# Template: lib
6# Command: $(QMAKE) -o AportisCodec.mak AportisCodec.pro
7#############################################################################
8
9####### Compiler, tools and options
10
11CC = gcc
12CXX = g++
13LEX = flex
14YACC = yacc
15CFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
16CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
17LEXFLAGS =
18YACCFLAGS= -d
19INCPATH = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
20LINK = g++
21LFLAGS = -shared -Wl,-soname,libAportis.so.1
22LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_pdb -lreader_codec -lqt-mt -lXext -lX11 -lm -lpthread
23AR = ar cqs
24RANLIB =
25MOC = $(QTDIR)/bin/moc
26UIC = $(QTDIR)/bin/uic
27QMAKE = qmake
28TAR = tar -cf
29GZIP = gzip -9f
30COPY = cp -f
31COPY_FILE= $(COPY)
32COPY_DIR = $(COPY) -r
33DEL_FILE = rm -f
34SYMLINK = ln -sf
35DEL_DIR = rmdir
36MOVE = mv -f
37CHK_DIR_EXISTS= test -d
38MKDIR = mkdir -p
39
40####### Output directory
41
42OBJECTS_DIR = QREADEROBJS/
43
44####### Files
45
46HEADERS = Aportis.h
47SOURCES = Aportis.cpp
48OBJECTS = QREADEROBJS/Aportis.o
49FORMS =
50UICDECLS =
51UICIMPLS =
52SRCMOC =
53OBJMOC =
54 DIST = AportisCodec.pro
55QMAKE_TARGET = Aportis
56DESTDIR = $(READERDIR)/codecs/
57TARGET = libAportis.so.1.0.0
58 TARGETA= $(READERDIR)/codecs/libAportis.a
59 TARGETD= libAportis.so.1.0.0
60 TARGET0= libAportis.so
61 TARGET1= libAportis.so.1
62 TARGET2= libAportis.so.1.0
63
64first: all
65####### Implicit rules
66
67.SUFFIXES: .c .o .cpp .cc .cxx .C
68
69.cpp.o:
70 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
71
72.cc.o:
73 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
74
75.cxx.o:
76 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
77
78.C.o:
79 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
80
81.c.o:
82 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
83
84####### Build rules
85
86all: AportisCodec.mak $(READERDIR)/codecs/$(TARGET)
87
88$(READERDIR)/codecs/$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)
89 test -d $(READERDIR)/codecs/ || mkdir -p $(READERDIR)/codecs/
90 -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
91 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
92 -ln -s $(TARGET) $(TARGET0)
93 -ln -s $(TARGET) $(TARGET1)
94 -ln -s $(TARGET) $(TARGET2)
95 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET)
96 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0)
97 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET1)
98 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET2)
99 -$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/codecs/
100
101
102
103staticlib: $(TARGETA)
104
105$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
106 -$(DEL_FILE) $(TARGETA)
107 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
108
109mocables: $(SRCMOC)
110uicables: $(UICDECLS) $(UICIMPLS)
111
112$(MOC):
113 ( cd $(QTDIR)/src/moc ; $(MAKE) )
114
115AportisCodec.mak: AportisCodec.pro /usr/lib/qt3/mkspecs/default/qmake.conf
116 $(QMAKE) -o AportisCodec.mak AportisCodec.pro
117qmake:
118 @$(QMAKE) -o AportisCodec.mak AportisCodec.pro
119
120dist:
121 @mkdir -p QREADEROBJS/Aportis && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/Aportis/ && ( cd `dirname QREADEROBJS/Aportis` && $(TAR) Aportis.tar Aportis && $(GZIP) Aportis.tar ) && $(MOVE) `dirname QREADEROBJS/Aportis`/Aportis.tar.gz . && $(DEL_FILE) -r QREADEROBJS/Aportis
122
123mocclean:
124
125uiclean:
126
127yaccclean:
128lexclean:
129clean:
130 -$(DEL_FILE) $(OBJECTS)
131 -$(DEL_FILE) *~ core *.core
132
133
134####### Sub-libraries
135
136distclean: clean
137 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET) $(TARGET)
138 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0) $(READERDIR)/codecs/$(TARGET1) $(READERDIR)/codecs/$(TARGET2) $(TARGETA)
139
140
141FORCE:
142
143####### Compile
144
145QREADEROBJS/Aportis.o: Aportis.cpp Aportis.h \
146 my_list.h \
147 Bkmks.h \
148 QREADERINC/static.h \
149 CExpander.h \
150 pdb.h \
151 QREADERINC/useqpe.h \
152 config.h \
153 StyleConsts.h \
154 Markups.h \
155 names.h \
156 linktype.h \
157 ustring.h \
158 Filedata.h
159 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/Aportis.o Aportis.cpp
160
161####### Install
162
163install: all
164
165uninstall:
166
diff --git a/noncore/apps/opie-reader/AportisCodec.omak b/noncore/apps/opie-reader/AportisCodec.omak
deleted file mode 100644
index 2de7cd6..0000000
--- a/noncore/apps/opie-reader/AportisCodec.omak
+++ b/dev/null
@@ -1,139 +0,0 @@
1#############################################################################
2# Makefile for building libAportis.so.1.0.0
3# Generated by tmake at 15:14, 2004/05/08
4# Project: AportisCodec.opro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
14 INCPATH =-IOREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =-shared -Wl,-soname,libAportis.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
18 AR =arm-linux-ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =Aportis.h \
29 CExpander.h \
30 OREADERINC/useqpe.h \
31 config.h \
32 ustring.h \
33 StyleConsts.h \
34 Markups.h \
35 names.h \
36 linktype.h \
37 pdb.h \
38 my_list.h \
39 Bkmks.h \
40 Filedata.h
41 SOURCES =Aportis.cpp
42 OBJECTS =OREADEROBJS/Aportis.o
43 INTERFACES =
44 UICDECLS =
45 UICIMPLS =
46 SRCMOC =
47 OBJMOC =
48 DIST =
49 TARGET =libAportis.so.1.0.0
50 TARGETA =$(QTDIR)/plugins/reader/codecs/libAportis.a
51 TARGETD =libAportis.so.1.0.0
52 TARGET0 =libAportis.so
53 TARGET1 =libAportis.so.1
54 TARGET2 =libAportis.so.1.0
55INTERFACE_DECL_PATH = .
56
57####### Implicit rules
58
59.SUFFIXES: .cpp .cxx .cc .C .c
60
61.cpp.o:
62 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
63
64.cxx.o:
65 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
66
67.cc.o:
68 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
69
70.C.o:
71 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
72
73.c.o:
74 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
75
76####### Build rules
77
78
79all: $(QTDIR)/plugins/reader/codecs/libAportis.so.1.0.0
80
81$(QTDIR)/plugins/reader/codecs/libAportis.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
82 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
83 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
84 -ln -s $(TARGET) $(TARGET0)
85 -ln -s $(TARGET) $(TARGET1)
86 -ln -s $(TARGET) $(TARGET2)
87 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
88 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
89 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
90 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
91 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
92
93staticlib: $(TARGETA)
94
95$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
96 -rm -f $(TARGETA)
97 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
98
99moc: $(SRCMOC)
100
101tmake: AportisCodec.omak
102
103AportisCodec.omak: AportisCodec.opro
104 tmake AportisCodec.opro -o AportisCodec.omak
105
106dist:
107 $(TAR) AportisCodec.opro.tar AportisCodec.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
108 $(GZIP) AportisCodec.opro.tar
109
110clean:
111 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
112 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
113 -rm -f *~ core
114
115####### Sub-libraries
116
117
118###### Combined headers
119
120
121####### Compile
122
123OREADEROBJS/Aportis.o: Aportis.cpp \
124 Aportis.h \
125 CExpander.h \
126 OREADERINC/useqpe.h \
127 config.h \
128 ustring.h \
129 StyleConsts.h \
130 Markups.h \
131 names.h \
132 linktype.h \
133 pdb.h \
134 my_list.h \
135 Bkmks.h \
136 Filedata.h \
137 OREADERINC/static.h
138 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/Aportis.o Aportis.cpp
139
diff --git a/noncore/apps/opie-reader/AportisCodec.wmak b/noncore/apps/opie-reader/AportisCodec.wmak
deleted file mode 100644
index 02c9ef0..0000000
--- a/noncore/apps/opie-reader/AportisCodec.wmak
+++ b/dev/null
@@ -1,127 +0,0 @@
1#############################################################################
2# Makefile for building libAportis.so.1.0.0
3# Generated by tmake at 23:23, 2004/03/09
4# Project: AportisCodec.wpro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =gcc-2.96
11 CXX =g++-2.96
12 CFLAGS =-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
14 INCPATH =-IWSREADERINC -I$(QTDIR)/include
15 LINK =g++-2.96
16 LFLAGS =-shared -Wl,-soname,libAportis.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
18 AR =ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =Aportis.h
29 SOURCES =Aportis.cpp
30 OBJECTS =WSREADEROBJS/Aportis.o
31 INTERFACES =
32 UICDECLS =
33 UICIMPLS =
34 SRCMOC =
35 OBJMOC =
36 DIST =
37 TARGET =libAportis.so.1.0.0
38 TARGETA =$(QTDIR)/plugins/reader/codecs/libAportis.a
39 TARGETD =libAportis.so.1.0.0
40 TARGET0 =libAportis.so
41 TARGET1 =libAportis.so.1
42 TARGET2 =libAportis.so.1.0
43INTERFACE_DECL_PATH = .
44
45####### Implicit rules
46
47.SUFFIXES: .cpp .cxx .cc .C .c
48
49.cpp.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51
52.cxx.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54
55.cc.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57
58.C.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60
61.c.o:
62 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
63
64####### Build rules
65
66
67all: $(QTDIR)/plugins/reader/codecs/libAportis.so.1.0.0
68
69$(QTDIR)/plugins/reader/codecs/libAportis.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
70 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
71 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
72 -ln -s $(TARGET) $(TARGET0)
73 -ln -s $(TARGET) $(TARGET1)
74 -ln -s $(TARGET) $(TARGET2)
75 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
76 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
77 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
78 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
79 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
80
81staticlib: $(TARGETA)
82
83$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
84 -rm -f $(TARGETA)
85 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
86
87moc: $(SRCMOC)
88
89tmake: AportisCodec.wmak
90
91AportisCodec.wmak: AportisCodec.wpro
92 tmake AportisCodec.wpro -o AportisCodec.wmak
93
94dist:
95 $(TAR) AportisCodec.wpro.tar AportisCodec.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
96 $(GZIP) AportisCodec.wpro.tar
97
98clean:
99 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
100 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
101 -rm -f *~ core
102
103####### Sub-libraries
104
105
106###### Combined headers
107
108
109####### Compile
110
111WSREADEROBJS/Aportis.o: Aportis.cpp \
112 Aportis.h \
113 CExpander.h \
114 WSREADERINC/useqpe.h \
115 config.h \
116 ustring.h \
117 StyleConsts.h \
118 Markups.h \
119 names.h \
120 linktype.h \
121 pdb.h \
122 my_list.h \
123 Bkmks.h \
124 Filedata.h \
125 WSREADERINC/static.h
126 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/Aportis.o Aportis.cpp
127
diff --git a/noncore/apps/opie-reader/AportisCodec.wpro b/noncore/apps/opie-reader/AportisCodec.wpro
deleted file mode 100644
index b21f2cb..0000000
--- a/noncore/apps/opie-reader/AportisCodec.wpro
+++ b/dev/null
@@ -1,17 +0,0 @@
1 TEMPLATE= lib
2 CONFIG = qt warn_on release dll
3 HEADERS = Aportis.h
4
5 SOURCES = Aportis.cpp
6
7
8 INTERFACES=
9 DESTDIR = $(QTDIR)/plugins/reader/codecs
10 TARGET = Aportis
11LIBS += -lreader_pdb -lreader_codec
12
13
14OBJECTS_DIR = WSREADEROBJS
15MOC_DIR = WSREADERMOCS
16 INCLUDEPATH+= WSREADERINC
17 DEPENDPATH+= WSREADERINC
diff --git a/noncore/apps/opie-reader/AportisCodec.zmak b/noncore/apps/opie-reader/AportisCodec.zmak
deleted file mode 100644
index 6fb0444..0000000
--- a/noncore/apps/opie-reader/AportisCodec.zmak
+++ b/dev/null
@@ -1,127 +0,0 @@
1#############################################################################
2# Makefile for building libAportis.so.1.0.0
3# Generated by tmake at 15:17, 2004/05/08
4# Project: AportisCodec.zpro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
14 INCPATH =-IZREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =-shared -Wl,-soname,libAportis.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
18 AR =arm-linux-ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =Aportis.h
29 SOURCES =Aportis.cpp
30 OBJECTS =ZREADEROBJS/Aportis.o
31 INTERFACES =
32 UICDECLS =
33 UICIMPLS =
34 SRCMOC =
35 OBJMOC =
36 DIST =
37 TARGET =libAportis.so.1.0.0
38 TARGETA =$(QTDIR)/plugins/reader/codecs/libAportis.a
39 TARGETD =libAportis.so.1.0.0
40 TARGET0 =libAportis.so
41 TARGET1 =libAportis.so.1
42 TARGET2 =libAportis.so.1.0
43INTERFACE_DECL_PATH = .
44
45####### Implicit rules
46
47.SUFFIXES: .cpp .cxx .cc .C .c
48
49.cpp.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51
52.cxx.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54
55.cc.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57
58.C.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60
61.c.o:
62 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
63
64####### Build rules
65
66
67all: $(QTDIR)/plugins/reader/codecs/libAportis.so.1.0.0
68
69$(QTDIR)/plugins/reader/codecs/libAportis.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
70 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
71 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
72 -ln -s $(TARGET) $(TARGET0)
73 -ln -s $(TARGET) $(TARGET1)
74 -ln -s $(TARGET) $(TARGET2)
75 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
76 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
77 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
78 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
79 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
80
81staticlib: $(TARGETA)
82
83$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
84 -rm -f $(TARGETA)
85 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
86
87moc: $(SRCMOC)
88
89tmake: AportisCodec.zmak
90
91AportisCodec.zmak: AportisCodec.zpro
92 tmake AportisCodec.zpro -o AportisCodec.zmak
93
94dist:
95 $(TAR) AportisCodec.zpro.tar AportisCodec.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
96 $(GZIP) AportisCodec.zpro.tar
97
98clean:
99 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
100 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
101 -rm -f *~ core
102
103####### Sub-libraries
104
105
106###### Combined headers
107
108
109####### Compile
110
111ZREADEROBJS/Aportis.o: Aportis.cpp \
112 Aportis.h \
113 CExpander.h \
114 ZREADERINC/useqpe.h \
115 config.h \
116 ustring.h \
117 StyleConsts.h \
118 Markups.h \
119 names.h \
120 linktype.h \
121 pdb.h \
122 my_list.h \
123 Bkmks.h \
124 Filedata.h \
125 ZREADERINC/static.h
126 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/Aportis.o Aportis.cpp
127
diff --git a/noncore/apps/opie-reader/AportisCodec.zpro b/noncore/apps/opie-reader/AportisCodec.zpro
deleted file mode 100644
index 8e4b26c..0000000
--- a/noncore/apps/opie-reader/AportisCodec.zpro
+++ b/dev/null
@@ -1,17 +0,0 @@
1 TEMPLATE= lib
2 CONFIG = qt warn_on release dll
3 HEADERS = Aportis.h
4
5 SOURCES = Aportis.cpp
6
7
8 INTERFACES=
9 DESTDIR = $(QTDIR)/plugins/reader/codecs
10 TARGET = Aportis
11LIBS += -lreader_pdb -lreader_codec
12
13
14OBJECTS_DIR = ZREADEROBJS
15MOC_DIR = ZREADERMOCS
16 INCLUDEPATH+= ZREADERINC
17 DEPENDPATH+= ZREADERINC
diff --git a/noncore/apps/opie-reader/CDrawBuffer.cpp b/noncore/apps/opie-reader/CDrawBuffer.cpp
index cd79fec..caccf1b 100644
--- a/noncore/apps/opie-reader/CDrawBuffer.cpp
+++ b/noncore/apps/opie-reader/CDrawBuffer.cpp
@@ -1,864 +1,863 @@
1#include "CDrawBuffer.h" 1#include "CDrawBuffer.h"
2#include "FontControl.h" 2#include "FontControl.h"
3#include <qfontmetrics.h> 3#include <qfontmetrics.h>
4#include <qpainter.h> 4#include <qpainter.h>
5#include <qpixmap.h> 5#include <qpixmap.h>
6#include <qimage.h> 6#include <qimage.h>
7#include "useqpe.h" 7#include "useqpe.h"
8#include "opie.h"
9 8
10CDrawBuffer::~CDrawBuffer() 9CDrawBuffer::~CDrawBuffer()
11{ 10{
12 while (!segs.isEmpty()) segs.erase(0); 11 while (!segs.isEmpty()) segs.erase(0);
13} 12}
14 13
15void CDrawBuffer::setright(CDrawBuffer& rhs, int f) 14void CDrawBuffer::setright(CDrawBuffer& rhs, int f)
16{ 15{
17 int i; 16 int i;
18 len = rhs.len; 17 len = rhs.len;
19 fc = rhs.fc; 18 fc = rhs.fc;
20 m_ascent = m_descent = m_lineSpacing = m_lineExtraSpacing = 0; 19 m_ascent = m_descent = m_lineSpacing = m_lineExtraSpacing = 0;
21 while (!segs.isEmpty()) 20 while (!segs.isEmpty())
22 { 21 {
23 segs.erase(0); 22 segs.erase(0);
24 } 23 }
25 for (CList<textsegment>::iterator iter = rhs.segs.begin(); iter != rhs.segs.end(); ) 24 for (CList<textsegment>::iterator iter = rhs.segs.begin(); iter != rhs.segs.end(); )
26 { 25 {
27 CList<textsegment>::iterator next = iter; 26 CList<textsegment>::iterator next = iter;
28 iter++; 27 iter++;
29 if (iter == rhs.segs.end() || iter->start > f) 28 if (iter == rhs.segs.end() || iter->start > f)
30 { 29 {
31 int st = next->start-f; 30 int st = next->start-f;
32 if (st < 0) st = 0; 31 if (st < 0) st = 0;
33 32
34 CStyle _style = next->style; 33 CStyle _style = next->style;
35 segs.push_back(textsegment(st,next->style)); 34 segs.push_back(textsegment(st,next->style));
36 } 35 }
37 } 36 }
38 for (i = f; rhs[i] != '\0'; i++) (*this)[i-f] = rhs[i]; 37 for (i = f; rhs[i] != '\0'; i++) (*this)[i-f] = rhs[i];
39 (*this)[i-f] = '\0'; 38 (*this)[i-f] = '\0';
40 len = i; 39 len = i;
41} 40}
42 41
43CDrawBuffer& CDrawBuffer::operator=(CDrawBuffer& rhs) 42CDrawBuffer& CDrawBuffer::operator=(CDrawBuffer& rhs)
44{ 43{
45 int i; 44 int i;
46// //qDebug("Trying 2"); 45// //qDebug("Trying 2");
47 len = rhs.len; 46 len = rhs.len;
48 m_ascent = rhs.m_ascent; 47 m_ascent = rhs.m_ascent;
49 m_descent = rhs.m_descent; 48 m_descent = rhs.m_descent;
50 m_lineSpacing = rhs.m_lineSpacing; 49 m_lineSpacing = rhs.m_lineSpacing;
51 m_lineExtraSpacing = rhs.m_lineExtraSpacing; 50 m_lineExtraSpacing = rhs.m_lineExtraSpacing;
52 m_showPartial = rhs.m_showPartial; 51 m_showPartial = rhs.m_showPartial;
53 while (!segs.isEmpty()) 52 while (!segs.isEmpty())
54 { 53 {
55 segs.erase(0); 54 segs.erase(0);
56 } 55 }
57 for (CList<textsegment>::iterator iter = rhs.segs.begin(); iter != rhs.segs.end(); iter++) 56 for (CList<textsegment>::iterator iter = rhs.segs.begin(); iter != rhs.segs.end(); iter++)
58 { 57 {
59 segs.push_back(*iter); 58 segs.push_back(*iter);
60 } 59 }
61 for (i = 0; rhs[i] != '\0'; i++) (*this)[i] = rhs[i]; 60 for (i = 0; rhs[i] != '\0'; i++) (*this)[i] = rhs[i];
62 (*this)[i] = '\0'; 61 (*this)[i] = '\0';
63 len = i; 62 len = i;
64// //qDebug("Tried 2"); 63// //qDebug("Tried 2");
65 return *this; 64 return *this;
66} 65}
67 66
68CDrawBuffer& CDrawBuffer::operator=(const tchar*sztmp) 67CDrawBuffer& CDrawBuffer::operator=(const tchar*sztmp)
69{ 68{
70 int i; 69 int i;
71 while (!segs.isEmpty()) 70 while (!segs.isEmpty())
72 { 71 {
73 segs.erase(0); 72 segs.erase(0);
74 } 73 }
75 segs.push_back(textsegment(0, CStyle())); 74 segs.push_back(textsegment(0, CStyle()));
76 for (i = 0; sztmp[i] != '\0'; i++) (*this)[i] = sztmp[i]; 75 for (i = 0; sztmp[i] != '\0'; i++) (*this)[i] = sztmp[i];
77 (*this)[i] = '\0'; 76 (*this)[i] = '\0';
78 len = i; 77 len = i;
79 return *this; 78 return *this;
80} 79}
81 80
82void CDrawBuffer::empty() 81void CDrawBuffer::empty()
83{ 82{
84 m_bSop = false; 83 m_bSop = false;
85 m_bEop = false; 84 m_bEop = false;
86 m_bBop = false; 85 m_bBop = false;
87 len = 0; 86 len = 0;
88 (*this)[0] = 0; 87 (*this)[0] = 0;
89 while (!segs.isEmpty()) 88 while (!segs.isEmpty())
90 { 89 {
91 segs.erase(0); 90 segs.erase(0);
92 } 91 }
93 segs.push_back(textsegment(0,CStyle())); 92 segs.push_back(textsegment(0,CStyle()));
94 m_ascent = m_descent = m_lineSpacing = m_lineExtraSpacing = 0; 93 m_ascent = m_descent = m_lineSpacing = m_lineExtraSpacing = 0;
95 m_bEof = false; 94 m_bEof = false;
96} 95}
97 96
98void CDrawBuffer::setendpara(const CStyle& _style/* = ucFontBase*/) 97void CDrawBuffer::setendpara(const CStyle& _style/* = ucFontBase*/)
99{ 98{
100 m_bEop = true; 99 m_bEop = true;
101 if (len == 0) 100 if (len == 0)
102 { 101 {
103 segs.first().start = 0; 102 segs.first().start = 0;
104 segs.first().style = _style; 103 segs.first().style = _style;
105 } 104 }
106} 105}
107 106
108void CDrawBuffer::addch(tchar ch, CStyle _style/* = ucFontBase*/) 107void CDrawBuffer::addch(tchar ch, CStyle _style/* = ucFontBase*/)
109{ 108{
110 if (len == 0) 109 if (len == 0)
111 { 110 {
112 segs.first().start = 0; 111 segs.first().start = 0;
113 segs.first().style = _style; 112 segs.first().style = _style;
114 } 113 }
115 else if (_style != segs.last().style) 114 else if (_style != segs.last().style)
116 { 115 {
117 segs.push_back(textsegment(len, _style)); 116 segs.push_back(textsegment(len, _style));
118 } 117 }
119 (*this)[len++] = ch; 118 (*this)[len++] = ch;
120} 119}
121 120
122void CDrawBuffer::truncate(int n) 121void CDrawBuffer::truncate(int n)
123{ 122{
124 len = n; 123 len = n;
125 (*this)[n] = 0; 124 (*this)[n] = 0;
126} 125}
127 126
128int CDrawBuffer::width(int availht, int numchars, bool onscreen, int scwidth, unsigned short _lborder, unsigned short _rborder) 127int CDrawBuffer::width(int availht, int numchars, bool onscreen, int scwidth, unsigned short _lborder, unsigned short _rborder)
129{ 128{
130 int gzoom = fc->gzoom(); 129 int gzoom = fc->gzoom();
131 int currentx = 0, end = 0; 130 int currentx = 0, end = 0;
132 QString text = (numchars < 0) ? toQString(data()) : toQString(data(), numchars); 131 QString text = (numchars < 0) ? toQString(data()) : toQString(data(), numchars);
133 CList<textsegment>::iterator textstart = segs.begin(); 132 CList<textsegment>::iterator textstart = segs.begin();
134 int extraspace = 0; 133 int extraspace = 0;
135 bool just = (onscreen && !m_bEop && textstart->style.getJustify() == m_AlignJustify); 134 bool just = (onscreen && !m_bEop && textstart->style.getJustify() == m_AlignJustify);
136 int spaces = 0; 135 int spaces = 0;
137 int spacesofar = 0; 136 int spacesofar = 0;
138 int spacenumber = 0; 137 int spacenumber = 0;
139 int nonspace = 0; 138 int nonspace = 0;
140 if (just) 139 if (just)
141 { 140 {
142 for (int i = 0; i < len; i++) 141 for (int i = 0; i < len; i++)
143 { 142 {
144 if ((*this)[i] != ' ') 143 if ((*this)[i] != ' ')
145 { 144 {
146 nonspace = i; 145 nonspace = i;
147 break; 146 break;
148 } 147 }
149 } 148 }
150#ifdef _WINDOWS 149#ifdef _WINDOWS
151 for (i = nonspace; i < len; i++) 150 for (i = nonspace; i < len; i++)
152#else 151#else
153 for (int i = nonspace; i < len; i++) 152 for (int i = nonspace; i < len; i++)
154#endif 153#endif
155 { 154 {
156 if ((*this)[i] == ' ') 155 if ((*this)[i] == ' ')
157 { 156 {
158 spaces++; 157 spaces++;
159 } 158 }
160 } 159 }
161 if (spaces == 0) 160 if (spaces == 0)
162 { 161 {
163 just = false; 162 just = false;
164 } 163 }
165 else 164 else
166 { 165 {
167 extraspace = (scwidth - (_lborder+_rborder) - rightMargin() - leftMargin() - width(availht)); 166 extraspace = (scwidth - (_lborder+_rborder) - rightMargin() - leftMargin() - width(availht));
168 if (extraspace == 0) just = false; 167 if (extraspace == 0) just = false;
169 } 168 }
170 } 169 }
171 CList<textsegment>::iterator textend = textstart; 170 CList<textsegment>::iterator textend = textstart;
172 do 171 do
173 { 172 {
174 textend++; 173 textend++;
175 end = (textend != segs.end()) ? textend->start : len; 174 end = (textend != segs.end()) ? textend->start : len;
176 if (numchars >= 0 && end > numchars) 175 if (numchars >= 0 && end > numchars)
177 { 176 {
178 end = numchars; 177 end = numchars;
179 } 178 }
180 CStyle currentstyle = textstart->style; 179 CStyle currentstyle = textstart->style;
181 if (currentstyle.isPicture()) 180 if (currentstyle.isPicture())
182 { 181 {
183 if (currentstyle.canScale()) 182 if (currentstyle.canScale())
184 { 183 {
185 int ht = (gzoom*currentstyle.getPicture()->height())/100; 184 int ht = (gzoom*currentstyle.getPicture()->height())/100;
186 int wt = (gzoom*currentstyle.getPicture()->width())/100; 185 int wt = (gzoom*currentstyle.getPicture()->width())/100;
187 if (ht > availht) 186 if (ht > availht)
188 { 187 {
189 wt = (wt*availht)/ht; 188 wt = (wt*availht)/ht;
190 } 189 }
191 currentx += wt; 190 currentx += wt;
192 } 191 }
193 else 192 else
194 { 193 {
195 currentx += currentstyle.getPicture()->width(); 194 currentx += currentstyle.getPicture()->width();
196 } 195 }
197 } 196 }
198 else 197 else
199 { 198 {
200 if (currentstyle.isMono() && !fc->hasCourier()) 199 if (currentstyle.isMono() && !fc->hasCourier())
201 { 200 {
202 int cw = (7*fc->getsize(currentstyle))/10; 201 int cw = (7*fc->getsize(currentstyle))/10;
203 currentx += cw*(end-textstart->start); 202 currentx += cw*(end-textstart->start);
204 } 203 }
205 else 204 else
206 { 205 {
207 QFont f(currentstyle.isMono() ? QString(fc->fixedfontname()) : fc->name(), fc->getsize(currentstyle), (currentstyle.isBold()) ? QFont::Bold : QFont::Normal, (currentstyle.isItalic()) ); 206 QFont f(currentstyle.isMono() ? QString(fc->fixedfontname()) : fc->name(), fc->getsize(currentstyle), (currentstyle.isBold()) ? QFont::Bold : QFont::Normal, (currentstyle.isItalic()) );
208 // f.setUnderline(currentstyle.isUnderline()); 207 // f.setUnderline(currentstyle.isUnderline());
209 QString str = text.mid(textstart->start, end-textstart->start); 208 QString str = text.mid(textstart->start, end-textstart->start);
210 QFontMetrics fm(f); 209 QFontMetrics fm(f);
211 if (just) 210 if (just)
212 { 211 {
213 int lastspace = -1; 212 int lastspace = -1;
214 int nsp = 0; 213 int nsp = 0;
215 int cx = currentx; 214 int cx = currentx;
216 while ((nsp = str.find(" ", lastspace+1)) >= 0) 215 while ((nsp = str.find(" ", lastspace+1)) >= 0)
217 { 216 {
218 if (nsp > nonspace) 217 if (nsp > nonspace)
219 { 218 {
220 spacenumber++; 219 spacenumber++;
221 int nexttoadd = (extraspace*spacenumber+spaces/2)/spaces - spacesofar; 220 int nexttoadd = (extraspace*spacenumber+spaces/2)/spaces - spacesofar;
222 QString nstr = str.mid(lastspace+1, nsp-lastspace); 221 QString nstr = str.mid(lastspace+1, nsp-lastspace);
223 int lw = fm.width(nstr); 222 int lw = fm.width(nstr);
224 cx += lw+nexttoadd; 223 cx += lw+nexttoadd;
225 spacesofar += nexttoadd; 224 spacesofar += nexttoadd;
226 lastspace = nsp; 225 lastspace = nsp;
227 } 226 }
228 else 227 else
229 { 228 {
230 QString nstr = str.mid(lastspace+1, nsp-lastspace); 229 QString nstr = str.mid(lastspace+1, nsp-lastspace);
231 // qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr); 230 // qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr);
232 int lw = fm.width(nstr); 231 int lw = fm.width(nstr);
233 cx += lw; 232 cx += lw;
234 lastspace = nsp; 233 lastspace = nsp;
235 } 234 }
236 } 235 }
237 QString nstr = str.right(str.length()-1-lastspace); 236 QString nstr = str.right(str.length()-1-lastspace);
238 cx += fm.width(nstr); 237 cx += fm.width(nstr);
239 currentx = cx; 238 currentx = cx;
240 } 239 }
241 else 240 else
242 { 241 {
243 currentx += fm.width(str); 242 currentx += fm.width(str);
244 } 243 }
245 } 244 }
246 } 245 }
247 textstart = textend; 246 textstart = textend;
248 } 247 }
249 while (textend != segs.end() && end != numchars && textstart->start < len); 248 while (textend != segs.end() && end != numchars && textstart->start < len);
250 return currentx; 249 return currentx;
251} 250}
252 251
253int CDrawBuffer::charwidth(int numchars, CStyle& currentstyle) 252int CDrawBuffer::charwidth(int numchars, CStyle& currentstyle)
254{ 253{
255 if (currentstyle.isPicture()) 254 if (currentstyle.isPicture())
256 { 255 {
257 int gzoom = fc->gzoom(); 256 int gzoom = fc->gzoom();
258 if (currentstyle.canScale()) 257 if (currentstyle.canScale())
259 { 258 {
260 return (gzoom*currentstyle.getPicture()->width())/100; 259 return (gzoom*currentstyle.getPicture()->width())/100;
261 } 260 }
262 else 261 else
263 { 262 {
264 return currentstyle.getPicture()->width(); 263 return currentstyle.getPicture()->width();
265 } 264 }
266 } 265 }
267 else 266 else
268 { 267 {
269 if (currentstyle.isMono() && !fc->hasCourier()) 268 if (currentstyle.isMono() && !fc->hasCourier())
270 { 269 {
271 return (7*fc->getsize(currentstyle))/10; 270 return (7*fc->getsize(currentstyle))/10;
272 } 271 }
273 else 272 else
274 { 273 {
275 QString text = QChar((data())[numchars]); 274 QString text = QChar((data())[numchars]);
276 QFont f(currentstyle.isMono() ? QString(fc->fixedfontname()) : fc->name(), fc->getsize(currentstyle), (currentstyle.isBold()) ? QFont::Bold : QFont::Normal, (currentstyle.isItalic()) ); 275 QFont f(currentstyle.isMono() ? QString(fc->fixedfontname()) : fc->name(), fc->getsize(currentstyle), (currentstyle.isBold()) ? QFont::Bold : QFont::Normal, (currentstyle.isItalic()) );
277 // f.setUnderline(currentstyle.isUnderline()); 276 // f.setUnderline(currentstyle.isUnderline());
278 QFontMetrics fm(f); 277 QFontMetrics fm(f);
279 return fm.width(text); 278 return fm.width(text);
280 } 279 }
281 } 280 }
282 return 0; 281 return 0;
283} 282}
284 283
285int CDrawBuffer::charwidth(int numchars) 284int CDrawBuffer::charwidth(int numchars)
286{ 285{
287 int gzoom = fc->gzoom(); 286 int gzoom = fc->gzoom();
288 int end = 0; 287 int end = 0;
289 QString text = QChar((data())[numchars]); 288 QString text = QChar((data())[numchars]);
290 CList<textsegment>::iterator textstart = segs.begin(); 289 CList<textsegment>::iterator textstart = segs.begin();
291 CList<textsegment>::iterator textend = textstart; 290 CList<textsegment>::iterator textend = textstart;
292 do 291 do
293 { 292 {
294 textend++; 293 textend++;
295 end = (textend != segs.end()) ? textend->start : len; 294 end = (textend != segs.end()) ? textend->start : len;
296 if (end <= numchars) 295 if (end <= numchars)
297 { 296 {
298 textstart = textend; 297 textstart = textend;
299 continue; 298 continue;
300 } 299 }
301 if (numchars >= 0 && end > numchars) 300 if (numchars >= 0 && end > numchars)
302 { 301 {
303 end = numchars; 302 end = numchars;
304 } 303 }
305 CStyle currentstyle = textstart->style; 304 CStyle currentstyle = textstart->style;
306 if (currentstyle.isPicture()) 305 if (currentstyle.isPicture())
307 { 306 {
308 if (currentstyle.canScale()) 307 if (currentstyle.canScale())
309 { 308 {
310 return (gzoom*currentstyle.getPicture()->width())/100; 309 return (gzoom*currentstyle.getPicture()->width())/100;
311 } 310 }
312 else 311 else
313 { 312 {
314 return currentstyle.getPicture()->width(); 313 return currentstyle.getPicture()->width();
315 } 314 }
316 } 315 }
317 else 316 else
318 { 317 {
319 if (currentstyle.isMono() && !fc->hasCourier()) 318 if (currentstyle.isMono() && !fc->hasCourier())
320 { 319 {
321 return (7*fc->getsize(currentstyle))/10; 320 return (7*fc->getsize(currentstyle))/10;
322 } 321 }
323 else 322 else
324 { 323 {
325 QFont f(currentstyle.isMono() ? QString(fc->fixedfontname()) : fc->name(), fc->getsize(currentstyle), (currentstyle.isBold()) ? QFont::Bold : QFont::Normal, (currentstyle.isItalic()) ); 324 QFont f(currentstyle.isMono() ? QString(fc->fixedfontname()) : fc->name(), fc->getsize(currentstyle), (currentstyle.isBold()) ? QFont::Bold : QFont::Normal, (currentstyle.isItalic()) );
326 // f.setUnderline(currentstyle.isUnderline()); 325 // f.setUnderline(currentstyle.isUnderline());
327 QFontMetrics fm(f); 326 QFontMetrics fm(f);
328 return fm.width(text); 327 return fm.width(text);
329 } 328 }
330 } 329 }
331 textstart = textend; 330 textstart = textend;
332 } 331 }
333 while (textend != segs.end() /* && end != numchars*/ && textstart->start < len); 332 while (textend != segs.end() /* && end != numchars*/ && textstart->start < len);
334 return 0; 333 return 0;
335} 334}
336 335
337 336
338 337
339int CDrawBuffer::leftMargin() 338int CDrawBuffer::leftMargin()
340{ 339{
341 return (segs.begin()->style.getLeftMargin()*fc->getsize(segs.begin()->style)+3)/6; 340 return (segs.begin()->style.getLeftMargin()*fc->getsize(segs.begin()->style)+3)/6;
342} 341}
343 342
344int CDrawBuffer::rightMargin() 343int CDrawBuffer::rightMargin()
345{ 344{
346 return (segs.begin()->style.getRightMargin()*fc->getsize(segs.begin()->style)+3)/6; 345 return (segs.begin()->style.getRightMargin()*fc->getsize(segs.begin()->style)+3)/6;
347} 346}
348 347
349int CDrawBuffer::offset(int scwidth, unsigned short _lborder, unsigned short _rborder, int availht) 348int CDrawBuffer::offset(int scwidth, unsigned short _lborder, unsigned short _rborder, int availht)
350{ 349{
351 int currentx = _lborder; 350 int currentx = _lborder;
352 switch(segs.begin()->style.getJustify()) 351 switch(segs.begin()->style.getJustify())
353 { 352 {
354 case m_AlignRight: 353 case m_AlignRight:
355 { 354 {
356 currentx = scwidth - _rborder - rightMargin() - width(availht); 355 currentx = scwidth - _rborder - rightMargin() - width(availht);
357 } 356 }
358 break; 357 break;
359 case m_AlignCentre: 358 case m_AlignCentre:
360 { 359 {
361 currentx = ( 360 currentx = (
362 scwidth - _lborder -_rborder + 361 scwidth - _lborder -_rborder +
363 leftMargin() - rightMargin() 362 leftMargin() - rightMargin()
364 - width(availht))/2 + _lborder; 363 - width(availht))/2 + _lborder;
365 } 364 }
366 break; 365 break;
367 case m_AlignJustify: 366 case m_AlignJustify:
368 case m_AlignLeft: 367 case m_AlignLeft:
369 currentx = _lborder + leftMargin(); 368 currentx = _lborder + leftMargin();
370 break; 369 break;
371 } 370 }
372 return currentx; 371 return currentx;
373} 372}
374 373
375void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int scwidth, unsigned short _lborder, unsigned short _rborder, const QColor& _bg, int availht) 374void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int scwidth, unsigned short _lborder, unsigned short _rborder, const QColor& _bg, int availht)
376{ 375{
377 CList<textsegment>::iterator textstart = segs.begin(); 376 CList<textsegment>::iterator textstart = segs.begin();
378 QColor paperColour = QColor(qRgb(textstart->style.pRed(), 377 QColor paperColour = QColor(qRgb(textstart->style.pRed(),
379 textstart->style.pGreen(), 378 textstart->style.pGreen(),
380 textstart->style.pBlue())); 379 textstart->style.pBlue()));
381 380
382 Highlight(_p, !(paperColour == _bg), _lborder, _y, scwidth-(_lborder+_rborder), paperColour); 381 Highlight(_p, !(paperColour == _bg), _lborder, _y, scwidth-(_lborder+_rborder), paperColour);
383 // Highlight(_p, true, _lborder, _y, scwidth-(_lborder+_rborder), paperColour); 382 // Highlight(_p, true, _lborder, _y, scwidth-(_lborder+_rborder), paperColour);
384 int gzoom = fc->gzoom(); 383 int gzoom = fc->gzoom();
385 int currentx = offset(scwidth, _lborder, _rborder, availht); 384 int currentx = offset(scwidth, _lborder, _rborder, availht);
386 if (!m_hastext) 385 if (!m_hastext)
387 { 386 {
388 for (CList<textsegment>::iterator iter = segs.begin(); iter != segs.end(); iter++) 387 for (CList<textsegment>::iterator iter = segs.begin(); iter != segs.end(); iter++)
389 { 388 {
390 CStyle currentstyle = iter->style; 389 CStyle currentstyle = iter->style;
391 if (currentstyle.isPicture()) 390 if (currentstyle.isPicture())
392 { 391 {
393 CStyle currentstyle = segs.begin()->style; 392 CStyle currentstyle = segs.begin()->style;
394 int ht = (gzoom*currentstyle.getPicture()->height())/100; 393 int ht = (gzoom*currentstyle.getPicture()->height())/100;
395 int wt = (gzoom*currentstyle.getPicture()->width())/100; 394 int wt = (gzoom*currentstyle.getPicture()->width())/100;
396 bool willscale = false; 395 bool willscale = false;
397 if (ht > availht) 396 if (ht > availht)
398 { 397 {
399 wt = (wt*availht)/ht; 398 wt = (wt*availht)/ht;
400 ht = availht; 399 ht = availht;
401 willscale = true; 400 willscale = true;
402 } 401 }
403 402
404 QPixmap pc; 403 QPixmap pc;
405 if ((willscale || gzoom != 100) && currentstyle.canScale()) 404 if ((willscale || gzoom != 100) && currentstyle.canScale())
406 { 405 {
407 QImage im = currentstyle.getPicture()->smoothScale(wt,ht); 406 QImage im = currentstyle.getPicture()->smoothScale(wt,ht);
408 pc.convertFromImage(im); 407 pc.convertFromImage(im);
409 } 408 }
410 else 409 else
411 { 410 {
412 pc.convertFromImage(*currentstyle.getPicture()); 411 pc.convertFromImage(*currentstyle.getPicture());
413 } 412 }
414 int yoffset = pc.height()/2; 413 int yoffset = pc.height()/2;
415 _p->drawPixmap( currentx, _y-yoffset, pc ); 414 _p->drawPixmap( currentx, _y-yoffset, pc );
416 currentx += pc.width(); 415 currentx += pc.width();
417 } 416 }
418 } 417 }
419 return; 418 return;
420 } 419 }
421 QString text = toQString(data()); 420 QString text = toQString(data());
422 int extraspace = 0; 421 int extraspace = 0;
423 bool just = (!m_bEop && textstart->style.getJustify() == m_AlignJustify); 422 bool just = (!m_bEop && textstart->style.getJustify() == m_AlignJustify);
424 int spaces = 0; 423 int spaces = 0;
425 int spacesofar = 0; 424 int spacesofar = 0;
426 int spacenumber = 0; 425 int spacenumber = 0;
427 int nonspace = 0; 426 int nonspace = 0;
428 if (just) 427 if (just)
429 { 428 {
430 for (int i = 0; i < len; i++) 429 for (int i = 0; i < len; i++)
431 { 430 {
432 if ((*this)[i] != ' ') 431 if ((*this)[i] != ' ')
433 { 432 {
434 nonspace = i; 433 nonspace = i;
435 break; 434 break;
436 } 435 }
437 } 436 }
438#ifdef _WINDOWS 437#ifdef _WINDOWS
439 for (i = nonspace; i < len; i++) 438 for (i = nonspace; i < len; i++)
440#else 439#else
441 for (int i = nonspace; i < len; i++) 440 for (int i = nonspace; i < len; i++)
442#endif 441#endif
443 { 442 {
444 if ((*this)[i] == ' ') 443 if ((*this)[i] == ' ')
445 { 444 {
446 spaces++; 445 spaces++;
447 } 446 }
448 } 447 }
449 if (spaces == 0) 448 if (spaces == 0)
450 { 449 {
451 just = false; 450 just = false;
452 } 451 }
453 else 452 else
454 { 453 {
455 extraspace = (scwidth - (_lborder+_rborder) - rightMargin() - leftMargin() - width(availht)); 454 extraspace = (scwidth - (_lborder+_rborder) - rightMargin() - leftMargin() - width(availht));
456 if (extraspace == 0) just = false; 455 if (extraspace == 0) just = false;
457 } 456 }
458 } 457 }
459 CList<textsegment>::iterator textend = textstart; 458 CList<textsegment>::iterator textend = textstart;
460 459
461 bool drawBackground = false; 460 bool drawBackground = false;
462 do 461 do
463 { 462 {
464 textend++; 463 textend++;
465 int end = (textend != segs.end()) ? textend->start : len; 464 int end = (textend != segs.end()) ? textend->start : len;
466 CStyle currentstyle = textstart->style; 465 CStyle currentstyle = textstart->style;
467 /* 466 /*
468 bool drawBackground = ( 467 bool drawBackground = (
469 currentstyle.bRed() != 255 468 currentstyle.bRed() != 255
470 || 469 ||
471 currentstyle.bGreen() != 255 470 currentstyle.bGreen() != 255
472 || 471 ||
473 currentstyle.bBlue() != 255 472 currentstyle.bBlue() != 255
474 ); 473 );
475 */ 474 */
476 QColor bgColour = QColor(qRgb(currentstyle.bRed(), 475 QColor bgColour = QColor(qRgb(currentstyle.bRed(),
477 currentstyle.bGreen(), 476 currentstyle.bGreen(),
478 currentstyle.bBlue())); 477 currentstyle.bBlue()));
479 drawBackground = !(bgColour == _bg); 478 drawBackground = !(bgColour == _bg);
480 479
481// if (drawBackground) qDebug("Drawing background"); 480// if (drawBackground) qDebug("Drawing background");
482 481
483 QFont f((currentstyle.isMono() && fc->hasCourier()) ? fc->fixedfontname() : fc->name(), fc->getsize(currentstyle), (currentstyle.isBold()) ? QFont::Bold : QFont::Normal, (currentstyle.isItalic()) ); 482 QFont f((currentstyle.isMono() && fc->hasCourier()) ? fc->fixedfontname() : fc->name(), fc->getsize(currentstyle), (currentstyle.isBold()) ? QFont::Bold : QFont::Normal, (currentstyle.isItalic()) );
484 //f.setUnderline(currentstyle.isUnderline()); 483 //f.setUnderline(currentstyle.isUnderline());
485 //if (currentstyle.isUnderline()) qDebug("UNDERLINE"); 484 //if (currentstyle.isUnderline()) qDebug("UNDERLINE");
486 _p->setFont(f); 485 _p->setFont(f);
487 QString str = text.mid(textstart->start, end-textstart->start); 486 QString str = text.mid(textstart->start, end-textstart->start);
488#if defined(OPIE) || !defined(USEQPE) 487#if defined(OPIE) || !defined(USEQPE)
489 _p->setPen(QPen(QColor(currentstyle.Red(), currentstyle.Green(), currentstyle.Blue()), fc->getsize(currentstyle)/100)); 488 _p->setPen(QPen(QColor(currentstyle.Red(), currentstyle.Green(), currentstyle.Blue()), fc->getsize(currentstyle)/100));
490#else 489#else
491 _p->setPen(QPen(QColor(currentstyle.Red(), currentstyle.Green(), currentstyle.Blue()), fc->getsize(currentstyle)/10)); 490 _p->setPen(QPen(QColor(currentstyle.Red(), currentstyle.Green(), currentstyle.Blue()), fc->getsize(currentstyle)/10));
492#endif 491#endif
493 int voffset = currentstyle.getVOffset()*fc->getsize(currentstyle)/2; 492 int voffset = currentstyle.getVOffset()*fc->getsize(currentstyle)/2;
494 493
495 if (_bMono) 494 if (_bMono)
496 { 495 {
497 496
498 Highlight(_p, drawBackground, currentx, _y, str.length()*_charWidth, bgColour); 497 Highlight(_p, drawBackground, currentx, _y, str.length()*_charWidth, bgColour);
499 if (currentstyle.isUnderline()) 498 if (currentstyle.isUnderline())
500 { 499 {
501 _p->drawLine( currentx, _y+voffset, currentx + str.length()*_charWidth, _y+voffset); 500 _p->drawLine( currentx, _y+voffset, currentx + str.length()*_charWidth, _y+voffset);
502 } 501 }
503 if (currentstyle.isStrikethru()) 502 if (currentstyle.isStrikethru())
504 { 503 {
505 int ascent = fc->ascent(currentstyle)/3; 504 int ascent = fc->ascent(currentstyle)/3;
506 _p->drawLine( currentx, _y-ascent+voffset, currentx + str.length()*_charWidth, _y-ascent+voffset); 505 _p->drawLine( currentx, _y-ascent+voffset, currentx + str.length()*_charWidth, _y-ascent+voffset);
507 } 506 }
508 for (int i = 0; i < str.length(); i++) 507 for (int i = 0; i < str.length(); i++)
509 { 508 {
510 _p->drawText( currentx + i*_charWidth, _y+voffset, QString(str[i])); 509 _p->drawText( currentx + i*_charWidth, _y+voffset, QString(str[i]));
511 } 510 }
512 currentx += str.length()*_charWidth; 511 currentx += str.length()*_charWidth;
513 } 512 }
514 else 513 else
515 { 514 {
516 if (currentstyle.isPicture()) 515 if (currentstyle.isPicture())
517 { 516 {
518 int ht = (gzoom*currentstyle.getPicture()->height())/100; 517 int ht = (gzoom*currentstyle.getPicture()->height())/100;
519 int wt = (gzoom*currentstyle.getPicture()->width())/100; 518 int wt = (gzoom*currentstyle.getPicture()->width())/100;
520 bool willscale = false; 519 bool willscale = false;
521 if (ht > availht) 520 if (ht > availht)
522 { 521 {
523 wt = (wt*availht)/ht; 522 wt = (wt*availht)/ht;
524 ht = availht; 523 ht = availht;
525 willscale = true; 524 willscale = true;
526 } 525 }
527 int ascent = fc->ascent(currentstyle)/2; 526 int ascent = fc->ascent(currentstyle)/2;
528 int yoffset = ht/2 + ascent; 527 int yoffset = ht/2 + ascent;
529 528
530 QPixmap pc; 529 QPixmap pc;
531 if ((willscale || gzoom != 100) && currentstyle.canScale()) 530 if ((willscale || gzoom != 100) && currentstyle.canScale())
532 { 531 {
533 QImage im = currentstyle.getPicture()->smoothScale(wt,ht); 532 QImage im = currentstyle.getPicture()->smoothScale(wt,ht);
534 pc.convertFromImage(im); 533 pc.convertFromImage(im);
535 } 534 }
536 else 535 else
537 { 536 {
538 pc.convertFromImage(*currentstyle.getPicture()); 537 pc.convertFromImage(*currentstyle.getPicture());
539 } 538 }
540 _p->drawPixmap( currentx, _y-yoffset, pc ); 539 _p->drawPixmap( currentx, _y-yoffset, pc );
541 currentx += wt; 540 currentx += wt;
542 } 541 }
543 else 542 else
544 { 543 {
545 if (currentstyle.isMono() && !fc->hasCourier()) 544 if (currentstyle.isMono() && !fc->hasCourier())
546 { 545 {
547 int cw = (7*fc->getsize(currentstyle))/10; 546 int cw = (7*fc->getsize(currentstyle))/10;
548 int w = cw*(end-textstart->start); 547 int w = cw*(end-textstart->start);
549 Highlight(_p, drawBackground, currentx, _y, w, bgColour); 548 Highlight(_p, drawBackground, currentx, _y, w, bgColour);
550 if (currentstyle.isUnderline()) 549 if (currentstyle.isUnderline())
551 { 550 {
552 _p->drawLine( currentx, _y+voffset, currentx + w, _y+voffset); 551 _p->drawLine( currentx, _y+voffset, currentx + w, _y+voffset);
553 } 552 }
554 if (currentstyle.isStrikethru()) 553 if (currentstyle.isStrikethru())
555 { 554 {
556 int ascent = fc->ascent(currentstyle)/3; 555 int ascent = fc->ascent(currentstyle)/3;
557 _p->drawLine( currentx, _y-ascent+voffset, currentx + w, _y-ascent+voffset); 556 _p->drawLine( currentx, _y-ascent+voffset, currentx + w, _y-ascent+voffset);
558 } 557 }
559 QString str = text.mid(textstart->start, end-textstart->start); 558 QString str = text.mid(textstart->start, end-textstart->start);
560 559
561 for (unsigned int i = 0; i < str.length(); i++) 560 for (unsigned int i = 0; i < str.length(); i++)
562 { 561 {
563#ifdef _WINDOWS 562#ifdef _WINDOWS
564 _p->drawText( currentx, _y+voffset, QString(str.at(i))); 563 _p->drawText( currentx, _y+voffset, QString(str.at(i)));
565#else 564#else
566 _p->drawText( currentx, _y+voffset, QString(str[i])); 565 _p->drawText( currentx, _y+voffset, QString(str[i]));
567#endif 566#endif
568 currentx += cw; 567 currentx += cw;
569 } 568 }
570 } 569 }
571 else 570 else
572 { 571 {
573 QFontMetrics fm(f); 572 QFontMetrics fm(f);
574 int w; 573 int w;
575 if (just) 574 if (just)
576 { 575 {
577 int lastspace = -1; 576 int lastspace = -1;
578 int nsp = 0; 577 int nsp = 0;
579 int cx = currentx; 578 int cx = currentx;
580 while ((nsp = str.find(" ", lastspace+1)) >= 0) 579 while ((nsp = str.find(" ", lastspace+1)) >= 0)
581 { 580 {
582 if (nsp+textstart->start >= nonspace) 581 if (nsp+textstart->start >= nonspace)
583 { 582 {
584 spacenumber++; 583 spacenumber++;
585 int nexttoadd = (extraspace*spacenumber+spaces/2)/spaces - spacesofar; 584 int nexttoadd = (extraspace*spacenumber+spaces/2)/spaces - spacesofar;
586 QString nstr = str.mid(lastspace+1, nsp-lastspace); 585 QString nstr = str.mid(lastspace+1, nsp-lastspace);
587 // qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr); 586 // qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr);
588 int lw = fm.width(nstr); 587 int lw = fm.width(nstr);
589 Highlight(_p, drawBackground, cx, _y, lw, bgColour); 588 Highlight(_p, drawBackground, cx, _y, lw, bgColour);
590 _p->drawText( cx, _y+voffset, nstr); 589 _p->drawText( cx, _y+voffset, nstr);
591 Highlight(_p, drawBackground, cx+lw, _y, nexttoadd, bgColour); 590 Highlight(_p, drawBackground, cx+lw, _y, nexttoadd, bgColour);
592 cx += lw+nexttoadd; 591 cx += lw+nexttoadd;
593 spacesofar += nexttoadd; 592 spacesofar += nexttoadd;
594 lastspace = nsp; 593 lastspace = nsp;
595 } 594 }
596 else 595 else
597 { 596 {
598 QString nstr = str.mid(lastspace+1, nsp-lastspace); 597 QString nstr = str.mid(lastspace+1, nsp-lastspace);
599 // qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr); 598 // qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr);
600 int lw = fm.width(nstr); 599 int lw = fm.width(nstr);
601 Highlight(_p, drawBackground, cx, _y, lw, bgColour); 600 Highlight(_p, drawBackground, cx, _y, lw, bgColour);
602 _p->drawText( cx, _y+voffset, nstr); 601 _p->drawText( cx, _y+voffset, nstr);
603 cx += lw; 602 cx += lw;
604 lastspace = nsp; 603 lastspace = nsp;
605 } 604 }
606 } 605 }
607 QString nstr = str.right(str.length()-1-lastspace); 606 QString nstr = str.right(str.length()-1-lastspace);
608 int lw = fm.width(nstr); 607 int lw = fm.width(nstr);
609 Highlight(_p, drawBackground, cx, _y, lw, bgColour); 608 Highlight(_p, drawBackground, cx, _y, lw, bgColour);
610 _p->drawText( cx, _y+voffset, nstr); 609 _p->drawText( cx, _y+voffset, nstr);
611 cx += lw; 610 cx += lw;
612 w = cx - currentx; 611 w = cx - currentx;
613 } 612 }
614 else 613 else
615 { 614 {
616 int lw = fm.width(str); 615 int lw = fm.width(str);
617 Highlight(_p, drawBackground, currentx, _y, lw, bgColour); 616 Highlight(_p, drawBackground, currentx, _y, lw, bgColour);
618 _p->drawText( currentx, _y+voffset, str); 617 _p->drawText( currentx, _y+voffset, str);
619 w = lw; 618 w = lw;
620 } 619 }
621 if (currentstyle.isUnderline()) 620 if (currentstyle.isUnderline())
622 { 621 {
623 _p->drawLine( currentx, _y+voffset, currentx + w, _y+voffset); 622 _p->drawLine( currentx, _y+voffset, currentx + w, _y+voffset);
624 } 623 }
625 if (currentstyle.isStrikethru()) 624 if (currentstyle.isStrikethru())
626 { 625 {
627 int ascent = fc->ascent(currentstyle)/3; 626 int ascent = fc->ascent(currentstyle)/3;
628 _p->drawLine( currentx, _y-ascent+voffset, currentx + w, _y-ascent+voffset); 627 _p->drawLine( currentx, _y-ascent+voffset, currentx + w, _y-ascent+voffset);
629 } 628 }
630 currentx += w; 629 currentx += w;
631 } 630 }
632 } 631 }
633 } 632 }
634 textstart = textend; 633 textstart = textend;
635 } 634 }
636 while (textend != segs.end() && textstart->start < len); 635 while (textend != segs.end() && textstart->start < len);
637/* 636/*
638 if (firstColour == bgColour) 637 if (firstColour == bgColour)
639 { 638 {
640 Highlight(_p, drawBackground, currentx, _y, scwidth - (currentx + _lborder + _rborder), bgColour); 639 Highlight(_p, drawBackground, currentx, _y, scwidth - (currentx + _lborder + _rborder), bgColour);
641 } 640 }
642 */ 641 */
643} 642}
644 643
645void CDrawBuffer::Highlight(QPainter* _p, bool drawBackground, int _x, int _y, int w, QColor bgColour) 644void CDrawBuffer::Highlight(QPainter* _p, bool drawBackground, int _x, int _y, int w, QColor bgColour)
646{ 645{
647 if (drawBackground) 646 if (drawBackground)
648 { 647 {
649 _p->fillRect(_x, _y-m_ascent, w, m_lineSpacing, bgColour); 648 _p->fillRect(_x, _y-m_ascent, w, m_lineSpacing, bgColour);
650 } 649 }
651} 650}
652 651
653CStyle CDrawBuffer::laststyle() 652CStyle CDrawBuffer::laststyle()
654{ 653{
655 return segs.last().style; 654 return segs.last().style;
656} 655}
657 656
658CStyle CDrawBuffer::firststyle() 657CStyle CDrawBuffer::firststyle()
659{ 658{
660 return segs.first().style; 659 return segs.first().style;
661} 660}
662 661
663linkType CDrawBuffer::getLinkType(int numchars, size_t& tgt, size_t& offset, size_t& pictgt, QImage*& img) 662linkType CDrawBuffer::getLinkType(int numchars, size_t& tgt, size_t& offset, size_t& pictgt, QImage*& img)
664{ 663{
665 linkType ret = eNone; 664 linkType ret = eNone;
666 int end = 0; 665 int end = 0;
667 CStyle currentstyle; 666 CStyle currentstyle;
668 CList<textsegment>::iterator textstart = segs.begin(); 667 CList<textsegment>::iterator textstart = segs.begin();
669 CList<textsegment>::iterator textend = textstart; 668 CList<textsegment>::iterator textend = textstart;
670 do 669 do
671 { 670 {
672 textend++; 671 textend++;
673 end = (textend != segs.end()) ? textend->start : len; 672 end = (textend != segs.end()) ? textend->start : len;
674 currentstyle = textstart->style; 673 currentstyle = textstart->style;
675/* 674/*
676 if (currentstyle.isPicture()) qDebug("Passed thru picture"); 675 if (currentstyle.isPicture()) qDebug("Passed thru picture");
677 if (currentstyle.getLink()) qDebug("Passed thru link"); 676 if (currentstyle.getLink()) qDebug("Passed thru link");
678 //qDebug("islink:%d - %d", numchars, end); 677 //qDebug("islink:%d - %d", numchars, end);
679*/ 678*/
680 textstart = textend; 679 textstart = textend;
681 } 680 }
682 while (textend != segs.end() && end <= numchars); 681 while (textend != segs.end() && end <= numchars);
683 img = currentstyle.getPicture(); 682 img = currentstyle.getPicture();
684 if (currentstyle.getPictureLink()) 683 if (currentstyle.getPictureLink())
685 { 684 {
686 pictgt = currentstyle.getPictureLinkData(); 685 pictgt = currentstyle.getPictureLinkData();
687 ret |= ePicture; 686 ret |= ePicture;
688 } 687 }
689 if (currentstyle.getLink()) 688 if (currentstyle.getLink())
690 { 689 {
691 tgt = currentstyle.getData(); 690 tgt = currentstyle.getData();
692 offset = currentstyle.getOffset(); 691 offset = currentstyle.getOffset();
693 ret |= eLink; 692 ret |= eLink;
694 } 693 }
695 return ret; 694 return ret;
696} 695}
697 696
698void CDrawBuffer::resize(int availht) 697void CDrawBuffer::resize(int availht)
699{ 698{
700 int gzoom = fc->gzoom(); 699 int gzoom = fc->gzoom();
701 m_ascent = m_descent = m_lineSpacing = m_lineExtraSpacing = 0; 700 m_ascent = m_descent = m_lineSpacing = m_lineExtraSpacing = 0;
702 /* 701 /*
703 int t_ascent = 0; 702 int t_ascent = 0;
704 int t_descent = 0; 703 int t_descent = 0;
705 int t_lineExtraSpacing = 0; 704 int t_lineExtraSpacing = 0;
706 */ 705 */
707 int t_lineSpacing = 0; 706 int t_lineSpacing = 0;
708 m_hastext = false; 707 m_hastext = false;
709 for (CList<textsegment>::iterator iter = segs.begin(); iter != segs.end() && iter->start <= len; ) 708 for (CList<textsegment>::iterator iter = segs.begin(); iter != segs.end() && iter->start <= len; )
710 { 709 {
711 CStyle _style = iter->style; 710 CStyle _style = iter->style;
712 if (!_style.isPicture()) 711 if (!_style.isPicture())
713 { 712 {
714 m_hastext = true; 713 m_hastext = true;
715 break; 714 break;
716 } 715 }
717 iter++; 716 iter++;
718 } 717 }
719 if (m_hastext) 718 if (m_hastext)
720 { 719 {
721 720
722 for (CList<textsegment>::iterator iter = segs.begin(); iter != segs.end() && iter->start <= len; ) 721 for (CList<textsegment>::iterator iter = segs.begin(); iter != segs.end() && iter->start <= len; )
723 { 722 {
724 CList<textsegment>::iterator next = iter; 723 CList<textsegment>::iterator next = iter;
725 iter++; 724 iter++;
726 int st = next->start; 725 int st = next->start;
727 if (st < 0) st = 0; 726 if (st < 0) st = 0;
728 727
729 CStyle _style = next->style; 728 CStyle _style = next->style;
730 729
731 int linespacing, ascent, descent, extra; 730 int linespacing, ascent, descent, extra;
732 731
733 ascent = fc->ascent(_style); 732 ascent = fc->ascent(_style);
734 descent = fc->descent(_style); 733 descent = fc->descent(_style);
735 linespacing = fc->lineSpacing(_style); 734 linespacing = fc->lineSpacing(_style);
736 extra = linespacing - ascent - descent; 735 extra = linespacing - ascent - descent;
737 /* 736 /*
738 if (ascent > t_ascent) t_ascent = ascent; 737 if (ascent > t_ascent) t_ascent = ascent;
739 if (descent > t_descent) t_descent = descent; 738 if (descent > t_descent) t_descent = descent;
740 if (extra > t_lineExtraSpacing) t_lineExtraSpacing = extra; 739 if (extra > t_lineExtraSpacing) t_lineExtraSpacing = extra;
741 t_lineSpacing = t_ascent+t_descent+t_lineExtraSpacing; 740 t_lineSpacing = t_ascent+t_descent+t_lineExtraSpacing;
742 */ 741 */
743 if (linespacing > t_lineSpacing) t_lineSpacing = linespacing; 742 if (linespacing > t_lineSpacing) t_lineSpacing = linespacing;
744 if (_style.isPicture()) 743 if (_style.isPicture())
745 { 744 {
746 int ht = (gzoom*_style.getPicture()->height())/100; 745 int ht = (gzoom*_style.getPicture()->height())/100;
747 int wt = (gzoom*_style.getPicture()->width())/100; 746 int wt = (gzoom*_style.getPicture()->width())/100;
748 747
749 bool willscale = false; 748 bool willscale = false;
750 if (ht > availht) 749 if (ht > availht)
751 { 750 {
752 wt = (wt*availht)/ht; 751 wt = (wt*availht)/ht;
753 ht = availht; 752 ht = availht;
754 willscale = true; 753 willscale = true;
755 } 754 }
756 if (willscale || _style.canScale()) 755 if (willscale || _style.canScale())
757 { 756 {
758 descent = ((gzoom*_style.getPicture()->height())/100-ascent)/2; 757 descent = ((gzoom*_style.getPicture()->height())/100-ascent)/2;
759 ascent = ((gzoom*_style.getPicture()->height())/100+ascent)/2; 758 ascent = ((gzoom*_style.getPicture()->height())/100+ascent)/2;
760 } 759 }
761 } 760 }
762 761
763 /* 762 /*
764 else if (fc != NULL) 763 else if (fc != NULL)
765 { 764 {
766 ascent = fc->ascent(_style); 765 ascent = fc->ascent(_style);
767 descent = fc->descent(_style); 766 descent = fc->descent(_style);
768 linespacing = fc->lineSpacing(_style); 767 linespacing = fc->lineSpacing(_style);
769 extra = linespacing - ascent - descent; 768 extra = linespacing - ascent - descent;
770 } 769 }
771 */ 770 */
772 if (ascent > m_ascent) m_ascent = ascent; 771 if (ascent > m_ascent) m_ascent = ascent;
773 if (descent > m_descent) m_descent = descent; 772 if (descent > m_descent) m_descent = descent;
774 if (extra > m_lineExtraSpacing) m_lineExtraSpacing = extra; 773 if (extra > m_lineExtraSpacing) m_lineExtraSpacing = extra;
775 m_lineSpacing = m_ascent+m_descent+m_lineExtraSpacing; 774 m_lineSpacing = m_ascent+m_descent+m_lineExtraSpacing;
776 } 775 }
777 m_showPartial = (m_lineSpacing > t_lineSpacing); 776 m_showPartial = (m_lineSpacing > t_lineSpacing);
778 int lead = fc->getlead(); 777 int lead = fc->getlead();
779 if (lead != 0) 778 if (lead != 0)
780 { 779 {
781 int xt = (lead*t_lineSpacing+5)/10; 780 int xt = (lead*t_lineSpacing+5)/10;
782 m_lineExtraSpacing += xt; 781 m_lineExtraSpacing += xt;
783 m_lineSpacing += xt; 782 m_lineSpacing += xt;
784 } 783 }
785 if (m_bSop) 784 if (m_bSop)
786 { 785 {
787 int xt = ((segs.begin()->style.getExtraSpace()+fc->getextraspace())*fc->getsize(segs.begin()->style)+5)/10; 786 int xt = ((segs.begin()->style.getExtraSpace()+fc->getextraspace())*fc->getsize(segs.begin()->style)+5)/10;
788 //qDebug("ExtraSpace:%d", xt); 787 //qDebug("ExtraSpace:%d", xt);
789 m_ascent += xt; 788 m_ascent += xt;
790 m_lineSpacing += xt; 789 m_lineSpacing += xt;
791 } 790 }
792 } 791 }
793 else 792 else
794 { 793 {
795 m_showPartial = true; 794 m_showPartial = true;
796 int maxheight = 0; 795 int maxheight = 0;
797 for (CList<textsegment>::iterator iter = segs.begin(); iter != segs.end(); iter++) 796 for (CList<textsegment>::iterator iter = segs.begin(); iter != segs.end(); iter++)
798 { 797 {
799 CStyle _style = iter->style; 798 CStyle _style = iter->style;
800 if (_style.isPicture()) 799 if (_style.isPicture())
801 { 800 {
802 int ht = 0; 801 int ht = 0;
803 if (_style.canScale()) 802 if (_style.canScale())
804 { 803 {
805 ht = ((gzoom*_style.getPicture()->height())/100); 804 ht = ((gzoom*_style.getPicture()->height())/100);
806 } 805 }
807 else 806 else
808 { 807 {
809 ht = _style.getPicture()->height(); 808 ht = _style.getPicture()->height();
810 } 809 }
811 if (ht > availht) 810 if (ht > availht)
812 { 811 {
813 ht = availht; 812 ht = availht;
814 } 813 }
815 if (ht > maxheight) maxheight = ht; 814 if (ht > maxheight) maxheight = ht;
816 } 815 }
817 } 816 }
818 m_ascent = maxheight/2; 817 m_ascent = maxheight/2;
819 m_descent = maxheight-m_ascent; 818 m_descent = maxheight-m_ascent;
820 m_lineExtraSpacing = 0; 819 m_lineExtraSpacing = 0;
821 m_lineSpacing = m_ascent+m_descent; 820 m_lineSpacing = m_ascent+m_descent;
822 } 821 }
823} 822}
824 823
825CStyle* CDrawBuffer::getNextLink(int& offset) 824CStyle* CDrawBuffer::getNextLink(int& offset)
826{ 825{
827 CStyle* ret = NULL; 826 CStyle* ret = NULL;
828 for (CList<textsegment>::iterator iter = segs.begin(); iter != segs.end(); ++iter) 827 for (CList<textsegment>::iterator iter = segs.begin(); iter != segs.end(); ++iter)
829 { 828 {
830 if (offset < iter->start && iter->style.getLink()) 829 if (offset < iter->start && iter->style.getLink())
831 { 830 {
832 ret = &(iter->style); 831 ret = &(iter->style);
833 offset = iter->start; 832 offset = iter->start;
834 qDebug("Found a link at offset %d!", offset); 833 qDebug("Found a link at offset %d!", offset);
835 break; 834 break;
836 } 835 }
837 } 836 }
838 return ret; 837 return ret;
839} 838}
840 839
841int CDrawBuffer::invertLink(int offset) 840int CDrawBuffer::invertLink(int offset)
842{ 841{
843 for (CList<textsegment>::iterator iter = segs.begin(); iter != segs.end(); ++iter) 842 for (CList<textsegment>::iterator iter = segs.begin(); iter != segs.end(); ++iter)
844 { 843 {
845 if (offset <= iter->start && iter->style.getLink()) 844 if (offset <= iter->start && iter->style.getLink())
846 { 845 {
847 iter->style.invert(); 846 iter->style.invert();
848 unsigned long currentvalue = iter->style.getData(); 847 unsigned long currentvalue = iter->style.getData();
849 qDebug("Link data %u", currentvalue); 848 qDebug("Link data %u", currentvalue);
850 CList<textsegment>::iterator next = iter; 849 CList<textsegment>::iterator next = iter;
851 ++next; 850 ++next;
852 while (next != segs.end() && (currentvalue == next->style.getData()) && next->style.getLink()) 851 while (next != segs.end() && (currentvalue == next->style.getData()) && next->style.getLink())
853 { 852 {
854 next->style.invert(); 853 next->style.invert();
855 offset = next->start; 854 offset = next->start;
856 iter++; 855 iter++;
857 next++; 856 next++;
858 } 857 }
859 return offset; 858 return offset;
860 } 859 }
861 } 860 }
862 qDebug("Failed to invert"); 861 qDebug("Failed to invert");
863 return offset; 862 return offset;
864} 863}
diff --git a/noncore/apps/opie-reader/CHM.mak b/noncore/apps/opie-reader/CHM.mak
deleted file mode 100644
index e14db5b..0000000
--- a/noncore/apps/opie-reader/CHM.mak
+++ b/dev/null
@@ -1,177 +0,0 @@
1#############################################################################
2# Makefile for building: libCHM.so.1.0.0
3# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:37:00 2004
4# Project: CHM.pro
5# Template: lib
6# Command: $(QMAKE) -o CHM.mak CHM.pro
7#############################################################################
8
9####### Compiler, tools and options
10
11CC = gcc
12CXX = g++
13LEX = flex
14YACC = yacc
15CFLAGS = -pipe -w -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
16CXXFLAGS = -pipe -w -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
17LEXFLAGS =
18YACCFLAGS= -d
19INCPATH = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
20LINK = g++
21LFLAGS = -shared -Wl,-soname,libCHM.so.1
22LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_codec -lqt-mt -lXext -lX11 -lm -lpthread
23AR = ar cqs
24RANLIB =
25MOC = $(QTDIR)/bin/moc
26UIC = $(QTDIR)/bin/uic
27QMAKE = qmake
28TAR = tar -cf
29GZIP = gzip -9f
30COPY = cp -f
31COPY_FILE= $(COPY)
32COPY_DIR = $(COPY) -r
33DEL_FILE = rm -f
34SYMLINK = ln -sf
35DEL_DIR = rmdir
36MOVE = mv -f
37CHK_DIR_EXISTS= test -d
38MKDIR = mkdir -p
39
40####### Output directory
41
42OBJECTS_DIR = QREADEROBJS/
43
44####### Files
45
46HEADERS = CHM.h \
47 chm_lib.h \
48 lzx.h
49SOURCES = CHM.cpp \
50 chm_lib.c \
51 lzx.c
52OBJECTS = QREADEROBJS/CHM.o \
53 QREADEROBJS/chm_lib.o \
54 QREADEROBJS/lzx.o
55FORMS =
56UICDECLS =
57UICIMPLS =
58SRCMOC =
59OBJMOC =
60 DIST = CHM.pro
61QMAKE_TARGET = CHM
62DESTDIR = $(READERDIR)/codecs/
63TARGET = libCHM.so.1.0.0
64 TARGETA= $(READERDIR)/codecs/libCHM.a
65 TARGETD= libCHM.so.1.0.0
66 TARGET0= libCHM.so
67 TARGET1= libCHM.so.1
68 TARGET2= libCHM.so.1.0
69
70first: all
71####### Implicit rules
72
73.SUFFIXES: .c .o .cpp .cc .cxx .C
74
75.cpp.o:
76 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
77
78.cc.o:
79 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
80
81.cxx.o:
82 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
83
84.C.o:
85 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
86
87.c.o:
88 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
89
90####### Build rules
91
92all: CHM.mak $(READERDIR)/codecs/$(TARGET)
93
94$(READERDIR)/codecs/$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)
95 test -d $(READERDIR)/codecs/ || mkdir -p $(READERDIR)/codecs/
96 -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
97 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
98 -ln -s $(TARGET) $(TARGET0)
99 -ln -s $(TARGET) $(TARGET1)
100 -ln -s $(TARGET) $(TARGET2)
101 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET)
102 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0)
103 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET1)
104 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET2)
105 -$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/codecs/
106
107
108
109staticlib: $(TARGETA)
110
111$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
112 -$(DEL_FILE) $(TARGETA)
113 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
114
115mocables: $(SRCMOC)
116uicables: $(UICDECLS) $(UICIMPLS)
117
118$(MOC):
119 ( cd $(QTDIR)/src/moc ; $(MAKE) )
120
121CHM.mak: CHM.pro /usr/lib/qt3/mkspecs/default/qmake.conf
122 $(QMAKE) -o CHM.mak CHM.pro
123qmake:
124 @$(QMAKE) -o CHM.mak CHM.pro
125
126dist:
127 @mkdir -p QREADEROBJS/CHM && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/CHM/ && ( cd `dirname QREADEROBJS/CHM` && $(TAR) CHM.tar CHM && $(GZIP) CHM.tar ) && $(MOVE) `dirname QREADEROBJS/CHM`/CHM.tar.gz . && $(DEL_FILE) -r QREADEROBJS/CHM
128
129mocclean:
130
131uiclean:
132
133yaccclean:
134lexclean:
135clean:
136 -$(DEL_FILE) $(OBJECTS)
137 -$(DEL_FILE) *~ core *.core
138
139
140####### Sub-libraries
141
142distclean: clean
143 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET) $(TARGET)
144 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0) $(READERDIR)/codecs/$(TARGET1) $(READERDIR)/codecs/$(TARGET2) $(TARGETA)
145
146
147FORCE:
148
149####### Compile
150
151QREADEROBJS/CHM.o: CHM.cpp CHM.h \
152 chm_lib.h \
153 QREADERINC/static.h \
154 QREADERINC/useqpe.h \
155 CExpander.h \
156 my_list.h \
157 config.h \
158 StyleConsts.h \
159 Markups.h \
160 names.h \
161 linktype.h \
162 ustring.h
163 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CHM.o CHM.cpp
164
165QREADEROBJS/chm_lib.o: chm_lib.c chm_lib.h \
166 lzx.h
167 $(CC) -c $(CFLAGS) $(INCPATH) -o QREADEROBJS/chm_lib.o chm_lib.c
168
169QREADEROBJS/lzx.o: lzx.c lzx.h
170 $(CC) -c $(CFLAGS) $(INCPATH) -o QREADEROBJS/lzx.o lzx.c
171
172####### Install
173
174install: all
175
176uninstall:
177
diff --git a/noncore/apps/opie-reader/CHM.omak b/noncore/apps/opie-reader/CHM.omak
deleted file mode 100644
index 4cdfbe2..0000000
--- a/noncore/apps/opie-reader/CHM.omak
+++ b/dev/null
@@ -1,140 +0,0 @@
1#############################################################################
2# Makefile for building libCHM.so.1.0.0
3# Generated by tmake at 15:14, 2004/05/08
4# Project: CHM.opro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
14 INCPATH =-IOREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =-shared -Wl,-soname,libCHM.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lreader_codec -lqte
18 AR =arm-linux-ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =CHM.h \
29 chm_lib.h \
30 lzx.h
31 SOURCES =CHM.cpp \
32 chm_lib.c \
33 lzx.c
34 OBJECTS =OREADEROBJS/CHM.o \
35 OREADEROBJS/chm_lib.o \
36 OREADEROBJS/lzx.o
37 INTERFACES =
38 UICDECLS =
39 UICIMPLS =
40 SRCMOC =
41 OBJMOC =
42 DIST =
43 TARGET =libCHM.so.1.0.0
44 TARGETA =$(QTDIR)/plugins/reader/codecs/libCHM.a
45 TARGETD =libCHM.so.1.0.0
46 TARGET0 =libCHM.so
47 TARGET1 =libCHM.so.1
48 TARGET2 =libCHM.so.1.0
49INTERFACE_DECL_PATH = .
50
51####### Implicit rules
52
53.SUFFIXES: .cpp .cxx .cc .C .c
54
55.cpp.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57
58.cxx.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60
61.cc.o:
62 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
63
64.C.o:
65 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
66
67.c.o:
68 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
69
70####### Build rules
71
72
73all: $(QTDIR)/plugins/reader/codecs/libCHM.so.1.0.0
74
75$(QTDIR)/plugins/reader/codecs/libCHM.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
76 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
77 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
78 -ln -s $(TARGET) $(TARGET0)
79 -ln -s $(TARGET) $(TARGET1)
80 -ln -s $(TARGET) $(TARGET2)
81 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
82 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
83 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
84 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
85 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
86
87staticlib: $(TARGETA)
88
89$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
90 -rm -f $(TARGETA)
91 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
92
93moc: $(SRCMOC)
94
95tmake: CHM.omak
96
97CHM.omak: CHM.opro
98 tmake CHM.opro -o CHM.omak
99
100dist:
101 $(TAR) CHM.opro.tar CHM.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
102 $(GZIP) CHM.opro.tar
103
104clean:
105 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
106 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
107 -rm -f *~ core
108
109####### Sub-libraries
110
111
112###### Combined headers
113
114
115####### Compile
116
117OREADEROBJS/CHM.o: CHM.cpp \
118 CHM.h \
119 OREADERINC/useqpe.h \
120 CExpander.h \
121 config.h \
122 ustring.h \
123 StyleConsts.h \
124 Markups.h \
125 names.h \
126 linktype.h \
127 chm_lib.h \
128 my_list.h \
129 OREADERINC/static.h
130 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CHM.o CHM.cpp
131
132OREADEROBJS/chm_lib.o: chm_lib.c \
133 chm_lib.h \
134 lzx.h
135 $(CC) -c $(CFLAGS) $(INCPATH) -o OREADEROBJS/chm_lib.o chm_lib.c
136
137OREADEROBJS/lzx.o: lzx.c \
138 lzx.h
139 $(CC) -c $(CFLAGS) $(INCPATH) -o OREADEROBJS/lzx.o lzx.c
140
diff --git a/noncore/apps/opie-reader/CHM.zmak b/noncore/apps/opie-reader/CHM.zmak
deleted file mode 100644
index 6cde457..0000000
--- a/noncore/apps/opie-reader/CHM.zmak
+++ b/dev/null
@@ -1,140 +0,0 @@
1#############################################################################
2# Makefile for building libCHM.so.1.0.0
3# Generated by tmake at 15:17, 2004/05/08
4# Project: CHM.zpro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
14 INCPATH =-IZREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =-shared -Wl,-soname,libCHM.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lreader_codec -lqte
18 AR =arm-linux-ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =CHM.h \
29 chm_lib.h \
30 lzx.h
31 SOURCES =CHM.cpp \
32 chm_lib.c \
33 lzx.c
34 OBJECTS =ZREADEROBJS/CHM.o \
35 ZREADEROBJS/chm_lib.o \
36 ZREADEROBJS/lzx.o
37 INTERFACES =
38 UICDECLS =
39 UICIMPLS =
40 SRCMOC =
41 OBJMOC =
42 DIST =
43 TARGET =libCHM.so.1.0.0
44 TARGETA =$(QTDIR)/plugins/reader/codecs/libCHM.a
45 TARGETD =libCHM.so.1.0.0
46 TARGET0 =libCHM.so
47 TARGET1 =libCHM.so.1
48 TARGET2 =libCHM.so.1.0
49INTERFACE_DECL_PATH = .
50
51####### Implicit rules
52
53.SUFFIXES: .cpp .cxx .cc .C .c
54
55.cpp.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57
58.cxx.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60
61.cc.o:
62 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
63
64.C.o:
65 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
66
67.c.o:
68 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
69
70####### Build rules
71
72
73all: $(QTDIR)/plugins/reader/codecs/libCHM.so.1.0.0
74
75$(QTDIR)/plugins/reader/codecs/libCHM.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
76 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
77 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
78 -ln -s $(TARGET) $(TARGET0)
79 -ln -s $(TARGET) $(TARGET1)
80 -ln -s $(TARGET) $(TARGET2)
81 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
82 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
83 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
84 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
85 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
86
87staticlib: $(TARGETA)
88
89$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
90 -rm -f $(TARGETA)
91 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
92
93moc: $(SRCMOC)
94
95tmake: CHM.zmak
96
97CHM.zmak: CHM.zpro
98 tmake CHM.zpro -o CHM.zmak
99
100dist:
101 $(TAR) CHM.zpro.tar CHM.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
102 $(GZIP) CHM.zpro.tar
103
104clean:
105 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
106 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
107 -rm -f *~ core
108
109####### Sub-libraries
110
111
112###### Combined headers
113
114
115####### Compile
116
117ZREADEROBJS/CHM.o: CHM.cpp \
118 CHM.h \
119 ZREADERINC/useqpe.h \
120 CExpander.h \
121 config.h \
122 ustring.h \
123 StyleConsts.h \
124 Markups.h \
125 names.h \
126 linktype.h \
127 chm_lib.h \
128 my_list.h \
129 ZREADERINC/static.h
130 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CHM.o CHM.cpp
131
132ZREADEROBJS/chm_lib.o: chm_lib.c \
133 chm_lib.h \
134 lzx.h
135 $(CC) -c $(CFLAGS) $(INCPATH) -o ZREADEROBJS/chm_lib.o chm_lib.c
136
137ZREADEROBJS/lzx.o: lzx.c \
138 lzx.h
139 $(CC) -c $(CFLAGS) $(INCPATH) -o ZREADEROBJS/lzx.o lzx.c
140
diff --git a/noncore/apps/opie-reader/CHM.zpro b/noncore/apps/opie-reader/CHM.zpro
deleted file mode 100644
index 1f2464a..0000000
--- a/noncore/apps/opie-reader/CHM.zpro
+++ b/dev/null
@@ -1,16 +0,0 @@
1 TEMPLATE= lib
2 CONFIG = qt warn_on release dll
3 HEADERS = CHM.h chm_lib.h lzx.h
4
5 SOURCES = CHM.cpp chm_lib.c lzx.c
6
7
8 INTERFACES=
9 DESTDIR = $(QTDIR)/plugins/reader/codecs
10 TARGET = CHM
11LIBS += -lreader_codec
12
13OBJECTS_DIR = ZREADEROBJS
14MOC_DIR = ZREADERMOCS
15 INCLUDEPATH+= ZREADERINC
16DEPENDPATH += ZREADERINC
diff --git a/noncore/apps/opie-reader/FontControl.cpp b/noncore/apps/opie-reader/FontControl.cpp
index d082898..bbd9fe0 100644
--- a/noncore/apps/opie-reader/FontControl.cpp
+++ b/noncore/apps/opie-reader/FontControl.cpp
@@ -1,68 +1,67 @@
1#include <qfontdatabase.h> 1#include <qfontdatabase.h>
2#include "opie.h"
3#include "useqpe.h" 2#include "useqpe.h"
4#include "FontControl.h" 3#include "FontControl.h"
5 4
6int FontControl::gzoom() 5int FontControl::gzoom()
7{ 6{
8 if (m_fixgraphics) 7 if (m_fixgraphics)
9 { 8 {
10 return 100; 9 return 100;
11 } 10 }
12 else 11 else
13 { 12 {
14 int ret; 13 int ret;
15 if (m_size == g_size) 14 if (m_size == g_size)
16 { 15 {
17 ret = m_fontsizes[m_size]*m_basesize; 16 ret = m_fontsizes[m_size]*m_basesize;
18 } 17 }
19 else if (g_size < 0) 18 else if (g_size < 0)
20 { 19 {
21 int f = -g_size; 20 int f = -g_size;
22 ret = (m_fontsizes[0]*m_basesize) >> (f/2); 21 ret = (m_fontsizes[0]*m_basesize) >> (f/2);
23 if (f%2) ret = (2*ret/3); 22 if (f%2) ret = (2*ret/3);
24 } 23 }
25 else 24 else
26 { 25 {
27 int f = g_size - m_maxsize + 1; 26 int f = g_size - m_maxsize + 1;
28 ret = (m_fontsizes[m_maxsize-1]*m_basesize) << (f/2); 27 ret = (m_fontsizes[m_maxsize-1]*m_basesize) << (f/2);
29 if (f%2) ret = (3*ret/2); 28 if (f%2) ret = (3*ret/2);
30 } 29 }
31 return ret; 30 return ret;
32 } 31 }
33} 32}
34 33
35bool FontControl::ChangeFont(QString& n, int tgt) 34bool FontControl::ChangeFont(QString& n, int tgt)
36{ 35{
37 QValueList<int>::Iterator it; 36 QValueList<int>::Iterator it;
38 QFontDatabase fdb; 37 QFontDatabase fdb;
39 QValueList<int> sizes = fdb.pointSizes(n); 38 QValueList<int> sizes = fdb.pointSizes(n);
40 if (sizes.count() == 0) 39 if (sizes.count() == 0)
41 { 40 {
42 return false; 41 return false;
43 } 42 }
44 else 43 else
45 { 44 {
46 m_fontname = n; 45 m_fontname = n;
47 m_maxsize = sizes.count(); 46 m_maxsize = sizes.count();
48 if (m_fontsizes != NULL) delete [] m_fontsizes; 47 if (m_fontsizes != NULL) delete [] m_fontsizes;
49 m_fontsizes = new int[m_maxsize]; 48 m_fontsizes = new int[m_maxsize];
50 uint i = 0; 49 uint i = 0;
51 uint best = 0; 50 uint best = 0;
52 for (it = sizes.begin(); it != sizes.end(); it++) 51 for (it = sizes.begin(); it != sizes.end(); it++)
53 { 52 {
54#if defined(OPIE) || !defined(USEQPE) 53#if defined(OPIE) || !defined(USEQPE)
55 m_fontsizes[i] = (*it); 54 m_fontsizes[i] = (*it);
56#else 55#else
57 m_fontsizes[i] = (*it)/10; 56 m_fontsizes[i] = (*it)/10;
58#endif 57#endif
59 if (abs(tgt-m_fontsizes[i]) < abs(tgt-m_fontsizes[best])) 58 if (abs(tgt-m_fontsizes[i]) < abs(tgt-m_fontsizes[best]))
60 { 59 {
61 best = i; 60 best = i;
62 } 61 }
63 i++; 62 i++;
64 } 63 }
65 g_size = m_size = best; 64 g_size = m_size = best;
66 } 65 }
67 return true; 66 return true;
68} 67}
diff --git a/noncore/apps/opie-reader/HTMLFilter.mak b/noncore/apps/opie-reader/HTMLFilter.mak
deleted file mode 100644
index e1a2125..0000000
--- a/noncore/apps/opie-reader/HTMLFilter.mak
+++ b/dev/null
@@ -1,170 +0,0 @@
1#############################################################################
2# Makefile for building: libHTMLfilter.so.1.0.0
3# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:38:47 2004
4# Project: HTMLFilter.pro
5# Template: lib
6# Command: $(QMAKE) -o HTMLFilter.mak HTMLFilter.pro
7#############################################################################
8
9####### Compiler, tools and options
10
11CC = gcc
12CXX = g++
13LEX = flex
14YACC = yacc
15CFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
16CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
17LEXFLAGS =
18YACCFLAGS= -d
19INCPATH = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
20LINK = g++
21LFLAGS = -shared -Wl,-soname,libHTMLfilter.so.1
22LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm -lpthread
23AR = ar cqs
24RANLIB =
25MOC = $(QTDIR)/bin/moc
26UIC = $(QTDIR)/bin/uic
27QMAKE = qmake
28TAR = tar -cf
29GZIP = gzip -9f
30COPY = cp -f
31COPY_FILE= $(COPY)
32COPY_DIR = $(COPY) -r
33DEL_FILE = rm -f
34SYMLINK = ln -sf
35DEL_DIR = rmdir
36MOVE = mv -f
37CHK_DIR_EXISTS= test -d
38MKDIR = mkdir -p
39
40####### Output directory
41
42OBJECTS_DIR = QREADEROBJS/
43
44####### Files
45
46HEADERS = CFilter.h
47SOURCES = striphtml.cpp
48OBJECTS = QREADEROBJS/striphtml.o
49FORMS =
50UICDECLS =
51UICIMPLS =
52SRCMOC =
53OBJMOC =
54 DIST = HTMLFilter.pro
55QMAKE_TARGET = HTMLfilter
56DESTDIR = $(READERDIR)/filters/
57TARGET = libHTMLfilter.so.1.0.0
58 TARGETA= $(READERDIR)/filters/libHTMLfilter.a
59 TARGETD= libHTMLfilter.so.1.0.0
60 TARGET0= libHTMLfilter.so
61 TARGET1= libHTMLfilter.so.1
62 TARGET2= libHTMLfilter.so.1.0
63
64first: all
65####### Implicit rules
66
67.SUFFIXES: .c .o .cpp .cc .cxx .C
68
69.cpp.o:
70 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
71
72.cc.o:
73 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
74
75.cxx.o:
76 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
77
78.C.o:
79 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
80
81.c.o:
82 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
83
84####### Build rules
85
86all: HTMLFilter.mak $(READERDIR)/filters/$(TARGET)
87
88$(READERDIR)/filters/$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)
89 test -d $(READERDIR)/filters/ || mkdir -p $(READERDIR)/filters/
90 -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
91 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
92 -ln -s $(TARGET) $(TARGET0)
93 -ln -s $(TARGET) $(TARGET1)
94 -ln -s $(TARGET) $(TARGET2)
95 -$(DEL_FILE) $(READERDIR)/filters/$(TARGET)
96 -$(DEL_FILE) $(READERDIR)/filters/$(TARGET0)
97 -$(DEL_FILE) $(READERDIR)/filters/$(TARGET1)
98 -$(DEL_FILE) $(READERDIR)/filters/$(TARGET2)
99 -$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/filters/
100
101
102
103staticlib: $(TARGETA)
104
105$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
106 -$(DEL_FILE) $(TARGETA)
107 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
108
109mocables: $(SRCMOC)
110uicables: $(UICDECLS) $(UICIMPLS)
111
112$(MOC):
113 ( cd $(QTDIR)/src/moc ; $(MAKE) )
114
115HTMLFilter.mak: HTMLFilter.pro /usr/lib/qt3/mkspecs/default/qmake.conf
116 $(QMAKE) -o HTMLFilter.mak HTMLFilter.pro
117qmake:
118 @$(QMAKE) -o HTMLFilter.mak HTMLFilter.pro
119
120dist:
121 @mkdir -p QREADEROBJS/HTMLfilter && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/HTMLfilter/ && ( cd `dirname QREADEROBJS/HTMLfilter` && $(TAR) HTMLfilter.tar HTMLfilter && $(GZIP) HTMLfilter.tar ) && $(MOVE) `dirname QREADEROBJS/HTMLfilter`/HTMLfilter.tar.gz . && $(DEL_FILE) -r QREADEROBJS/HTMLfilter
122
123mocclean:
124
125uiclean:
126
127yaccclean:
128lexclean:
129clean:
130 -$(DEL_FILE) $(OBJECTS)
131 -$(DEL_FILE) *~ core *.core
132
133
134####### Sub-libraries
135
136distclean: clean
137 -$(DEL_FILE) $(READERDIR)/filters/$(TARGET) $(TARGET)
138 -$(DEL_FILE) $(READERDIR)/filters/$(TARGET0) $(READERDIR)/filters/$(TARGET1) $(READERDIR)/filters/$(TARGET2) $(TARGETA)
139
140
141FORCE:
142
143####### Compile
144
145QREADEROBJS/striphtml.o: striphtml.cpp QREADERINC/useqpe.h \
146 CDrawBuffer.h \
147 striphtml.h \
148 hrule.h \
149 StyleConsts.h \
150 CBuffer.h \
151 my_list.h \
152 linktype.h \
153 config.h \
154 ustring.h \
155 CFilter.h \
156 Navigation.h \
157 CExpander.h \
158 CEncoding.h \
159 QREADERINC/static.h \
160 Markups.h \
161 names.h \
162 CEncoding_tables.h
163 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/striphtml.o striphtml.cpp
164
165####### Install
166
167install: all
168
169uninstall:
170
diff --git a/noncore/apps/opie-reader/HTMLFilter.omak b/noncore/apps/opie-reader/HTMLFilter.omak
deleted file mode 100644
index 1ab671f..0000000
--- a/noncore/apps/opie-reader/HTMLFilter.omak
+++ b/dev/null
@@ -1,131 +0,0 @@
1#############################################################################
2# Makefile for building libHTMLfilter.so.1.0.0
3# Generated by tmake at 15:14, 2004/05/08
4# Project: HTMLFilter.opro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
14 INCPATH =-IOREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =-shared -Wl,-soname,libHTMLfilter.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lqte
18 AR =arm-linux-ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =CFilter.h
29 SOURCES =striphtml.cpp
30 OBJECTS =OREADEROBJS/striphtml.o
31 INTERFACES =
32 UICDECLS =
33 UICIMPLS =
34 SRCMOC =
35 OBJMOC =
36 DIST =
37 TARGET =libHTMLfilter.so.1.0.0
38 TARGETA =$(QTDIR)/plugins/reader/filters/libHTMLfilter.a
39 TARGETD =libHTMLfilter.so.1.0.0
40 TARGET0 =libHTMLfilter.so
41 TARGET1 =libHTMLfilter.so.1
42 TARGET2 =libHTMLfilter.so.1.0
43INTERFACE_DECL_PATH = .
44
45####### Implicit rules
46
47.SUFFIXES: .cpp .cxx .cc .C .c
48
49.cpp.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51
52.cxx.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54
55.cc.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57
58.C.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60
61.c.o:
62 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
63
64####### Build rules
65
66
67all: $(QTDIR)/plugins/reader/filters/libHTMLfilter.so.1.0.0
68
69$(QTDIR)/plugins/reader/filters/libHTMLfilter.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
70 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
71 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
72 -ln -s $(TARGET) $(TARGET0)
73 -ln -s $(TARGET) $(TARGET1)
74 -ln -s $(TARGET) $(TARGET2)
75 -rm -f $(QTDIR)/plugins/reader/filters/$(TARGET)
76 -rm -f $(QTDIR)/plugins/reader/filters/$(TARGET0)
77 -rm -f $(QTDIR)/plugins/reader/filters/$(TARGET1)
78 -rm -f $(QTDIR)/plugins/reader/filters/$(TARGET2)
79 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/filters/
80
81staticlib: $(TARGETA)
82
83$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
84 -rm -f $(TARGETA)
85 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
86
87moc: $(SRCMOC)
88
89tmake: HTMLFilter.omak
90
91HTMLFilter.omak: HTMLFilter.opro
92 tmake HTMLFilter.opro -o HTMLFilter.omak
93
94dist:
95 $(TAR) HTMLFilter.opro.tar HTMLFilter.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
96 $(GZIP) HTMLFilter.opro.tar
97
98clean:
99 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
100 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
101 -rm -f *~ core
102
103####### Sub-libraries
104
105
106###### Combined headers
107
108
109####### Compile
110
111OREADEROBJS/striphtml.o: striphtml.cpp \
112 OREADERINC/useqpe.h \
113 CDrawBuffer.h \
114 StyleConsts.h \
115 CBuffer.h \
116 config.h \
117 ustring.h \
118 my_list.h \
119 linktype.h \
120 striphtml.h \
121 CFilter.h \
122 CExpander.h \
123 Markups.h \
124 names.h \
125 CEncoding.h \
126 CEncoding_tables.h \
127 OREADERINC/static.h \
128 Navigation.h \
129 hrule.h
130 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/striphtml.o striphtml.cpp
131
diff --git a/noncore/apps/opie-reader/HTMLFilter.wmak b/noncore/apps/opie-reader/HTMLFilter.wmak
deleted file mode 100644
index 485bb21..0000000
--- a/noncore/apps/opie-reader/HTMLFilter.wmak
+++ b/dev/null
@@ -1,131 +0,0 @@
1#############################################################################
2# Makefile for building libHTMLfilter.so.1.0.0
3# Generated by tmake at 23:23, 2004/03/09
4# Project: HTMLFilter.wpro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =gcc-2.96
11 CXX =g++-2.96
12 CFLAGS =-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
14 INCPATH =-IWSREADERINC -I$(QTDIR)/include
15 LINK =g++-2.96
16 LFLAGS =-shared -Wl,-soname,libHTMLfilter.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lqte
18 AR =ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =CFilter.h
29 SOURCES =striphtml.cpp
30 OBJECTS =WSREADEROBJS/striphtml.o
31 INTERFACES =
32 UICDECLS =
33 UICIMPLS =
34 SRCMOC =
35 OBJMOC =
36 DIST =
37 TARGET =libHTMLfilter.so.1.0.0
38 TARGETA =$(QTDIR)/plugins/reader/filters/libHTMLfilter.a
39 TARGETD =libHTMLfilter.so.1.0.0
40 TARGET0 =libHTMLfilter.so
41 TARGET1 =libHTMLfilter.so.1
42 TARGET2 =libHTMLfilter.so.1.0
43INTERFACE_DECL_PATH = .
44
45####### Implicit rules
46
47.SUFFIXES: .cpp .cxx .cc .C .c
48
49.cpp.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51
52.cxx.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54
55.cc.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57
58.C.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60
61.c.o:
62 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
63
64####### Build rules
65
66
67all: $(QTDIR)/plugins/reader/filters/libHTMLfilter.so.1.0.0
68
69$(QTDIR)/plugins/reader/filters/libHTMLfilter.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
70 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
71 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
72 -ln -s $(TARGET) $(TARGET0)
73 -ln -s $(TARGET) $(TARGET1)
74 -ln -s $(TARGET) $(TARGET2)
75 -rm -f $(QTDIR)/plugins/reader/filters/$(TARGET)
76 -rm -f $(QTDIR)/plugins/reader/filters/$(TARGET0)
77 -rm -f $(QTDIR)/plugins/reader/filters/$(TARGET1)
78 -rm -f $(QTDIR)/plugins/reader/filters/$(TARGET2)
79 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/filters/
80
81staticlib: $(TARGETA)
82
83$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
84 -rm -f $(TARGETA)
85 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
86
87moc: $(SRCMOC)
88
89tmake: HTMLFilter.wmak
90
91HTMLFilter.wmak: HTMLFilter.wpro
92 tmake HTMLFilter.wpro -o HTMLFilter.wmak
93
94dist:
95 $(TAR) HTMLFilter.wpro.tar HTMLFilter.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
96 $(GZIP) HTMLFilter.wpro.tar
97
98clean:
99 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
100 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
101 -rm -f *~ core
102
103####### Sub-libraries
104
105
106###### Combined headers
107
108
109####### Compile
110
111WSREADEROBJS/striphtml.o: striphtml.cpp \
112 WSREADERINC/useqpe.h \
113 CDrawBuffer.h \
114 StyleConsts.h \
115 CBuffer.h \
116 config.h \
117 ustring.h \
118 my_list.h \
119 linktype.h \
120 striphtml.h \
121 CFilter.h \
122 CExpander.h \
123 Markups.h \
124 names.h \
125 CEncoding.h \
126 CEncoding_tables.h \
127 WSREADERINC/static.h \
128 Navigation.h \
129 hrule.h
130 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/striphtml.o striphtml.cpp
131
diff --git a/noncore/apps/opie-reader/HTMLFilter.wpro b/noncore/apps/opie-reader/HTMLFilter.wpro
deleted file mode 100644
index e0425b4..0000000
--- a/noncore/apps/opie-reader/HTMLFilter.wpro
+++ b/dev/null
@@ -1,17 +0,0 @@
1 TEMPLATE= lib
2 CONFIG = qt warn_on release dll
3 HEADERS = CFilter.h
4
5 SOURCES = striphtml.cpp
6
7
8 INTERFACES=
9 DESTDIR = $(QTDIR)/plugins/reader/filters
10 TARGET = HTMLfilter
11
12
13
14OBJECTS_DIR = WSREADEROBJS
15MOC_DIR = WSREADERMOCS
16 INCLUDEPATH+= WSREADERINC
17 DEPENDPATH+= WSREADERINC
diff --git a/noncore/apps/opie-reader/HTMLFilter.zmak b/noncore/apps/opie-reader/HTMLFilter.zmak
deleted file mode 100644
index d1af765..0000000
--- a/noncore/apps/opie-reader/HTMLFilter.zmak
+++ b/dev/null
@@ -1,131 +0,0 @@
1#############################################################################
2# Makefile for building libHTMLfilter.so.1.0.0
3# Generated by tmake at 15:17, 2004/05/08
4# Project: HTMLFilter.zpro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
14 INCPATH =-IZREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =-shared -Wl,-soname,libHTMLfilter.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lqte
18 AR =arm-linux-ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =CFilter.h
29 SOURCES =striphtml.cpp
30 OBJECTS =ZREADEROBJS/striphtml.o
31 INTERFACES =
32 UICDECLS =
33 UICIMPLS =
34 SRCMOC =
35 OBJMOC =
36 DIST =
37 TARGET =libHTMLfilter.so.1.0.0
38 TARGETA =$(QTDIR)/plugins/reader/filters/libHTMLfilter.a
39 TARGETD =libHTMLfilter.so.1.0.0
40 TARGET0 =libHTMLfilter.so
41 TARGET1 =libHTMLfilter.so.1
42 TARGET2 =libHTMLfilter.so.1.0
43INTERFACE_DECL_PATH = .
44
45####### Implicit rules
46
47.SUFFIXES: .cpp .cxx .cc .C .c
48
49.cpp.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51
52.cxx.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54
55.cc.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57
58.C.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60
61.c.o:
62 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
63
64####### Build rules
65
66
67all: $(QTDIR)/plugins/reader/filters/libHTMLfilter.so.1.0.0
68
69$(QTDIR)/plugins/reader/filters/libHTMLfilter.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
70 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
71 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
72 -ln -s $(TARGET) $(TARGET0)
73 -ln -s $(TARGET) $(TARGET1)
74 -ln -s $(TARGET) $(TARGET2)
75 -rm -f $(QTDIR)/plugins/reader/filters/$(TARGET)
76 -rm -f $(QTDIR)/plugins/reader/filters/$(TARGET0)
77 -rm -f $(QTDIR)/plugins/reader/filters/$(TARGET1)
78 -rm -f $(QTDIR)/plugins/reader/filters/$(TARGET2)
79 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/filters/
80
81staticlib: $(TARGETA)
82
83$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
84 -rm -f $(TARGETA)
85 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
86
87moc: $(SRCMOC)
88
89tmake: HTMLFilter.zmak
90
91HTMLFilter.zmak: HTMLFilter.zpro
92 tmake HTMLFilter.zpro -o HTMLFilter.zmak
93
94dist:
95 $(TAR) HTMLFilter.zpro.tar HTMLFilter.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
96 $(GZIP) HTMLFilter.zpro.tar
97
98clean:
99 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
100 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
101 -rm -f *~ core
102
103####### Sub-libraries
104
105
106###### Combined headers
107
108
109####### Compile
110
111ZREADEROBJS/striphtml.o: striphtml.cpp \
112 ZREADERINC/useqpe.h \
113 CDrawBuffer.h \
114 StyleConsts.h \
115 CBuffer.h \
116 config.h \
117 ustring.h \
118 my_list.h \
119 linktype.h \
120 striphtml.h \
121 CFilter.h \
122 CExpander.h \
123 Markups.h \
124 names.h \
125 CEncoding.h \
126 CEncoding_tables.h \
127 ZREADERINC/static.h \
128 Navigation.h \
129 hrule.h
130 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/striphtml.o striphtml.cpp
131
diff --git a/noncore/apps/opie-reader/HTMLFilter.zpro b/noncore/apps/opie-reader/HTMLFilter.zpro
deleted file mode 100644
index ba570b1..0000000
--- a/noncore/apps/opie-reader/HTMLFilter.zpro
+++ b/dev/null
@@ -1,17 +0,0 @@
1 TEMPLATE= lib
2 CONFIG = qt warn_on release dll
3 HEADERS = CFilter.h
4
5 SOURCES = striphtml.cpp
6
7
8 INTERFACES=
9 DESTDIR = $(QTDIR)/plugins/reader/filters
10 TARGET = HTMLfilter
11
12
13
14OBJECTS_DIR = ZREADEROBJS
15MOC_DIR = ZREADERMOCS
16 INCLUDEPATH+= ZREADERINC
17 DEPENDPATH+= ZREADERINC
diff --git a/noncore/apps/opie-reader/PluckerCodec.mak b/noncore/apps/opie-reader/PluckerCodec.mak
deleted file mode 100644
index ffd6ba8..0000000
--- a/noncore/apps/opie-reader/PluckerCodec.mak
+++ b/dev/null
@@ -1,176 +0,0 @@
1#############################################################################
2# Makefile for building: libPlucker.so.1.0.0
3# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:40:46 2004
4# Project: PluckerCodec.pro
5# Template: lib
6# Command: $(QMAKE) -o PluckerCodec.mak PluckerCodec.pro
7#############################################################################
8
9####### Compiler, tools and options
10
11CC = gcc
12CXX = g++
13LEX = flex
14YACC = yacc
15CFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
16CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
17LEXFLAGS =
18YACCFLAGS= -d
19INCPATH = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
20LINK = g++
21LFLAGS = -shared -Wl,-soname,libPlucker.so.1
22LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_pdb -lreader_pluckerbase -lreader_codec -lqt-mt -lXext -lX11 -lm -lpthread
23AR = ar cqs
24RANLIB =
25MOC = $(QTDIR)/bin/moc
26UIC = $(QTDIR)/bin/uic
27QMAKE = qmake
28TAR = tar -cf
29GZIP = gzip -9f
30COPY = cp -f
31COPY_FILE= $(COPY)
32COPY_DIR = $(COPY) -r
33DEL_FILE = rm -f
34SYMLINK = ln -sf
35DEL_DIR = rmdir
36MOVE = mv -f
37CHK_DIR_EXISTS= test -d
38MKDIR = mkdir -p
39
40####### Output directory
41
42OBJECTS_DIR = QREADEROBJS/
43
44####### Files
45
46HEADERS = plucker.h
47SOURCES = plucker.cpp \
48 Palm2QImage.cpp
49OBJECTS = QREADEROBJS/plucker.o \
50 QREADEROBJS/Palm2QImage.o
51FORMS =
52UICDECLS =
53UICIMPLS =
54SRCMOC =
55OBJMOC =
56 DIST = PluckerCodec.pro
57QMAKE_TARGET = Plucker
58DESTDIR = $(READERDIR)/codecs/
59TARGET = libPlucker.so.1.0.0
60 TARGETA= $(READERDIR)/codecs/libPlucker.a
61 TARGETD= libPlucker.so.1.0.0
62 TARGET0= libPlucker.so
63 TARGET1= libPlucker.so.1
64 TARGET2= libPlucker.so.1.0
65
66first: all
67####### Implicit rules
68
69.SUFFIXES: .c .o .cpp .cc .cxx .C
70
71.cpp.o:
72 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
73
74.cc.o:
75 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
76
77.cxx.o:
78 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
79
80.C.o:
81 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
82
83.c.o:
84 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
85
86####### Build rules
87
88all: PluckerCodec.mak $(READERDIR)/codecs/$(TARGET)
89
90$(READERDIR)/codecs/$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)
91 test -d $(READERDIR)/codecs/ || mkdir -p $(READERDIR)/codecs/
92 -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
93 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
94 -ln -s $(TARGET) $(TARGET0)
95 -ln -s $(TARGET) $(TARGET1)
96 -ln -s $(TARGET) $(TARGET2)
97 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET)
98 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0)
99 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET1)
100 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET2)
101 -$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/codecs/
102
103
104
105staticlib: $(TARGETA)
106
107$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
108 -$(DEL_FILE) $(TARGETA)
109 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
110
111mocables: $(SRCMOC)
112uicables: $(UICDECLS) $(UICIMPLS)
113
114$(MOC):
115 ( cd $(QTDIR)/src/moc ; $(MAKE) )
116
117PluckerCodec.mak: PluckerCodec.pro /usr/lib/qt3/mkspecs/default/qmake.conf
118 $(QMAKE) -o PluckerCodec.mak PluckerCodec.pro
119qmake:
120 @$(QMAKE) -o PluckerCodec.mak PluckerCodec.pro
121
122dist:
123 @mkdir -p QREADEROBJS/Plucker && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/Plucker/ && ( cd `dirname QREADEROBJS/Plucker` && $(TAR) Plucker.tar Plucker && $(GZIP) Plucker.tar ) && $(MOVE) `dirname QREADEROBJS/Plucker`/Plucker.tar.gz . && $(DEL_FILE) -r QREADEROBJS/Plucker
124
125mocclean:
126
127uiclean:
128
129yaccclean:
130lexclean:
131clean:
132 -$(DEL_FILE) $(OBJECTS)
133 -$(DEL_FILE) *~ core *.core
134
135
136####### Sub-libraries
137
138distclean: clean
139 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET) $(TARGET)
140 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0) $(READERDIR)/codecs/$(TARGET1) $(READERDIR)/codecs/$(TARGET2) $(TARGETA)
141
142
143FORCE:
144
145####### Compile
146
147QREADEROBJS/plucker.o: plucker.cpp QREADERINC/useqpe.h \
148 plucker.h \
149 Aportis.h \
150 Palm2QImage.h \
151 QREADERINC/static.h \
152 plucker_base.h \
153 CExpander.h \
154 ztxt.h \
155 pdb.h \
156 CBuffer.h \
157 my_list.h \
158 Navigation.h \
159 hrule.h \
160 config.h \
161 StyleConsts.h \
162 Markups.h \
163 names.h \
164 linktype.h \
165 ustring.h
166 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/plucker.o plucker.cpp
167
168QREADEROBJS/Palm2QImage.o: Palm2QImage.cpp QREADERINC/useqpe.h
169 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/Palm2QImage.o Palm2QImage.cpp
170
171####### Install
172
173install: all
174
175uninstall:
176
diff --git a/noncore/apps/opie-reader/PluckerCodec.omak b/noncore/apps/opie-reader/PluckerCodec.omak
deleted file mode 100644
index 27a5c93..0000000
--- a/noncore/apps/opie-reader/PluckerCodec.omak
+++ b/dev/null
@@ -1,138 +0,0 @@
1#############################################################################
2# Makefile for building libPlucker.so.1.0.0
3# Generated by tmake at 15:14, 2004/05/08
4# Project: PluckerCodec.opro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
14 INCPATH =-IOREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =-shared -Wl,-soname,libPlucker.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_pluckerbase -lreader_codec -lqte
18 AR =arm-linux-ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =plucker.h
29 SOURCES =plucker.cpp \
30 Palm2QImage.cpp
31 OBJECTS =OREADEROBJS/plucker.o \
32 OREADEROBJS/Palm2QImage.o
33 INTERFACES =
34 UICDECLS =
35 UICIMPLS =
36 SRCMOC =
37 OBJMOC =
38 DIST =
39 TARGET =libPlucker.so.1.0.0
40 TARGETA =$(QTDIR)/plugins/reader/codecs/libPlucker.a
41 TARGETD =libPlucker.so.1.0.0
42 TARGET0 =libPlucker.so
43 TARGET1 =libPlucker.so.1
44 TARGET2 =libPlucker.so.1.0
45INTERFACE_DECL_PATH = .
46
47####### Implicit rules
48
49.SUFFIXES: .cpp .cxx .cc .C .c
50
51.cpp.o:
52 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
53
54.cxx.o:
55 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
56
57.cc.o:
58 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
59
60.C.o:
61 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
62
63.c.o:
64 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
65
66####### Build rules
67
68
69all: $(QTDIR)/plugins/reader/codecs/libPlucker.so.1.0.0
70
71$(QTDIR)/plugins/reader/codecs/libPlucker.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
72 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
73 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
74 -ln -s $(TARGET) $(TARGET0)
75 -ln -s $(TARGET) $(TARGET1)
76 -ln -s $(TARGET) $(TARGET2)
77 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
78 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
79 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
80 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
81 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
82
83staticlib: $(TARGETA)
84
85$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
86 -rm -f $(TARGETA)
87 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
88
89moc: $(SRCMOC)
90
91tmake: PluckerCodec.omak
92
93PluckerCodec.omak: PluckerCodec.opro
94 tmake PluckerCodec.opro -o PluckerCodec.omak
95
96dist:
97 $(TAR) PluckerCodec.opro.tar PluckerCodec.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
98 $(GZIP) PluckerCodec.opro.tar
99
100clean:
101 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
102 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
103 -rm -f *~ core
104
105####### Sub-libraries
106
107
108###### Combined headers
109
110
111####### Compile
112
113OREADEROBJS/plucker.o: plucker.cpp \
114 OREADERINC/useqpe.h \
115 plucker.h \
116 plucker_base.h \
117 CExpander.h \
118 config.h \
119 ustring.h \
120 StyleConsts.h \
121 Markups.h \
122 names.h \
123 linktype.h \
124 ztxt.h \
125 pdb.h \
126 CBuffer.h \
127 my_list.h \
128 Navigation.h \
129 hrule.h \
130 Aportis.h \
131 Palm2QImage.h \
132 OREADERINC/static.h
133 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/plucker.o plucker.cpp
134
135OREADEROBJS/Palm2QImage.o: Palm2QImage.cpp \
136 OREADERINC/useqpe.h
137 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/Palm2QImage.o Palm2QImage.cpp
138
diff --git a/noncore/apps/opie-reader/PluckerCodec.wmak b/noncore/apps/opie-reader/PluckerCodec.wmak
deleted file mode 100644
index 6c1f37a..0000000
--- a/noncore/apps/opie-reader/PluckerCodec.wmak
+++ b/dev/null
@@ -1,138 +0,0 @@
1#############################################################################
2# Makefile for building libPlucker.so.1.0.0
3# Generated by tmake at 23:23, 2004/03/09
4# Project: PluckerCodec.wpro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =gcc-2.96
11 CXX =g++-2.96
12 CFLAGS =-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
14 INCPATH =-IWSREADERINC -I$(QTDIR)/include
15 LINK =g++-2.96
16 LFLAGS =-shared -Wl,-soname,libPlucker.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_pluckerbase -lreader_codec -lqte
18 AR =ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =plucker.h
29 SOURCES =plucker.cpp \
30 Palm2QImage.cpp
31 OBJECTS =WSREADEROBJS/plucker.o \
32 WSREADEROBJS/Palm2QImage.o
33 INTERFACES =
34 UICDECLS =
35 UICIMPLS =
36 SRCMOC =
37 OBJMOC =
38 DIST =
39 TARGET =libPlucker.so.1.0.0
40 TARGETA =$(QTDIR)/plugins/reader/codecs/libPlucker.a
41 TARGETD =libPlucker.so.1.0.0
42 TARGET0 =libPlucker.so
43 TARGET1 =libPlucker.so.1
44 TARGET2 =libPlucker.so.1.0
45INTERFACE_DECL_PATH = .
46
47####### Implicit rules
48
49.SUFFIXES: .cpp .cxx .cc .C .c
50
51.cpp.o:
52 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
53
54.cxx.o:
55 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
56
57.cc.o:
58 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
59
60.C.o:
61 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
62
63.c.o:
64 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
65
66####### Build rules
67
68
69all: $(QTDIR)/plugins/reader/codecs/libPlucker.so.1.0.0
70
71$(QTDIR)/plugins/reader/codecs/libPlucker.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
72 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
73 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
74 -ln -s $(TARGET) $(TARGET0)
75 -ln -s $(TARGET) $(TARGET1)
76 -ln -s $(TARGET) $(TARGET2)
77 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
78 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
79 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
80 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
81 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
82
83staticlib: $(TARGETA)
84
85$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
86 -rm -f $(TARGETA)
87 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
88
89moc: $(SRCMOC)
90
91tmake: PluckerCodec.wmak
92
93PluckerCodec.wmak: PluckerCodec.wpro
94 tmake PluckerCodec.wpro -o PluckerCodec.wmak
95
96dist:
97 $(TAR) PluckerCodec.wpro.tar PluckerCodec.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
98 $(GZIP) PluckerCodec.wpro.tar
99
100clean:
101 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
102 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
103 -rm -f *~ core
104
105####### Sub-libraries
106
107
108###### Combined headers
109
110
111####### Compile
112
113WSREADEROBJS/plucker.o: plucker.cpp \
114 WSREADERINC/useqpe.h \
115 plucker.h \
116 plucker_base.h \
117 CExpander.h \
118 config.h \
119 ustring.h \
120 StyleConsts.h \
121 Markups.h \
122 names.h \
123 linktype.h \
124 ztxt.h \
125 pdb.h \
126 CBuffer.h \
127 my_list.h \
128 Navigation.h \
129 hrule.h \
130 Aportis.h \
131 Palm2QImage.h \
132 WSREADERINC/static.h
133 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/plucker.o plucker.cpp
134
135WSREADEROBJS/Palm2QImage.o: Palm2QImage.cpp \
136 WSREADERINC/useqpe.h
137 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/Palm2QImage.o Palm2QImage.cpp
138
diff --git a/noncore/apps/opie-reader/PluckerCodec.wpro b/noncore/apps/opie-reader/PluckerCodec.wpro
deleted file mode 100644
index 8f80a8b..0000000
--- a/noncore/apps/opie-reader/PluckerCodec.wpro
+++ b/dev/null
@@ -1,16 +0,0 @@
1 TEMPLATE= lib
2 CONFIG = qt warn_on release dll
3 HEADERS = plucker.h
4
5 SOURCES = plucker.cpp \
6 Palm2QImage.cpp
7
8 INTERFACES=
9 DESTDIR = $(QTDIR)/plugins/reader/codecs
10 TARGET = Plucker
11LIBS += -lreader_pdb -lreader_pluckerbase -lreader_codec
12
13OBJECTS_DIR = WSREADEROBJS
14MOC_DIR = WSREADERMOCS
15 INCLUDEPATH+= WSREADERINC
16 DEPENDPATH+= WSREADERINC
diff --git a/noncore/apps/opie-reader/PluckerCodec.zmak b/noncore/apps/opie-reader/PluckerCodec.zmak
deleted file mode 100644
index 9aa5e39..0000000
--- a/noncore/apps/opie-reader/PluckerCodec.zmak
+++ b/dev/null
@@ -1,138 +0,0 @@
1#############################################################################
2# Makefile for building libPlucker.so.1.0.0
3# Generated by tmake at 15:17, 2004/05/08
4# Project: PluckerCodec.zpro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
14 INCPATH =-IZREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =-shared -Wl,-soname,libPlucker.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_pluckerbase -lreader_codec -lqte
18 AR =arm-linux-ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =plucker.h
29 SOURCES =plucker.cpp \
30 Palm2QImage.cpp
31 OBJECTS =ZREADEROBJS/plucker.o \
32 ZREADEROBJS/Palm2QImage.o
33 INTERFACES =
34 UICDECLS =
35 UICIMPLS =
36 SRCMOC =
37 OBJMOC =
38 DIST =
39 TARGET =libPlucker.so.1.0.0
40 TARGETA =$(QTDIR)/plugins/reader/codecs/libPlucker.a
41 TARGETD =libPlucker.so.1.0.0
42 TARGET0 =libPlucker.so
43 TARGET1 =libPlucker.so.1
44 TARGET2 =libPlucker.so.1.0
45INTERFACE_DECL_PATH = .
46
47####### Implicit rules
48
49.SUFFIXES: .cpp .cxx .cc .C .c
50
51.cpp.o:
52 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
53
54.cxx.o:
55 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
56
57.cc.o:
58 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
59
60.C.o:
61 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
62
63.c.o:
64 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
65
66####### Build rules
67
68
69all: $(QTDIR)/plugins/reader/codecs/libPlucker.so.1.0.0
70
71$(QTDIR)/plugins/reader/codecs/libPlucker.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
72 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
73 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
74 -ln -s $(TARGET) $(TARGET0)
75 -ln -s $(TARGET) $(TARGET1)
76 -ln -s $(TARGET) $(TARGET2)
77 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
78 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
79 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
80 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
81 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
82
83staticlib: $(TARGETA)
84
85$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
86 -rm -f $(TARGETA)
87 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
88
89moc: $(SRCMOC)
90
91tmake: PluckerCodec.zmak
92
93PluckerCodec.zmak: PluckerCodec.zpro
94 tmake PluckerCodec.zpro -o PluckerCodec.zmak
95
96dist:
97 $(TAR) PluckerCodec.zpro.tar PluckerCodec.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
98 $(GZIP) PluckerCodec.zpro.tar
99
100clean:
101 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
102 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
103 -rm -f *~ core
104
105####### Sub-libraries
106
107
108###### Combined headers
109
110
111####### Compile
112
113ZREADEROBJS/plucker.o: plucker.cpp \
114 ZREADERINC/useqpe.h \
115 plucker.h \
116 plucker_base.h \
117 CExpander.h \
118 config.h \
119 ustring.h \
120 StyleConsts.h \
121 Markups.h \
122 names.h \
123 linktype.h \
124 ztxt.h \
125 pdb.h \
126 CBuffer.h \
127 my_list.h \
128 Navigation.h \
129 hrule.h \
130 Aportis.h \
131 Palm2QImage.h \
132 ZREADERINC/static.h
133 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/plucker.o plucker.cpp
134
135ZREADEROBJS/Palm2QImage.o: Palm2QImage.cpp \
136 ZREADERINC/useqpe.h
137 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/Palm2QImage.o Palm2QImage.cpp
138
diff --git a/noncore/apps/opie-reader/PluckerCodec.zpro b/noncore/apps/opie-reader/PluckerCodec.zpro
deleted file mode 100644
index e462d96..0000000
--- a/noncore/apps/opie-reader/PluckerCodec.zpro
+++ b/dev/null
@@ -1,16 +0,0 @@
1 TEMPLATE= lib
2 CONFIG = qt warn_on release dll
3 HEADERS = plucker.h
4
5 SOURCES = plucker.cpp \
6 Palm2QImage.cpp
7
8 INTERFACES=
9 DESTDIR = $(QTDIR)/plugins/reader/codecs
10 TARGET = Plucker
11LIBS += -lreader_pdb -lreader_pluckerbase -lreader_codec
12
13OBJECTS_DIR = ZREADEROBJS
14MOC_DIR = ZREADERMOCS
15 INCLUDEPATH+= ZREADERINC
16 DEPENDPATH+= ZREADERINC
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index 63d1fb0..ec7a29c 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -1,4966 +1,4965 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. Allrights reserved. 2** Copyright (C) 2000 Trolltech AS. Allrights reserved.
3** 3**
4** This file is part of Qt Palmtop Environment. 4** This file is part of Qt Palmtop 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#include "useqpe.h" 20#include "useqpe.h"
21#include <qregexp.h> 21#include <qregexp.h>
22#include <qclipboard.h> 22#include <qclipboard.h>
23#include <qwidgetstack.h> 23#include <qwidgetstack.h>
24#ifdef USEQPE 24#ifdef USEQPE
25#include <qpe/qpemenubar.h> 25#include <qpe/qpemenubar.h>
26#include <qpe/qpetoolbar.h> 26#include <qpe/qpetoolbar.h>
27#endif 27#endif
28#include <qmenubar.h> 28#include <qmenubar.h>
29#include <qtoolbar.h> 29#include <qtoolbar.h>
30#ifdef USEQPE 30#ifdef USEQPE
31#include <qpe/menubutton.h> 31#include <qpe/menubutton.h>
32#endif 32#endif
33#include <qcombobox.h> 33#include <qcombobox.h>
34#include <qpopupmenu.h> 34#include <qpopupmenu.h>
35#include <qaction.h> 35#include <qaction.h>
36#include <qapplication.h> 36#include <qapplication.h>
37#include <qlineedit.h> 37#include <qlineedit.h>
38#include <qtoolbutton.h> 38#include <qtoolbutton.h>
39#include <qspinbox.h> 39#include <qspinbox.h>
40#include <qobjectlist.h> 40#include <qobjectlist.h>
41#include <qstatusbar.h> 41#include <qstatusbar.h>
42#ifdef USEQPE 42#ifdef USEQPE
43#include <qpe/global.h> 43#include <qpe/global.h>
44#include <qpe/applnk.h> 44#include <qpe/applnk.h>
45#endif 45#endif
46#include <qfileinfo.h> 46#include <qfileinfo.h>
47#include <stdlib.h> //getenv 47#include <stdlib.h> //getenv
48#include <qprogressbar.h> 48#include <qprogressbar.h>
49#ifdef USEQPE 49#ifdef USEQPE
50#include <qpe/config.h> 50#include <qpe/config.h>
51#endif 51#endif
52#include <qbuttongroup.h> 52#include <qbuttongroup.h>
53#include <qradiobutton.h> 53#include <qradiobutton.h>
54#ifdef USEQPE 54#ifdef USEQPE
55#include <qpe/qcopenvelope_qws.h> 55#include <qpe/qcopenvelope_qws.h>
56#endif 56#endif
57#include "QTReader.h" 57#include "QTReader.h"
58#include "GraphicWin.h" 58#include "GraphicWin.h"
59#include "Bkmks.h" 59#include "Bkmks.h"
60#include "cbkmkselector.h" 60#include "cbkmkselector.h"
61#include "infowin.h" 61#include "infowin.h"
62#include "ToolbarPrefs.h" 62#include "ToolbarPrefs.h"
63#include "Prefs.h" 63#include "Prefs.h"
64#include "CAnnoEdit.h" 64#include "CAnnoEdit.h"
65#include "QFloatBar.h" 65#include "QFloatBar.h"
66#include "FixedFont.h" 66#include "FixedFont.h"
67#include "URLDialog.h" 67#include "URLDialog.h"
68#include "util.h" 68#include "util.h"
69#include <qfontdatabase.h> 69#include <qfontdatabase.h>
70#include "opie.h" 70#ifdef USEQPE
71#ifdef USEQPE 71#include <qpe/resource.h>
72#include <qpe/resource.h> 72#ifdef OPIE
73#ifdef OPIE 73//#include <qpe/applnk.h>
74//#include <qpe/applnk.h> 74#include <opie2/ofiledialog.h>
75#include <opie2/ofiledialog.h> 75using namespace Opie::Ui;
76using namespace Opie::Ui; 76#else
77#else 77#include "fileBrowser.h"
78#include "fileBrowser.h" 78#endif
79#endif 79#else
80#else 80#include "qfiledialog.h"
81#include "qfiledialog.h" 81#endif
82#endif 82
83 83#include "QTReaderApp.h"
84#include "QTReaderApp.h" 84#include "CDrawBuffer.h"
85#include "CDrawBuffer.h" 85#include "Filedata.h"
86#include "Filedata.h" 86#include "useqpe.h"
87#include "useqpe.h" 87#include "names.h"
88#include "names.h" 88#include "CEncoding_tables.h"
89#include "CEncoding_tables.h" 89#include "CloseDialog.h"
90#include "CloseDialog.h" 90
91 91#include "ButtonPrefs.h"
92#include "ButtonPrefs.h" 92
93 93bool CheckVersion(int&, int&, char&);
94bool CheckVersion(int&, int&, char&); 94
95 95#ifdef _WINDOWS
96#ifdef _WINDOWS 96#define PICDIR "c:\\uqtreader\\pics\\"
97#define PICDIR "c:\\uqtreader\\pics\\" 97#else
98#else 98#ifdef USEQPE
99#ifdef USEQPE 99#define USEMSGS
100#define USEMSGS 100#define PICDIR "opie-reader/"
101#define PICDIR "opie-reader/" 101#else
102#else 102//#define PICDIR "/home/tim/uqtreader/pics/"
103//#define PICDIR "/home/tim/uqtreader/pics/" 103QString picdir()
104QString picdir() 104{
105{ 105 QString hd(getenv("READERDIR"));
106 QString hd(getenv("READERDIR")); 106 return hd + "/pics";
107 return hd + "/pics"; 107}
108} 108#define PICDIR picdir()
109#define PICDIR picdir() 109#endif
110#endif 110#endif
111#endif 111
112 112unsigned long QTReaderApp::m_uid = 0;
113unsigned long QTReaderApp::m_uid = 0; 113
114 114void QTReaderApp::setScrollState(bool _b) { m_scrollButton->setOn(_b); }
115void QTReaderApp::setScrollState(bool _b) { m_scrollButton->setOn(_b); } 115
116 116#ifdef USEQPE
117#ifdef USEQPE 117#define geticon(iconname) Resource::loadPixmap( iconname )
118#define geticon(iconname) Resource::loadPixmap( iconname ) 118#define getmyicon(iconname) Resource::loadPixmap( PICDIR iconname )
119#define getmyicon(iconname) Resource::loadPixmap( PICDIR iconname ) 119#else
120#else 120//#define geticon(iconname) QPixmap(PICDIR iconname ".png")
121//#define geticon(iconname) QPixmap(PICDIR iconname ".png") 121#define geticon(iconname) QPixmap(PICDIR +"/"+iconname+".png")
122#define geticon(iconname) QPixmap(PICDIR +"/"+iconname+".png") 122#define getmyicon(iconname) geticon(iconname)
123#define getmyicon(iconname) geticon(iconname) 123//#define geticon(iconname) QIconSet( QPixmap(PICDIR iconname) )
124//#define geticon(iconname) QIconSet( QPixmap(PICDIR iconname) ) 124#endif
125#endif 125
126 126#ifndef _WINDOWS
127#ifndef _WINDOWS 127#include <unistd.h>
128#include <unistd.h> 128#endif
129#endif 129#include <stddef.h>
130#include <stddef.h> 130#ifndef _WINDOWS
131#ifndef _WINDOWS 131#include <dirent.h>
132#include <dirent.h> 132#endif
133#endif 133
134 134void QTReaderApp::listBkmkFiles()
135void QTReaderApp::listBkmkFiles() 135{
136{ 136 bkmkselector->clear();
137 bkmkselector->clear(); 137 bkmkselector->setText("Cancel");
138 bkmkselector->setText("Cancel"); 138#ifndef USEQPE
139#ifndef USEQPE 139 int cnt = 0;
140 int cnt = 0; 140
141 141 QDir d = QDir::home(); // "/"
142 QDir d = QDir::home(); // "/" 142 if ( !d.cd(APPDIR) ) { // "/tmp"
143 if ( !d.cd(APPDIR) ) { // "/tmp" 143 qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
144 qWarning( "Cannot find the \"~/" APPDIR "\" directory" ); 144 d = QDir::home();
145 d = QDir::home(); 145 d.mkdir(APPDIR);
146 d.mkdir(APPDIR); 146 d.cd(APPDIR);
147 d.cd(APPDIR); 147 }
148 } 148
149 149
150 150
151 151
152 152 d.setFilter( QDir::Files | QDir::NoSymLinks );
153 d.setFilter( QDir::Files | QDir::NoSymLinks ); 153// d.setSorting( QDir::Size | QDir::Reversed );
154// d.setSorting( QDir::Size | QDir::Reversed ); 154
155 155 const QFileInfoList *list = d.entryInfoList();
156 const QFileInfoList *list = d.entryInfoList(); 156 QFileInfoListIterator it( *list ); // create list iterator
157 QFileInfoListIterator it( *list ); // create list iterator 157 QFileInfo *fi; // pointer for traversing
158 QFileInfo *fi; // pointer for traversing 158
159 159 while ( (fi=it.current()) ) { // for each file...
160 while ( (fi=it.current()) ) { // for each file... 160
161 161 bkmkselector->insertItem(fi->fileName());
162 bkmkselector->insertItem(fi->fileName()); 162 cnt++;
163 cnt++; 163
164 164 //qDebug( "%10li %s", fi->size(), fi->fileName().data() );
165 //qDebug( "%10li %s", fi->size(), fi->fileName().data() ); 165 ++it; // goto next list element
166 ++it; // goto next list element 166 }
167 } 167
168 168#else /* USEQPE */
169#else /* USEQPE */ 169 int cnt = 0;
170 int cnt = 0; 170 DIR *d;
171 DIR *d; 171 d = opendir((const char *)Global::applicationFileName(APPDIR,""));
172 d = opendir((const char *)Global::applicationFileName(APPDIR,"")); 172
173 173 while(1)
174 while(1) 174 {
175 { 175 struct dirent* de;
176 struct dirent* de; 176 struct stat buf;
177 struct stat buf; 177 de = readdir(d);
178 de = readdir(d); 178 if (de == NULL) break;
179 if (de == NULL) break; 179
180 180 if (lstat((const char *)Global::applicationFileName(APPDIR,de->d_name),&buf) == 0 && S_ISREG(buf.st_mode))
181 if (lstat((const char *)Global::applicationFileName(APPDIR,de->d_name),&buf) == 0 && S_ISREG(buf.st_mode)) 181 {
182 { 182 bkmkselector->insertItem(de->d_name);
183 bkmkselector->insertItem(de->d_name); 183 cnt++;
184 cnt++; 184 }
185 } 185 }
186 } 186
187 187 closedir(d);
188 closedir(d); 188#endif
189#endif 189 if (cnt > 0)
190 if (cnt > 0) 190 {
191 { 191//tjw menu->hide();
192//tjw menu->hide(); 192
193 193
194 194 editorStack->raiseWidget( bkmkselector );
195 editorStack->raiseWidget( bkmkselector ); 195 hidetoolbars();
196 hidetoolbars(); 196 m_nBkmkAction = cRmBkmkFile;
197 m_nBkmkAction = cRmBkmkFile; 197 }
198 } 198 else
199 else 199 QMessageBox::information(this, PROGNAME, "No bookmark files");
200 QMessageBox::information(this, PROGNAME, "No bookmark files"); 200}
201} 201
202 202void QTReaderApp::hidetoolbars()
203void QTReaderApp::hidetoolbars() 203{
204{ 204 if (m_scrollbar != NULL) m_scrollbar->hide();
205 if (m_scrollbar != NULL) m_scrollbar->hide(); 205 if (m_prog != NULL) m_prog->hide();
206 if (m_prog != NULL) m_prog->hide(); 206
207 207#ifdef USEQPE
208#ifdef USEQPE 208 menubar->hide();
209 menubar->hide(); 209#endif
210#endif 210
211 211 if (m_scrollbar != NULL) m_scrollbar->hide();
212 if (m_scrollbar != NULL) m_scrollbar->hide(); 212
213 213 if (fileBar != NULL) fileBar->hide();
214 if (fileBar != NULL) fileBar->hide(); 214 if (viewBar != NULL) viewBar->hide();
215 if (viewBar != NULL) viewBar->hide(); 215 if (navBar != NULL) navBar->hide();
216 if (navBar != NULL) navBar->hide(); 216 if (markBar != NULL) markBar->hide();
217 if (markBar != NULL) markBar->hide(); 217 if (m_fontVisible) m_fontBar->hide();
218 if (m_fontVisible) m_fontBar->hide(); 218 if (regVisible)
219 if (regVisible) 219 {
220 { 220#ifdef USEQPE
221#ifdef USEQPE 221 Global::hideInputMethod();
222 Global::hideInputMethod(); 222#endif
223#endif 223 regBar->hide();
224 regBar->hide(); 224 }
225 } 225 if (searchVisible)
226 if (searchVisible) 226 {
227 { 227#ifdef USEQPE
228#ifdef USEQPE 228 Global::hideInputMethod();
229 Global::hideInputMethod(); 229#endif
230#endif 230 searchBar->hide();
231 searchBar->hide(); 231 }
232 } 232}
233} 233
234 234QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
235QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) 235 : QMainWindow( parent, name, f ), m_dontSave(false),
236 : QMainWindow( parent, name, f ), m_dontSave(false), 236 fileBar(NULL), navBar(NULL), viewBar(NULL), markBar(NULL), m_scrollbar(NULL), m_localscroll(2), m_hidebars(false), m_kmapchanged(false)
237 fileBar(NULL), navBar(NULL), viewBar(NULL), markBar(NULL), m_scrollbar(NULL), m_localscroll(2), m_hidebars(false), m_kmapchanged(false) 237{
238{ 238 {
239 { 239 setKeyCompression ( true );
240 setKeyCompression ( true ); 240#ifndef USEQPE
241#ifndef USEQPE 241 QDir d = QDir::home(); // "/"
242 QDir d = QDir::home(); // "/" 242 d.cd(APPDIR);
243 d.cd(APPDIR); 243 QFileInfo fi(d, ".keymap");
244 QFileInfo fi(d, ".keymap"); 244 FILE* f = fopen((const char *)fi.absFilePath(), "r");
245 FILE* f = fopen((const char *)fi.absFilePath(), "r"); 245#else /* USEQPE */
246#else /* USEQPE */ 246 FILE* f = fopen((const char *)Global::applicationFileName(APPDIR,".keymap"), "r");
247 FILE* f = fopen((const char *)Global::applicationFileName(APPDIR,".keymap"), "r"); 247#endif /* USEQPE */
248#endif /* USEQPE */ 248 if (f != NULL)
249 if (f != NULL) 249 {
250 { 250 uint cnt;
251 uint cnt; 251 if ((fread(&cnt, sizeof(cnt), 1, f) != 0) && (cnt == KEYMAPVERSION))
252 if ((fread(&cnt, sizeof(cnt), 1, f) != 0) && (cnt == KEYMAPVERSION)) 252 {
253 { 253 if (fread(&cnt, sizeof(cnt), 1, f) == 0) cnt = 0;
254 if (fread(&cnt, sizeof(cnt), 1, f) == 0) cnt = 0; 254 for (uint i = 0; i != cnt; i++)
255 for (uint i = 0; i != cnt; i++) 255 {
256 { 256 orKey key;
257 orKey key; 257 int data;
258 int data; 258 fread(&key, sizeof(key), 1, f);
259 fread(&key, sizeof(key), 1, f); 259 fread(&data, sizeof(data), 1, f);
260 fread(&data, sizeof(data), 1, f); 260 kmap[key] = data;
261 kmap[key] = data; 261 }
262 } 262 }
263 } 263 fclose(f);
264 fclose(f); 264 }
265 } 265 }
266 } 266
267 267 m_url_clipboard = false;
268 m_url_clipboard = false; 268 m_url_localfile = false;
269 m_url_localfile = false; 269 m_url_globalfile = false;
270 m_url_globalfile = false; 270 ftime(&m_lastkeytime);
271 ftime(&m_lastkeytime); 271//// qDebug("Application directory = %s", (const tchar *)QPEApplication::documentDir());
272//// qDebug("Application directory = %s", (const tchar *)QPEApplication::documentDir()); 272//// qDebug("Application directory = %s", (const tchar *)Global::applicationFileName("uqtreader","bkmks.xml"));
273//// qDebug("Application directory = %s", (const tchar *)Global::applicationFileName("uqtreader","bkmks.xml")); 273
274 274 m_bcloseDisabled = true;
275 m_bcloseDisabled = true; 275 m_disableesckey = false;
276 m_disableesckey = false; 276 pBkmklist = NULL;
277 pBkmklist = NULL; 277 pOpenlist = NULL;
278 pOpenlist = NULL; 278// doc = 0;
279// doc = 0; 279
280 280 m_fBkmksChanged = false;
281 m_fBkmksChanged = false; 281
282 282 QString lang = getenv( "LANG" );
283 QString lang = getenv( "LANG" ); 283 QString rot = getenv( "QWS_DISPLAY" );
284 QString rot = getenv( "QWS_DISPLAY" ); 284
285 285/*
286/* 286 int m_rot = 0;
287 int m_rot = 0; 287 if (rot.contains("Rot90"))
288 if (rot.contains("Rot90")) 288 {
289 { 289 m_rot = 90;
290 m_rot = 90; 290 }
291 } 291 else if (rot.contains("Rot180"))
292 else if (rot.contains("Rot180")) 292 {
293 { 293 m_rot = 180;
294 m_rot = 180; 294 }
295 } 295 else if (rot.contains("Rot270"))
296 else if (rot.contains("Rot270")) 296 {
297 { 297 m_rot = 270;
298 m_rot = 270; 298 }
299 } 299
300 300// qDebug("Initial Rotation(%d):%s", m_rot, (const char*)rot);
301// qDebug("Initial Rotation(%d):%s", m_rot, (const char*)rot); 301*/
302*/ 302 m_autogenstr = "^ *[A-Z].*[a-z] *$";
303 m_autogenstr = "^ *[A-Z].*[a-z] *$"; 303
304 304#ifdef USEQPE
305#ifdef USEQPE 305 setIcon( Resource::loadPixmap( PICDIR "uqtreader") );
306 setIcon( Resource::loadPixmap( PICDIR "uqtreader") ); 306#else
307#else 307 setIcon( QPixmap (PICDIR + "/uqtreader.png") );
308 setIcon( QPixmap (PICDIR + "/uqtreader.png") ); 308#endif /* USEQPE */
309#endif /* USEQPE */ 309
310 310// QPEToolBar *bar = new QPEToolBar( this );
311// QPEToolBar *bar = new QPEToolBar( this ); 311// menubar = new QPEToolBar( this );
312// menubar = new QPEToolBar( this ); 312#ifdef USEQPE
313#ifdef USEQPE 313 Config config( APPDIR );
314 Config config( APPDIR ); 314#else
315#else 315 QDir d = QDir::home(); // "/"
316 QDir d = QDir::home(); // "/" 316 if ( !d.cd(APPDIR) ) { // "/tmp"
317 if ( !d.cd(APPDIR) ) { // "/tmp" 317 qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
318 qWarning( "Cannot find the \"~/" APPDIR "\" directory" ); 318 d = QDir::home();
319 d = QDir::home(); 319 d.mkdir(APPDIR);
320 d.mkdir(APPDIR); 320 d.cd(APPDIR);
321 d.cd(APPDIR); 321 }
322 } 322 QFileInfo fi(d, INIFILE);
323 QFileInfo fi(d, INIFILE); 323// qDebug("Path:%s", (const char*)fi.absFilePath());
324// qDebug("Path:%s", (const char*)fi.absFilePath()); 324 Config config(fi.absFilePath());
325 Config config(fi.absFilePath()); 325#endif
326#endif 326 config.setGroup("Toolbar");
327 config.setGroup("Toolbar"); 327 m_tbmovesave = m_tbmove = config.readBoolEntry("Movable", false);
328 m_tbmovesave = m_tbmove = config.readBoolEntry("Movable", false); 328 m_tbpolsave = m_tbpol = (ToolbarPolicy)config.readNumEntry("Policy", 1);
329 m_tbpolsave = m_tbpol = (ToolbarPolicy)config.readNumEntry("Policy", 1); 329 m_tbposition = (ToolBarDock)config.readNumEntry("Position", 2);
330 m_tbposition = (ToolBarDock)config.readNumEntry("Position", 2); 330 m_qtscroll = config.readNumEntry("QTScrollBar", false);
331 m_qtscroll = config.readNumEntry("QTScrollBar", false); 331 m_localscroll = config.readNumEntry("LocalScrollBar", false);
332 m_localscroll = config.readNumEntry("LocalScrollBar", false); 332
333 333// fileBar = new QToolBar("File", this);
334// fileBar = new QToolBar("File", this); 334// QToolBar* viewBar = new QToolBar("File", this);
335// QToolBar* viewBar = new QToolBar("File", this); 335// QToolBar* navBar = new QToolBar("File", this);
336// QToolBar* navBar = new QToolBar("File", this); 336// QToolBar* markBar = new QToolBar("File", this);
337// QToolBar* markBar = new QToolBar("File", this); 337
338 338#ifdef USEQPE
339#ifdef USEQPE 339 menubar = new QToolBar("Menus", this, m_tbposition);
340 menubar = new QToolBar("Menus", this, m_tbposition); 340 mb = new QPEMenuBar( menubar );
341 mb = new QPEMenuBar( menubar ); 341#else
342#else 342 mb = new QMenuBar( this );
343 mb = new QMenuBar( this ); 343#endif
344#endif 344
345 345#ifdef USEQPE
346#ifdef USEQPE 346 QPopupMenu* tmp = new QPopupMenu(mb);
347 QPopupMenu* tmp = new QPopupMenu(mb); 347 mb->insertItem( geticon( "AppsIcon" ), tmp );
348 mb->insertItem( geticon( "AppsIcon" ), tmp ); 348#else
349#else 349 QMenuBar* tmp = mb;
350 QMenuBar* tmp = mb; 350#endif
351#endif 351
352 352 QPopupMenu *file = new QPopupMenu( mb );
353 QPopupMenu *file = new QPopupMenu( mb ); 353 tmp->insertItem( tr( "File" ), file );
354 tmp->insertItem( tr( "File" ), file ); 354
355 355 QPopupMenu *navigation = new QPopupMenu(mb);
356 QPopupMenu *navigation = new QPopupMenu(mb); 356 tmp->insertItem( tr( "Navigation" ), navigation );
357 tmp->insertItem( tr( "Navigation" ), navigation ); 357
358 358 QPopupMenu *view = new QPopupMenu( mb );
359 QPopupMenu *view = new QPopupMenu( mb ); 359 tmp->insertItem( tr( "View" ), view );
360 tmp->insertItem( tr( "View" ), view ); 360
361 361 QPopupMenu *marks = new QPopupMenu( this );
362 QPopupMenu *marks = new QPopupMenu( this ); 362 tmp->insertItem( tr( "Marks" ), marks );
363 tmp->insertItem( tr( "Marks" ), marks ); 363
364 364 QPopupMenu *settings = new QPopupMenu( this );
365 QPopupMenu *settings = new QPopupMenu( this ); 365 tmp->insertItem( tr( "Settings" ), settings );
366 tmp->insertItem( tr( "Settings" ), settings ); 366
367 367// addToolBar(menubar, "Menus",QMainWindow::Top);
368// addToolBar(menubar, "Menus",QMainWindow::Top); 368// addToolBar(fileBar, "Toolbar",QMainWindow::Top);
369// addToolBar(fileBar, "Toolbar",QMainWindow::Top); 369
370 370 // QPopupMenu *edit = new QPopupMenu( this );
371 // QPopupMenu *edit = new QPopupMenu( this ); 371
372 372 /*
373 /* 373 QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
374 QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); 374 connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
375 connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); 375 a->addTo( bar );
376 a->addTo( bar ); 376 a->addTo( file );
377 a->addTo( file ); 377 */
378 */ 378 QWidget* widge = new QWidget(this);
379 QWidget* widge = new QWidget(this); 379 setCentralWidget( widge );
380 setCentralWidget( widge ); 380 QVBoxLayout* vlayout = new QVBoxLayout(widge);
381 QVBoxLayout* vlayout = new QVBoxLayout(widge); 381 m_layout = new QBoxLayout(QBoxLayout::LeftToRight);
382 m_layout = new QBoxLayout(QBoxLayout::LeftToRight); 382 m_prog = new QLabel(widge);
383 m_prog = new QLabel(widge); 383 vlayout->addLayout(m_layout, 1);
384 vlayout->addLayout(m_layout, 1); 384 vlayout->addWidget(m_prog);
385 vlayout->addWidget(m_prog); 385
386 386 editorStack = new QWidgetStack( widge );
387 editorStack = new QWidgetStack( widge ); 387 // setCentralWidget( editorStack );
388 // setCentralWidget( editorStack ); 388
389 389 searchVisible = FALSE;
390 searchVisible = FALSE; 390 regVisible = FALSE;
391 regVisible = FALSE; 391 m_fontVisible = false;
392 m_fontVisible = false; 392
393 393 m_buttonprefs = new CButtonPrefs(&kmap, this);
394 m_buttonprefs = new CButtonPrefs(&kmap, this); 394 editorStack->addWidget(m_buttonprefs, get_unique_id());
395 editorStack->addWidget(m_buttonprefs, get_unique_id()); 395 connect( m_buttonprefs, SIGNAL( Closed() ), this, SLOT( infoClose() ) );
396 connect( m_buttonprefs, SIGNAL( Closed() ), this, SLOT( infoClose() ) ); 396
397 397
398 398 m_annoWin = new CAnnoEdit(editorStack);
399 m_annoWin = new CAnnoEdit(editorStack); 399 editorStack->addWidget(m_annoWin, get_unique_id());
400 editorStack->addWidget(m_annoWin, get_unique_id()); 400 connect( m_annoWin, SIGNAL( finished(const QString&, const QString&) ), this, SLOT( addAnno(const QString&, const QString&) ) );
401 connect( m_annoWin, SIGNAL( finished(const QString&, const QString&) ), this, SLOT( addAnno(const QString&, const QString&) ) ); 401 connect( m_annoWin, SIGNAL( cancelled() ), this, SLOT( infoClose() ) );
402 connect( m_annoWin, SIGNAL( cancelled() ), this, SLOT( infoClose() ) ); 402
403 403 m_infoWin = new infowin(editorStack);
404 m_infoWin = new infowin(editorStack); 404 editorStack->addWidget(m_infoWin, get_unique_id());
405 editorStack->addWidget(m_infoWin, get_unique_id()); 405 connect( m_infoWin, SIGNAL( Close() ), this, SLOT( infoClose() ) );
406 connect( m_infoWin, SIGNAL( Close() ), this, SLOT( infoClose() ) ); 406
407 407 m_graphicwin = new GraphicWin(editorStack);
408 m_graphicwin = new GraphicWin(editorStack); 408 editorStack->addWidget(m_graphicwin, get_unique_id());
409 editorStack->addWidget(m_graphicwin, get_unique_id()); 409 connect( m_graphicwin, SIGNAL( Closed() ), this, SLOT( infoClose() ) );
410 connect( m_graphicwin, SIGNAL( Closed() ), this, SLOT( infoClose() ) ); 410
411 411// bkmkselector = new QListBox(editorStack, "Bookmarks");
412// bkmkselector = new QListBox(editorStack, "Bookmarks"); 412 bkmkselector = new CBkmkSelector(editorStack, "Bookmarks");
413 bkmkselector = new CBkmkSelector(editorStack, "Bookmarks"); 413 // connect(bkmkselector, SIGNAL( selected(const QString&) ), this, SLOT( gotobkmk(const QString&) ) );
414 // connect(bkmkselector, SIGNAL( selected(const QString&) ), this, SLOT( gotobkmk(const QString&) ) ); 414 connect(bkmkselector, SIGNAL( selected(int) ), this, SLOT( gotobkmk(int) ) );
415 connect(bkmkselector, SIGNAL( selected(int) ), this, SLOT( gotobkmk(int) ) ); 415 connect(bkmkselector, SIGNAL( cancelled() ), this, SLOT( cancelbkmk() ) );
416 connect(bkmkselector, SIGNAL( cancelled() ), this, SLOT( cancelbkmk() ) ); 416 editorStack->addWidget( bkmkselector, get_unique_id() );
417 editorStack->addWidget( bkmkselector, get_unique_id() ); 417
418 418/*
419/* 419 importSelector = new FileSelector( "*", editorStack, "importselector", false );
420 importSelector = new FileSelector( "*", editorStack, "importselector", false ); 420 connect( importSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( importFile( const DocLnk & ) ) );
421 connect( importSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( importFile( const DocLnk & ) ) ); 421
422 422 editorStack->addWidget( importSelector, get_unique_id() );
423 editorStack->addWidget( importSelector, get_unique_id() ); 423
424 424 // don't need the close visible, it is redundant...
425 // don't need the close visible, it is redundant... 425 importSelector->setCloseVisible( FALSE );
426 importSelector->setCloseVisible( FALSE ); 426*/
427*/ 427// qDebug("Reading file list");
428// qDebug("Reading file list"); 428 readfilelist();
429 readfilelist(); 429
430 430 reader = new QTReader( editorStack );
431 reader = new QTReader( editorStack ); 431
432 432 reader->setDoUpdates(false);
433 reader->setDoUpdates(false); 433
434 434#ifdef USEQPE
435#ifdef USEQPE 435 ((QPEApplication*)qApp)->setStylusOperation(reader, QPEApplication::RightOnHold);
436 ((QPEApplication*)qApp)->setStylusOperation(reader, QPEApplication::RightOnHold); 436#endif
437#endif 437
438 438// qDebug("Reading config");
439// qDebug("Reading config"); 439// Config config( APPDIR );
440// Config config( APPDIR ); 440 config.setGroup( "View" );
441 config.setGroup( "View" ); 441 m_debounce = config.readNumEntry("Debounce", 0);
442 m_debounce = config.readNumEntry("Debounce", 0); 442 m_buttonprefs->Debounce(m_debounce);
443 m_buttonprefs->Debounce(m_debounce); 443#ifdef USEQPE
444#ifdef USEQPE 444 m_bFloatingDialog = config.readBoolEntry("FloatDialogs", false);
445 m_bFloatingDialog = config.readBoolEntry("FloatDialogs", false); 445#else
446#else 446 m_bFloatingDialog = config.readBoolEntry("FloatDialogs", true);
447 m_bFloatingDialog = config.readBoolEntry("FloatDialogs", true); 447#endif
448#endif 448 reader->setStripCR(config.readBoolEntry( "StripCr", true ));
449 reader->setStripCR(config.readBoolEntry( "StripCr", true )); 449 reader->bfulljust = config.readBoolEntry( "FullJust", false );
450 reader->bfulljust = config.readBoolEntry( "FullJust", false ); 450 /*
451 /* 451 bool btmp = config.readBoolEntry("Negative", false);
452 bool btmp = config.readBoolEntry("Negative", false); 452 if (btmp) reader->setNegative();
453 if (btmp) reader->setNegative(); 453 */
454 */ 454 reader->bInverse = config.readBoolEntry("Inverse", false);
455 reader->bInverse = config.readBoolEntry("Inverse", false); 455 reader->m_fontControl.FixGraphics(config.readBoolEntry( "FixGraphics", false ));
456 reader->m_fontControl.FixGraphics(config.readBoolEntry( "FixGraphics", false )); 456 reader->setextraspace(config.readNumEntry( "ExtraSpace", 0 ));
457 reader->setextraspace(config.readNumEntry( "ExtraSpace", 0 )); 457 reader->setlead(config.readNumEntry( "ExtraLead", 0 ));
458 reader->setlead(config.readNumEntry( "ExtraLead", 0 )); 458 reader->btextfmt = config.readBoolEntry( "TextFmt", false );
459 reader->btextfmt = config.readBoolEntry( "TextFmt", false ); 459 reader->bautofmt = config.readBoolEntry( "AutoFmt", true );
460 reader->bautofmt = config.readBoolEntry( "AutoFmt", true ); 460 reader->bstriphtml = config.readBoolEntry( "StripHtml", false );
461 reader->bstriphtml = config.readBoolEntry( "StripHtml", false ); 461 reader->bpeanut = config.readBoolEntry( "Peanut", false );
462 reader->bpeanut = config.readBoolEntry( "Peanut", false ); 462 reader->bdehyphen = config.readBoolEntry( "Dehyphen", false );
463 reader->bdehyphen = config.readBoolEntry( "Dehyphen", false ); 463 reader->bdepluck = config.readBoolEntry( "Depluck", false );
464 reader->bdepluck = config.readBoolEntry( "Depluck", false ); 464 reader->bdejpluck = config.readBoolEntry( "Dejpluck", false );
465 reader->bdejpluck = config.readBoolEntry( "Dejpluck", false ); 465 reader->bonespace = config.readBoolEntry( "OneSpace", false );
466 reader->bonespace = config.readBoolEntry( "OneSpace", false ); 466 reader->bunindent = config.readBoolEntry( "Unindent", false );
467 reader->bunindent = config.readBoolEntry( "Unindent", false ); 467 reader->brepara = config.readBoolEntry( "Repara", false );
468 reader->brepara = config.readBoolEntry( "Repara", false ); 468 reader->m_reparastring = config.readEntry( "ReparaString", "\\n{[\\n \\t]}");
469 reader->m_reparastring = config.readEntry( "ReparaString", "\\n{[\\n \\t]}"); 469 m_bgtype = (bground)config.readNumEntry( "BackgroundType" , 0 );
470 m_bgtype = (bground)config.readNumEntry( "BackgroundType" , 0 ); 470 m_themename = config.readEntry("Theme", QString::null );
471 m_themename = config.readEntry("Theme", QString::null ); 471 reader->bdblspce = config.readBoolEntry( "DoubleSpace", false );
472 reader->bdblspce = config.readBoolEntry( "DoubleSpace", false ); 472 reader->bindenter = config.readNumEntry( "Indent", 0 );
473 reader->bindenter = config.readNumEntry( "Indent", 0 ); 473 reader->m_textsize = config.readNumEntry( "FontSize", 12 );
474 reader->m_textsize = config.readNumEntry( "FontSize", 12 ); 474 reader->m_delay = config.readNumEntry( "ScrollDelay", 5184);
475 reader->m_delay = config.readNumEntry( "ScrollDelay", 5184); 475 reader->m_scrollstep = config.readNumEntry( "ScrollStep", 1);
476 reader->m_scrollstep = config.readNumEntry( "ScrollStep", 1); 476
477 477 reader->m_lastfile = config.readEntry( "LastFile", QString::null );
478 reader->m_lastfile = config.readEntry( "LastFile", QString::null ); 478 reader->m_lastposn = config.readNumEntry( "LastPosn", 0 );
479 reader->m_lastposn = config.readNumEntry( "LastPosn", 0 ); 479 reader->m_bpagemode = config.readBoolEntry( "PageMode", true );
480 reader->m_bpagemode = config.readBoolEntry( "PageMode", true ); 480 reader->m_bMonoSpaced = config.readBoolEntry( "MonoSpaced", false);
481 reader->m_bMonoSpaced = config.readBoolEntry( "MonoSpaced", false); 481 reader->m_rotated = config.readBoolEntry( "IsRotated", false );
482 reader->m_rotated = config.readBoolEntry( "IsRotated", false ); 482 reader->m_scrolltype = config.readNumEntry( "ScrollType", 0 );
483 reader->m_scrolltype = config.readNumEntry( "ScrollType", 0 ); 483 m_statusstring = config.readEntry("StatusContent", "%P%% Doc:%d/%D %p%% %z%%");
484 m_statusstring = config.readEntry("StatusContent", "%P%% Doc:%d/%D %p%% %z%%"); 484 m_statusishidden = config.readBoolEntry("StatusHidden", false);
485 m_statusishidden = config.readBoolEntry("StatusHidden", false); 485 m_background = config.readNumEntry( "Background", 0 );
486 m_background = config.readNumEntry( "Background", 0 ); 486 reader->setBackground(getcolour(m_background));
487 reader->setBackground(getcolour(m_background)); 487 m_foreground = config.readNumEntry( "Foreground", 1 );
488 m_foreground = config.readNumEntry( "Foreground", 1 ); 488 reader->setForeground(getcolour(m_foreground));
489 reader->setForeground(getcolour(m_foreground)); 489 m_scrollcolor = config.readNumEntry( "ScrollColour", 5 );
490 m_scrollcolor = config.readNumEntry( "ScrollColour", 5 ); 490 setscrollcolour();
491 setscrollcolour(); 491 m_scrollbarcolor = config.readNumEntry( "ScrollBarColour", 5 );
492 m_scrollbarcolor = config.readNumEntry( "ScrollBarColour", 5 ); 492 setscrollbarcolour();
493 setscrollbarcolour(); 493 reader->hyphenate = config.readBoolEntry( "Hyphenate", false );
494 reader->hyphenate = config.readBoolEntry( "Hyphenate", false ); 494 reader->m_swapmouse = config.readBoolEntry( "SwapMouse", false);
495 reader->m_swapmouse = config.readBoolEntry( "SwapMouse", false); 495 reader->m_fontname = config.readEntry( "Fontname", "helvetica" );
496 reader->m_fontname = config.readEntry( "Fontname", "helvetica" ); 496 reader->m_encd = config.readNumEntry( "Encoding", 0 );
497 reader->m_encd = config.readNumEntry( "Encoding", 0 ); 497 reader->m_charpc = config.readNumEntry( "CharSpacing", 100 );
498 reader->m_charpc = config.readNumEntry( "CharSpacing", 100 ); 498 reader->m_overlap = config.readNumEntry( "Overlap", 0 );
499 reader->m_overlap = config.readNumEntry( "Overlap", 0 ); 499 reader->m_abstopmargin = config.readNumEntry( "Top Margin", 100 );
500 reader->m_abstopmargin = config.readNumEntry( "Top Margin", 100 ); 500 reader->m_absbottommargin = config.readNumEntry( "Bottom Margin", 100 );
501 reader->m_absbottommargin = config.readNumEntry( "Bottom Margin", 100 ); 501 reader->m_absleft_border = config.readNumEntry( "Left Margin", 100 );
502 reader->m_absleft_border = config.readNumEntry( "Left Margin", 100 ); 502 reader->m_absright_border = config.readNumEntry( "Right Margin", 100 );
503 reader->m_absright_border = config.readNumEntry( "Right Margin", 100 ); 503
504 504 m_scrollishidden = config.readBoolEntry( "HideScrollBar", false );
505 m_scrollishidden = config.readBoolEntry( "HideScrollBar", false ); 505
506 506 reader->brepalm = config.readBoolEntry( "Repalm", false );
507 reader->brepalm = config.readBoolEntry( "Repalm", false ); 507 reader->bkern = config.readBoolEntry( "Kern", false );
508 reader->bkern = config.readBoolEntry( "Kern", false ); 508 reader->bremap = config.readBoolEntry( "Remap", true );
509 reader->bremap = config.readBoolEntry( "Remap", true ); 509 reader->bmakebold = config.readBoolEntry( "MakeBold", false );
510 reader->bmakebold = config.readBoolEntry( "MakeBold", false ); 510 reader->setContinuous(config.readBoolEntry( "Continuous", true ));
511 reader->setContinuous(config.readBoolEntry( "Continuous", true )); 511 m_targetapp = config.readEntry( "TargetApp", QString::null );
512 m_targetapp = config.readEntry( "TargetApp", QString::null ); 512 m_targetmsg = config.readEntry( "TargetMsg", QString::null );
513 m_targetmsg = config.readEntry( "TargetMsg", QString::null ); 513#ifdef _SCROLLPIPE
514#ifdef _SCROLLPIPE 514 reader->m_pipetarget = config.readEntry( "PipeTarget", QString::null );
515 reader->m_pipetarget = config.readEntry( "PipeTarget", QString::null ); 515 reader->m_pauseAfterEachPara = config.readBoolEntry( "PauseAfterPara", true );
516 reader->m_pauseAfterEachPara = config.readBoolEntry( "PauseAfterPara", true ); 516#endif
517#endif 517 m_twoTouch = config.readBoolEntry( "TwoTouch", false);
518 m_twoTouch = config.readBoolEntry( "TwoTouch", false); 518 m_doAnnotation = config.readBoolEntry( "Annotation", false);
519 m_doAnnotation = config.readBoolEntry( "Annotation", false); 519 m_doDictionary = config.readBoolEntry( "Dictionary", false);
520 m_doDictionary = config.readBoolEntry( "Dictionary", false); 520 m_doClipboard = config.readBoolEntry( "Clipboard", false);
521 m_doClipboard = config.readBoolEntry( "Clipboard", false); 521 /*
522 /* 522 m_spaceTarget = (ActionTypes)config.readNumEntry("SpaceTarget", cesAutoScroll);
523 m_spaceTarget = (ActionTypes)config.readNumEntry("SpaceTarget", cesAutoScroll); 523 m_escapeTarget = (ActionTypes)config.readNumEntry("EscapeTarget", cesNone);
524 m_escapeTarget = (ActionTypes)config.readNumEntry("EscapeTarget", cesNone); 524 m_returnTarget = (ActionTypes)config.readNumEntry("ReturnTarget", cesFullScreen);
525 m_returnTarget = (ActionTypes)config.readNumEntry("ReturnTarget", cesFullScreen); 525 m_leftTarget = (ActionTypes)config.readNumEntry("LeftTarget", cesZoomOut);
526 m_leftTarget = (ActionTypes)config.readNumEntry("LeftTarget", cesZoomOut); 526 m_rightTarget = (ActionTypes)config.readNumEntry("RightTarget", cesZoomIn);
527 m_rightTarget = (ActionTypes)config.readNumEntry("RightTarget", cesZoomIn); 527 m_upTarget = (ActionTypes)config.readNumEntry("UpTarget", cesPageUp);
528 m_upTarget = (ActionTypes)config.readNumEntry("UpTarget", cesPageUp); 528 m_downTarget = (ActionTypes)config.readNumEntry("DownTarget", cesPageDown);
529 m_downTarget = (ActionTypes)config.readNumEntry("DownTarget", cesPageDown); 529
530 530 m_leftScroll = config.readBoolEntry("LeftScroll", false);
531 m_leftScroll = config.readBoolEntry("LeftScroll", false); 531 m_rightScroll = config.readBoolEntry("RightScroll", false);
532 m_rightScroll = config.readBoolEntry("RightScroll", false); 532 m_upScroll = config.readBoolEntry("UpScroll", true);
533 m_upScroll = config.readBoolEntry("UpScroll", true); 533 m_downScroll = config.readBoolEntry("DownScroll", true);
534 m_downScroll = config.readBoolEntry("DownScroll", true); 534 */
535 */ 535 m_propogatefontchange = config.readBoolEntry( "RequestorFontChange", false);
536 m_propogatefontchange = config.readBoolEntry( "RequestorFontChange", false); 536 reader->setBaseSize(config.readNumEntry( "Basesize", 10 ));
537 reader->setBaseSize(config.readNumEntry( "Basesize", 10 )); 537 reader->setHyphenThreshold(config.readNumEntry( "HyphenThreshold", 50 ));
538 reader->setHyphenThreshold(config.readNumEntry( "HyphenThreshold", 50 )); 538 // reader->buffdoc.setCustomHyphen(config.readBoolEntry( "CustomHyphen", false ));
539 // reader->buffdoc.setCustomHyphen(config.readBoolEntry( "CustomHyphen", false )); 539#ifndef USEQPE
540#ifndef USEQPE 540 config.setGroup( "Geometry" );
541 config.setGroup( "Geometry" ); 541 setGeometry(0,0,
542 setGeometry(0,0, 542 config.readNumEntry( "width", QApplication::desktop()->width()/2 ),
543 config.readNumEntry( "width", QApplication::desktop()->width()/2 ), 543 config.readNumEntry( "height", QApplication::desktop()->height()/2 ));
544 config.readNumEntry( "height", QApplication::desktop()->height()/2 )); 544 move(
545 move( 545 config.readNumEntry( "x", 20 ),
546 config.readNumEntry( "x", 20 ), 546 config.readNumEntry( "y", 20 ));
547 config.readNumEntry( "y", 20 )); 547#else
548#else 548 m_grabkeyboard = config.readBoolEntry( "GrabKeyboard", false);
549 m_grabkeyboard = config.readBoolEntry( "GrabKeyboard", false); 549#endif
550#endif 550
551 551
552 552
553 553 setTwoTouch(m_twoTouch);
554 setTwoTouch(m_twoTouch); 554
555 555 connect( reader, SIGNAL( OnShowPicture(QImage&) ), this, SLOT( showgraphic(QImage&) ) );
556 connect( reader, SIGNAL( OnShowPicture(QImage&) ), this, SLOT( showgraphic(QImage&) ) ); 556
557 557 connect( reader, SIGNAL( OnRedraw() ), this, SLOT( OnRedraw() ) );
558 connect( reader, SIGNAL( OnRedraw() ), this, SLOT( OnRedraw() ) ); 558 connect( reader, SIGNAL( OnWordSelected(const QString&, size_t, size_t, const QString&) ), this, SLOT( OnWordSelected(const QString&, size_t, size_t, const QString&) ) );
559 connect( reader, SIGNAL( OnWordSelected(const QString&, size_t, size_t, const QString&) ), this, SLOT( OnWordSelected(const QString&, size_t, size_t, const QString&) ) ); 559 connect( reader, SIGNAL( OnURLSelected(const QString&, const size_t) ), this, SLOT( OnURLSelected(const QString&, const size_t) ) );
560 connect( reader, SIGNAL( OnURLSelected(const QString&, const size_t) ), this, SLOT( OnURLSelected(const QString&, const size_t) ) ); 560 connect( reader, SIGNAL( NewFileRequest(const QString&) ), this, SLOT( forceopen(const QString&) ) );
561 connect( reader, SIGNAL( NewFileRequest(const QString&) ), this, SLOT( forceopen(const QString&) ) ); 561 connect( reader, SIGNAL( HandleKeyRequest(QKeyEvent*) ), this, SLOT( handlekey(QKeyEvent*) ) );
562 connect( reader, SIGNAL( HandleKeyRequest(QKeyEvent*) ), this, SLOT( handlekey(QKeyEvent*) ) ); 562 connect( reader, SIGNAL( SetScrollState(bool) ), this, SLOT( setScrollState(bool) ) );
563 connect( reader, SIGNAL( SetScrollState(bool) ), this, SLOT( setScrollState(bool) ) ); 563 connect( reader, SIGNAL(RefreshBitmap()), this, SLOT(setBackgroundBitmap()));
564 connect( reader, SIGNAL(RefreshBitmap()), this, SLOT(setBackgroundBitmap())); 564 editorStack->addWidget( reader, get_unique_id() );
565 editorStack->addWidget( reader, get_unique_id() ); 565
566 566 m_preferences_action = new QAction( tr( "Configuration" ), geticon( "SettingsIcon" ), QString::null, 0, this, NULL);
567 m_preferences_action = new QAction( tr( "Configuration" ), geticon( "SettingsIcon" ), QString::null, 0, this, NULL); 567 connect( m_preferences_action, SIGNAL( activated() ), this, SLOT( showprefs() ) );
568 connect( m_preferences_action, SIGNAL( activated() ), this, SLOT( showprefs() ) ); 568 m_preferences_action->addTo( settings );
569 m_preferences_action->addTo( settings ); 569
570 570 m_saveconfig_action = new QAction( tr( "Save Config" ), QString::null, 0, this, NULL);
571 m_saveconfig_action = new QAction( tr( "Save Config" ), QString::null, 0, this, NULL); 571 connect( m_saveconfig_action, SIGNAL( activated() ), this, SLOT( SaveConfig() ) );
572 connect( m_saveconfig_action, SIGNAL( activated() ), this, SLOT( SaveConfig() ) ); 572 m_saveconfig_action->addTo( settings );
573 m_saveconfig_action->addTo( settings ); 573
574 574 m_loadconfig_action = new QAction( tr( "Load Config" ), QString::null, 0, this, NULL);
575 m_loadconfig_action = new QAction( tr( "Load Config" ), QString::null, 0, this, NULL); 575 connect( m_loadconfig_action, SIGNAL( activated() ), this, SLOT( LoadConfig() ) );
576 connect( m_loadconfig_action, SIGNAL( activated() ), this, SLOT( LoadConfig() ) ); 576 m_loadconfig_action->addTo( settings );
577 m_loadconfig_action->addTo( settings ); 577
578 578 m_tidyconfig_action = new QAction( tr( "Delete Config" ), QString::null, 0, this, NULL);
579 m_tidyconfig_action = new QAction( tr( "Delete Config" ), QString::null, 0, this, NULL); 579 connect( m_tidyconfig_action, SIGNAL( activated() ), this, SLOT( TidyConfig() ) );
580 connect( m_tidyconfig_action, SIGNAL( activated() ), this, SLOT( TidyConfig() ) ); 580 m_tidyconfig_action->addTo( settings );
581 m_tidyconfig_action->addTo( settings ); 581
582 582 settings->insertSeparator();
583 settings->insertSeparator(); 583 m_toolbarprefs_action = new QAction( tr( "Toolbars" ), QString::null, 0, this, NULL);
584 m_toolbarprefs_action = new QAction( tr( "Toolbars" ), QString::null, 0, this, NULL); 584 connect( m_toolbarprefs_action, SIGNAL( activated() ), this, SLOT( showtoolbarprefs() ) );
585 connect( m_toolbarprefs_action, SIGNAL( activated() ), this, SLOT( showtoolbarprefs() ) ); 585 m_toolbarprefs_action->addTo( settings );
586 m_toolbarprefs_action->addTo( settings ); 586
587 587 m_buttonprefs_action = new QAction( tr( "Buttons" ), QString::null, 0, this, NULL);
588 m_buttonprefs_action = new QAction( tr( "Buttons" ), QString::null, 0, this, NULL); 588 connect( m_buttonprefs_action, SIGNAL( activated() ), this, SLOT( showbuttonprefs() ) );
589 connect( m_buttonprefs_action, SIGNAL( activated() ), this, SLOT( showbuttonprefs() ) ); 589 m_buttonprefs_action->addTo( settings );
590 m_buttonprefs_action->addTo( settings ); 590
591 591 m_loadtheme_action = new QAction( tr( "Load Theme" ), QString::null, 0, this, NULL);
592 m_loadtheme_action = new QAction( tr( "Load Theme" ), QString::null, 0, this, NULL); 592 connect( m_loadtheme_action, SIGNAL( activated() ), this, SLOT( LoadTheme() ) );
593 connect( m_loadtheme_action, SIGNAL( activated() ), this, SLOT( LoadTheme() ) ); 593 m_loadtheme_action->addTo( settings );
594 m_loadtheme_action->addTo( settings ); 594
595 595 m_repara_action = new QAction( tr( "EOP Marker" ), QString::null, 0, this, NULL);
596 m_repara_action = new QAction( tr( "EOP Marker" ), QString::null, 0, this, NULL); 596 connect( m_repara_action, SIGNAL( activated() ), this, SLOT( reparastring() ) );
597 connect( m_repara_action, SIGNAL( activated() ), this, SLOT( reparastring() ) ); 597 m_repara_action->addTo(settings);
598 m_repara_action->addTo(settings); 598
599 599#ifdef USEQPE
600#ifdef USEQPE 600 m_grab_action = new QAction( tr( "Grab Buttons" ), QString::null, 0, this, NULL, true );
601 m_grab_action = new QAction( tr( "Grab Buttons" ), QString::null, 0, this, NULL, true ); 601 connect( m_grab_action, SIGNAL( toggled(bool) ), this, SLOT( setgrab(bool) ) );
602 connect( m_grab_action, SIGNAL( toggled(bool) ), this, SLOT( setgrab(bool) ) ); 602 m_grab_action->setOn(m_grabkeyboard);
603 m_grab_action->setOn(m_grabkeyboard); 603 m_grab_action->addTo( settings );
604 m_grab_action->addTo( settings ); 604#endif
605#endif 605
606 606 m_open_action = new QAction( tr( "Open" ), geticon( "fileopen" ), QString::null, 0, this, 0 );
607 m_open_action = new QAction( tr( "Open" ), geticon( "fileopen" ), QString::null, 0, this, 0 ); 607 connect( m_open_action, SIGNAL( activated() ), this, SLOT( fileOpen() ) );
608 connect( m_open_action, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); 608 m_open_action->addTo( file );
609 m_open_action->addTo( file ); 609
610 610 m_close_action = new QAction( tr( "Close" ), geticon( "close" ), QString::null, 0, this, 0 );
611 m_close_action = new QAction( tr( "Close" ), geticon( "close" ), QString::null, 0, this, 0 ); 611 connect( m_close_action, SIGNAL( activated() ), this, SLOT( fileClose() ) );
612 connect( m_close_action, SIGNAL( activated() ), this, SLOT( fileClose() ) ); 612 m_close_action->addTo( file );
613 m_close_action->addTo( file ); 613
614 614#ifdef _SCRIPT
615#ifdef _SCRIPT 615 a = new QAction( tr( "Run Script" ), QString::null, 0, this, NULL);
616 a = new QAction( tr( "Run Script" ), QString::null, 0, this, NULL); 616 connect( a, SIGNAL( activated() ), this, SLOT( RunScript() ) );
617 connect( a, SIGNAL( activated() ), this, SLOT( RunScript() ) ); 617 a->addTo( file );
618 a->addTo( file ); 618#endif
619#endif 619 /*
620 /* 620 a = new QAction( tr( "Revert" ), geticon( "close" ), QString::null, 0, this, 0 );
621 a = new QAction( tr( "Revert" ), geticon( "close" ), QString::null, 0, this, 0 ); 621 connect( a, SIGNAL( activated() ), this, SLOT( fileRevert() ) );
622 connect( a, SIGNAL( activated() ), this, SLOT( fileRevert() ) ); 622 a->addTo( file );
623 a->addTo( file ); 623
624 624 a = new QAction( tr( "Cut" ), geticon( "cut" ), QString::null, 0, this, 0 );
625 a = new QAction( tr( "Cut" ), geticon( "cut" ), QString::null, 0, this, 0 ); 625 connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) );
626 connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) ); 626 a->addTo( filebar() );
627 a->addTo( filebar() ); 627 a->addTo( edit );
628 a->addTo( edit ); 628 */
629 */ 629
630 630 m_info_action = new QAction( tr( "Info" ), geticon( "UtilsIcon" ), QString::null, 0, this, NULL);
631 m_info_action = new QAction( tr( "Info" ), geticon( "UtilsIcon" ), QString::null, 0, this, NULL); 631 connect( m_info_action, SIGNAL( activated() ), this, SLOT( showinfo() ) );
632 connect( m_info_action, SIGNAL( activated() ), this, SLOT( showinfo() ) ); 632 m_info_action->addTo( file );
633 m_info_action->addTo( file ); 633
634 634 m_touch_action = new QAction( tr( "Two/One Touch" ), geticon( "1to1" ), QString::null, 0, this, NULL, true );
635 m_touch_action = new QAction( tr( "Two/One Touch" ), geticon( "1to1" ), QString::null, 0, this, NULL, true ); 635 connect( m_touch_action, SIGNAL( toggled(bool) ), this, SLOT( setTwoTouch(bool) ) );
636 connect( m_touch_action, SIGNAL( toggled(bool) ), this, SLOT( setTwoTouch(bool) ) ); 636 m_touch_action->setOn(m_twoTouch);
637 m_touch_action->setOn(m_twoTouch); 637 m_touch_action->addTo( file );
638 m_touch_action->addTo( file ); 638
639 639 m_find_action = new QAction( tr( "Find..." ), geticon( "find" ), QString::null, 0, this, NULL);
640 m_find_action = new QAction( tr( "Find..." ), geticon( "find" ), QString::null, 0, this, NULL); 640 connect( m_find_action, SIGNAL( activated() ), this, SLOT( editFind() ) );
641 connect( m_find_action, SIGNAL( activated() ), this, SLOT( editFind() ) ); 641 file->insertSeparator();
642 file->insertSeparator(); 642// a->addTo( bar );
643// a->addTo( bar ); 643 m_find_action->addTo( file );
644 m_find_action->addTo( file ); 644
645 645 m_exportlinks_action = new QAction( tr( "Export Links" ), QString::null, 0, this, NULL);
646 m_exportlinks_action = new QAction( tr( "Export Links" ), QString::null, 0, this, NULL); 646 connect( m_exportlinks_action, SIGNAL( activated() ), this, SLOT( ExportLinks() ) );
647 connect( m_exportlinks_action, SIGNAL( activated() ), this, SLOT( ExportLinks() ) ); 647 m_exportlinks_action->addTo( file );
648 m_exportlinks_action->addTo( file ); 648
649 649 m_scrollButton = new QAction( tr( "Scroll" ), getmyicon( "panel-arrow-down" ), QString::null, 0, this, 0, true );
650 m_scrollButton = new QAction( tr( "Scroll" ), getmyicon( "panel-arrow-down" ), QString::null, 0, this, 0, true ); 650 connect( m_scrollButton, SIGNAL( toggled(bool) ), this, SLOT( autoScroll(bool) ) );
651 connect( m_scrollButton, SIGNAL( toggled(bool) ), this, SLOT( autoScroll(bool) ) ); 651 m_scrollButton->addTo(navigation);
652 m_scrollButton->addTo(navigation); 652 m_scrollButton->setOn(false);
653 m_scrollButton->setOn(false); 653
654 654 m_start_action = new QAction( tr( "Goto Start" ), geticon( "start" ), QString::null, 0, this, NULL);
655 m_start_action = new QAction( tr( "Goto Start" ), geticon( "start" ), QString::null, 0, this, NULL); 655 connect( m_start_action, SIGNAL( activated() ), this, SLOT( gotoStart() ) );
656 connect( m_start_action, SIGNAL( activated() ), this, SLOT( gotoStart() ) ); 656 m_start_action->addTo(navigation);
657 m_start_action->addTo(navigation); 657
658 658 m_end_action = new QAction( tr( "Goto End" ), geticon( "finish" ), QString::null, 0, this, NULL);
659 m_end_action = new QAction( tr( "Goto End" ), geticon( "finish" ), QString::null, 0, this, NULL); 659 connect( m_end_action, SIGNAL( activated() ), this, SLOT( gotoEnd() ) );
660 connect( m_end_action, SIGNAL( activated() ), this, SLOT( gotoEnd() ) ); 660 m_end_action->addTo(navigation);
661 m_end_action->addTo(navigation); 661
662 662 m_jump_action = new QAction( tr( "Jump" ), geticon( "rotate" ), QString::null, 0, this, NULL);
663 m_jump_action = new QAction( tr( "Jump" ), geticon( "rotate" ), QString::null, 0, this, NULL); 663 connect( m_jump_action, SIGNAL( activated() ), this, SLOT( jump() ) );
664 connect( m_jump_action, SIGNAL( activated() ), this, SLOT( jump() ) ); 664 m_jump_action->addTo(navigation);
665 m_jump_action->addTo(navigation); 665
666 666 m_pageline_action = new QAction( tr( "Page/Line Scroll" ), geticon( "pass" ), QString::null, 0, this, NULL, true );
667 m_pageline_action = new QAction( tr( "Page/Line Scroll" ), geticon( "pass" ), QString::null, 0, this, NULL, true ); 667 connect( m_pageline_action, SIGNAL( toggled(bool) ), this, SLOT( pagemode(bool) ) );
668 connect( m_pageline_action, SIGNAL( toggled(bool) ), this, SLOT( pagemode(bool) ) ); 668 m_pageline_action->addTo(navigation);
669 m_pageline_action->addTo(navigation); 669 m_pageline_action->setOn(reader->m_bpagemode);
670 m_pageline_action->setOn(reader->m_bpagemode); 670
671 671 m_pageup_action = new QAction( tr( "Up" ), geticon( "up" ), QString::null, 0, this, 0 );
672 m_pageup_action = new QAction( tr( "Up" ), geticon( "up" ), QString::null, 0, this, 0 ); 672 connect( m_pageup_action, SIGNAL( activated() ), this, SLOT( pageup() ) );
673 connect( m_pageup_action, SIGNAL( activated() ), this, SLOT( pageup() ) ); 673 m_pageup_action->addTo( navigation );
674 m_pageup_action->addTo( navigation ); 674
675 675 m_pagedn_action = new QAction( tr( "Down" ), geticon( "down" ), QString::null, 0, this, 0 );
676 m_pagedn_action = new QAction( tr( "Down" ), geticon( "down" ), QString::null, 0, this, 0 ); 676 connect( m_pagedn_action, SIGNAL( activated() ), this, SLOT( pagedn() ) );
677 connect( m_pagedn_action, SIGNAL( activated() ), this, SLOT( pagedn() ) ); 677 m_pagedn_action->addTo( navigation );
678 m_pagedn_action->addTo( navigation ); 678
679 679 m_back_action = new QAction( tr( "Back" ), geticon( "back" ), QString::null, 0, this, 0 );
680 m_back_action = new QAction( tr( "Back" ), geticon( "back" ), QString::null, 0, this, 0 ); 680 connect( m_back_action, SIGNAL( activated() ), reader, SLOT( goBack() ) );
681 connect( m_back_action, SIGNAL( activated() ), reader, SLOT( goBack() ) ); 681 m_back_action->addTo( navigation );
682 m_back_action->addTo( navigation ); 682
683 683 m_home_action = new QAction( tr( "Home" ), geticon( "home" ), QString::null, 0, this, 0 );
684 m_home_action = new QAction( tr( "Home" ), geticon( "home" ), QString::null, 0, this, 0 ); 684 connect( m_home_action, SIGNAL( activated() ), reader, SLOT( goHome() ) );
685 connect( m_home_action, SIGNAL( activated() ), reader, SLOT( goHome() ) ); 685 m_home_action->addTo( navigation );
686 m_home_action->addTo( navigation ); 686
687 687 m_forward_action = new QAction( tr( "Forward" ), geticon( "forward" ), QString::null, 0, this, 0 );
688 m_forward_action = new QAction( tr( "Forward" ), geticon( "forward" ), QString::null, 0, this, 0 ); 688 connect( m_forward_action, SIGNAL( activated() ), reader, SLOT( goForward() ) );
689 connect( m_forward_action, SIGNAL( activated() ), reader, SLOT( goForward() ) ); 689 m_forward_action->addTo( navigation );
690 m_forward_action->addTo( navigation ); 690
691 691 /*
692 /* 692 a = new QAction( tr( "Find" ), QString::null, 0, this, NULL, true );
693 a = new QAction( tr( "Find" ), QString::null, 0, this, NULL, true ); 693 // connect( a, SIGNAL( activated() ), this, SLOT( pagedn() ) );
694 // connect( a, SIGNAL( activated() ), this, SLOT( pagedn() ) ); 694 a->addTo( file );
695 a->addTo( file ); 695
696 696 a = new QAction( tr( "Find Again" ), QString::null, 0, this, NULL, true );
697 a = new QAction( tr( "Find Again" ), QString::null, 0, this, NULL, true ); 697 // connect( a, SIGNAL( activated() ), this, SLOT( pagedn() ) );
698 // connect( a, SIGNAL( activated() ), this, SLOT( pagedn() ) ); 698 a->addTo( file );
699 a->addTo( file ); 699 */
700 */ 700
701 701// file->insertSeparator();
702// file->insertSeparator(); 702
703 703#ifdef _SCROLLPIPE
704#ifdef _SCROLLPIPE 704
705 705 QActionGroup* ag = new QActionGroup(this);
706 QActionGroup* ag = new QActionGroup(this); 706 ag->setExclusive(false);
707 ag->setExclusive(false); 707 spacemenu = new QPopupMenu(this);
708 spacemenu = new QPopupMenu(this); 708 file->insertItem( tr( "Scrolling" ), spacemenu );
709 file->insertItem( tr( "Scrolling" ), spacemenu ); 709
710 710 a = new QAction( tr( "Set Target" ), QString::null, 0, ag, NULL);
711 a = new QAction( tr( "Set Target" ), QString::null, 0, ag, NULL); 711 connect( a, SIGNAL( activated() ), this, SLOT( setpipetarget() ) );
712 connect( a, SIGNAL( activated() ), this, SLOT( setpipetarget() ) ); 712
713 713 a = new QAction( tr( "Pause Paras" ), QString::null, 0, ag, NULL, true );
714 a = new QAction( tr( "Pause Paras" ), QString::null, 0, ag, NULL, true ); 714 connect( a, SIGNAL( toggled(bool) ), this, SLOT( setpause(bool) ) );
715 connect( a, SIGNAL( toggled(bool) ), this, SLOT( setpause(bool) ) ); 715 a->setOn(reader->m_pauseAfterEachPara);
716 a->setOn(reader->m_pauseAfterEachPara); 716
717 717 ag->addTo(spacemenu);
718 ag->addTo(spacemenu); 718// file->insertSeparator();
719// file->insertSeparator(); 719
720 720#endif
721#endif 721
722 722/*
723/* 723 a = new QAction( tr( "Import" ), QString::null, 0, this, NULL );
724 a = new QAction( tr( "Import" ), QString::null, 0, this, NULL ); 724 connect( a, SIGNAL( activated() ), this, SLOT( importFiles() ) );
725 connect( a, SIGNAL( activated() ), this, SLOT( importFiles() ) ); 725 a->addTo( file );
726 a->addTo( file ); 726*/
727*/ 727
728 728 /*
729 /* 729 a = new QAction( tr( "Paste" ), geticon( "paste" ), QString::null, 0, this, 0 );
730 a = new QAction( tr( "Paste" ), geticon( "paste" ), QString::null, 0, this, 0 ); 730 connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) );
731 connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) ); 731 a->addTo( fileBar );
732 a->addTo( fileBar ); 732 a->addTo( edit );
733 a->addTo( edit ); 733 */
734 */ 734
735 735// a = new QAction( tr( "Find..." ), geticon( "find" ), QString::null, 0, this, 0 );
736// a = new QAction( tr( "Find..." ), geticon( "find" ), QString::null, 0, this, 0 ); 736
737 737 m_fullscreen = false;
738 m_fullscreen = false; 738 m_actFullscreen = new QAction( tr( "Fullscreen" ), geticon( "fullscreen" ), QString::null, 0, this, NULL, true );
739 m_actFullscreen = new QAction( tr( "Fullscreen" ), geticon( "fullscreen" ), QString::null, 0, this, NULL, true ); 739 connect( m_actFullscreen, SIGNAL( toggled(bool) ), this, SLOT( setfullscreen(bool) ) );
740 connect( m_actFullscreen, SIGNAL( toggled(bool) ), this, SLOT( setfullscreen(bool) ) ); 740 m_actFullscreen->setOn(m_fullscreen);
741 m_actFullscreen->setOn(m_fullscreen); 741 m_actFullscreen->addTo( view );
742 m_actFullscreen->addTo( view ); 742
743 743 m_rotate_action = new QAction( tr( "Rotate" ), geticon( "repeat" ), QString::null, 0, this, NULL, true );
744 m_rotate_action = new QAction( tr( "Rotate" ), geticon( "repeat" ), QString::null, 0, this, NULL, true ); 744 connect( m_rotate_action, SIGNAL( toggled(bool) ), this, SLOT( setrotated(bool) ) );
745 connect( m_rotate_action, SIGNAL( toggled(bool) ), this, SLOT( setrotated(bool) ) ); 745 m_rotate_action->setOn(reader->m_rotated);
746 m_rotate_action->setOn(reader->m_rotated); 746 m_rotate_action->addTo( view );
747 m_rotate_action->addTo( view ); 747
748 748 m_inverse_action = new QAction( tr( "Invert" ), getmyicon( "invert" ), QString::null, 0, this, NULL, true );
749 m_inverse_action = new QAction( tr( "Invert" ), getmyicon( "invert" ), QString::null, 0, this, NULL, true ); 749 connect( m_inverse_action, SIGNAL( toggled(bool) ), this, SLOT( setinverted(bool) ) );
750 connect( m_inverse_action, SIGNAL( toggled(bool) ), this, SLOT( setinverted(bool) ) ); 750 m_inverse_action->setOn(reader->bInverse);
751 m_inverse_action->setOn(reader->bInverse); 751 m_inverse_action->addTo( view );
752 m_inverse_action->addTo( view ); 752
753 753 view->insertSeparator();
754 view->insertSeparator(); 754
755 755 m_zoomin_action = new QAction( tr( "Zoom In" ), geticon( "zoom" ), QString::null, 0, this);
756 m_zoomin_action = new QAction( tr( "Zoom In" ), geticon( "zoom" ), QString::null, 0, this); 756 connect( m_zoomin_action, SIGNAL( activated() ), this, SLOT( zoomin() ) );
757 connect( m_zoomin_action, SIGNAL( activated() ), this, SLOT( zoomin() ) ); 757 m_zoomin_action->addTo( view );
758 m_zoomin_action->addTo( view ); 758
759 759 m_zoomout_action = new QAction( tr( "Zoom Out" ), geticon( "mag" ), QString::null, 0, this);
760 m_zoomout_action = new QAction( tr( "Zoom Out" ), geticon( "mag" ), QString::null, 0, this); 760 connect( m_zoomout_action, SIGNAL( activated() ), this, SLOT( zoomout() ) );
761 connect( m_zoomout_action, SIGNAL( activated() ), this, SLOT( zoomout() ) ); 761 m_zoomout_action->addTo( view );
762 m_zoomout_action->addTo( view ); 762
763 763 view->insertSeparator();
764 view->insertSeparator(); 764 m_setfont_action = new QAction( tr( "Set Font" ), getmyicon( "font" ), QString::null, 0, this);
765 m_setfont_action = new QAction( tr( "Set Font" ), getmyicon( "font" ), QString::null, 0, this); 765 connect( m_setfont_action, SIGNAL( activated() ), this, SLOT( setfont() ) );
766 connect( m_setfont_action, SIGNAL( activated() ), this, SLOT( setfont() ) ); 766 m_setfont_action->addTo( view );
767 m_setfont_action->addTo( view ); 767
768 768 view->insertSeparator();
769 view->insertSeparator(); 769 m_setenc_action = new QAction( tr( "Set Encoding" ), getmyicon( "charset" ), QString::null, 0, this);
770 m_setenc_action = new QAction( tr( "Set Encoding" ), getmyicon( "charset" ), QString::null, 0, this); 770 connect( m_setenc_action, SIGNAL( activated() ), this, SLOT( chooseencoding() ) );
771 connect( m_setenc_action, SIGNAL( activated() ), this, SLOT( chooseencoding() ) ); 771 m_setenc_action->addTo( view );
772 m_setenc_action->addTo( view ); 772
773 773 m_setmono_action = new QAction( tr( "Ideogram" ), getmyicon( "ideogram" ), QString::null, 0, this, NULL, true);
774 m_setmono_action = new QAction( tr( "Ideogram" ), getmyicon( "ideogram" ), QString::null, 0, this, NULL, true); 774 connect( m_setmono_action, SIGNAL( toggled(bool) ), this, SLOT( monospace(bool) ) );
775 connect( m_setmono_action, SIGNAL( toggled(bool) ), this, SLOT( monospace(bool) ) ); 775 m_setmono_action->addTo( view );
776 m_setmono_action->addTo( view ); 776 m_setmono_action->setOn(reader->m_bMonoSpaced);
777 m_setmono_action->setOn(reader->m_bMonoSpaced); 777
778 778
779 779 // a = new QAction( tr( "Zoom" ), QString::null, 0, this, NULL, true );
780 // a = new QAction( tr( "Zoom" ), QString::null, 0, this, NULL, true ); 780 // a = new QAction( tr( "Zoom" ), geticon( "mag" ), QString::null, 0, this, 0 );
781 // a = new QAction( tr( "Zoom" ), geticon( "mag" ), QString::null, 0, this, 0 ); 781
782 782
783 783
784 784 // a->addTo( filebar() );
785 // a->addTo( filebar() ); 785// view->insertSeparator();
786// view->insertSeparator(); 786
787 787/*
788/* 788 a = new QAction( tr( "Ideogram/Word" ), QString::null, 0, this, NULL, true );
789 a = new QAction( tr( "Ideogram/Word" ), QString::null, 0, this, NULL, true ); 789 connect( a, SIGNAL( toggled(bool) ), this, SLOT( monospace(bool) ) );
790 connect( a, SIGNAL( toggled(bool) ), this, SLOT( monospace(bool) ) ); 790 a->setOn(reader->m_bMonoSpaced);
791 a->setOn(reader->m_bMonoSpaced); 791 a->addTo( view );
792 a->addTo( view ); 792*/
793*/ 793/*
794/* 794 a = new QAction( tr( "Set Width" ), QString::null, 0, this, NULL);
795 a = new QAction( tr( "Set Width" ), QString::null, 0, this, NULL); 795 connect( a, SIGNAL( activated() ), this, SLOT( setspacing() ) );
796 connect( a, SIGNAL( activated() ), this, SLOT( setspacing() ) ); 796 a->addTo( view );
797 a->addTo( view ); 797*/
798*/ 798
799 799 m_mark_action = new QAction( tr( "Bookmark" ), getmyicon( "bookmark" ), QString::null, 0, this, NULL);
800 m_mark_action = new QAction( tr( "Bookmark" ), getmyicon( "bookmark" ), QString::null, 0, this, NULL); 800 connect( m_mark_action, SIGNAL( activated() ), this, SLOT( addbkmk() ) );
801 connect( m_mark_action, SIGNAL( activated() ), this, SLOT( addbkmk() ) ); 801 m_mark_action->addTo( marks );
802 m_mark_action->addTo( marks ); 802
803 803 m_annotate_action = new QAction( tr( "Annotate" ), getmyicon( "annotate" ), QString::null, 0, this, NULL);
804 m_annotate_action = new QAction( tr( "Annotate" ), getmyicon( "annotate" ), QString::null, 0, this, NULL); 804 connect( m_annotate_action, SIGNAL( activated() ), this, SLOT( addanno() ) );
805 connect( m_annotate_action, SIGNAL( activated() ), this, SLOT( addanno() ) ); 805 m_annotate_action->addTo( marks );
806 m_annotate_action->addTo( marks ); 806
807 807 m_goto_action = new QAction( tr( "Goto" ), getmyicon( "bookmark_goto" ), QString::null, 0, this, NULL, false );
808 m_goto_action = new QAction( tr( "Goto" ), getmyicon( "bookmark_goto" ), QString::null, 0, this, NULL, false ); 808 connect( m_goto_action, SIGNAL( activated() ), this, SLOT( do_gotomark() ) );
809 connect( m_goto_action, SIGNAL( activated() ), this, SLOT( do_gotomark() ) ); 809 m_goto_action->addTo( marks );
810 m_goto_action->addTo( marks ); 810
811 811 m_delete_action = new QAction( tr( "Delete" ), getmyicon( "bookmark_delete" ), QString::null, 0, this, NULL);
812 m_delete_action = new QAction( tr( "Delete" ), getmyicon( "bookmark_delete" ), QString::null, 0, this, NULL); 812 connect( m_delete_action, SIGNAL( activated() ), this, SLOT( do_delmark() ) );
813 connect( m_delete_action, SIGNAL( activated() ), this, SLOT( do_delmark() ) ); 813 m_delete_action->addTo( marks );
814 m_delete_action->addTo( marks ); 814
815 815 m_autogen_action = new QAction( tr( "Autogen" ), geticon( "exec" ), QString::null, 0, this, NULL, false );
816 m_autogen_action = new QAction( tr( "Autogen" ), geticon( "exec" ), QString::null, 0, this, NULL, false ); 816 connect( m_autogen_action, SIGNAL( activated() ), this, SLOT( do_autogen() ) );
817 connect( m_autogen_action, SIGNAL( activated() ), this, SLOT( do_autogen() ) ); 817 marks->insertSeparator();
818 marks->insertSeparator(); 818 m_autogen_action->addTo( marks );
819 m_autogen_action->addTo( marks ); 819
820 820 m_clear_action = new QAction( tr( "Clear" ), getmyicon( "bookmark_clear" ), QString::null, 0, this, NULL);
821 m_clear_action = new QAction( tr( "Clear" ), getmyicon( "bookmark_clear" ), QString::null, 0, this, NULL); 821 connect( m_clear_action, SIGNAL( activated() ), this, SLOT( clearBkmkList() ) );
822 connect( m_clear_action, SIGNAL( activated() ), this, SLOT( clearBkmkList() ) ); 822 m_clear_action->addTo( marks );
823 m_clear_action->addTo( marks ); 823
824 824 m_save_action = new QAction( tr( "Save" ), getmyicon( "bookmark_save" ), QString::null, 0, this, NULL );
825 m_save_action = new QAction( tr( "Save" ), getmyicon( "bookmark_save" ), QString::null, 0, this, NULL ); 825 connect( m_save_action, SIGNAL( activated() ), this, SLOT( savebkmks() ) );
826 connect( m_save_action, SIGNAL( activated() ), this, SLOT( savebkmks() ) ); 826 m_save_action->addTo( marks );
827 m_save_action->addTo( marks ); 827
828 828 m_tidy_action = new QAction( tr( "Tidy" ), getmyicon( "bookmark_tidy" ), QString::null, 0, this, NULL);
829 m_tidy_action = new QAction( tr( "Tidy" ), getmyicon( "bookmark_tidy" ), QString::null, 0, this, NULL); 829 connect( m_tidy_action, SIGNAL( activated() ), this, SLOT( listBkmkFiles() ) );
830 connect( m_tidy_action, SIGNAL( activated() ), this, SLOT( listBkmkFiles() ) ); 830 marks->insertSeparator();
831 marks->insertSeparator(); 831 m_tidy_action->addTo( marks );
832 m_tidy_action->addTo( marks ); 832
833 833 m_startBlock_action = new QAction( tr( "Start Block" ), geticon( "new" ), QString::null, 0, this, NULL);
834 m_startBlock_action = new QAction( tr( "Start Block" ), geticon( "new" ), QString::null, 0, this, NULL); 834 connect( m_startBlock_action, SIGNAL( activated() ), this, SLOT( editMark() ) );
835 connect( m_startBlock_action, SIGNAL( activated() ), this, SLOT( editMark() ) ); 835 marks->insertSeparator();
836 marks->insertSeparator(); 836 m_startBlock_action->addTo( marks );
837 m_startBlock_action->addTo( marks ); 837
838 838 m_endBlock_action = new QAction( tr( "Copy Block" ), geticon( "copy" ), QString::null, 0, this, NULL);
839 m_endBlock_action = new QAction( tr( "Copy Block" ), geticon( "copy" ), QString::null, 0, this, NULL); 839 connect( m_endBlock_action, SIGNAL( activated() ), this, SLOT( editCopy() ) );
840 connect( m_endBlock_action, SIGNAL( activated() ), this, SLOT( editCopy() ) ); 840 m_endBlock_action->addTo( marks );
841 m_endBlock_action->addTo( marks ); 841
842 842 m_bkmkAvail = NULL;
843 m_bkmkAvail = NULL; 843
844 844
845 845 setToolBarsMovable(m_tbmove);
846 setToolBarsMovable(m_tbmove); 846 addtoolbars(&config);
847 addtoolbars(&config); 847
848 848 pbar = new QProgressBar(this);
849 pbar = new QProgressBar(this); 849 pbar->hide();
850 pbar->hide(); 850
851 851 searchBar = new QFloatBar( "Search", this, QMainWindow::Top, TRUE );
852 searchBar = new QFloatBar( "Search", this, QMainWindow::Top, TRUE ); 852
853 853 searchBar->setHorizontalStretchable( TRUE );
854 searchBar->setHorizontalStretchable( TRUE ); 854
855 855 connect(searchBar, SIGNAL( OnHide() ), this, SLOT( restoreFocus() ));
856 connect(searchBar, SIGNAL( OnHide() ), this, SLOT( restoreFocus() )); 856
857 857 searchEdit = new QLineEdit( searchBar, "searchEdit" );
858 searchEdit = new QLineEdit( searchBar, "searchEdit" ); 858// QFont f("unifont", 16 /*, QFont::Bold*/);
859// QFont f("unifont", 16 /*, QFont::Bold*/); 859// searchEdit->setFont( f );
860// searchEdit->setFont( f ); 860 searchBar->setStretchableWidget( searchEdit );
861 searchBar->setStretchableWidget( searchEdit ); 861
862 862
863 863#ifdef __ISEARCH
864#ifdef __ISEARCH 864 connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
865 connect( searchEdit, SIGNAL( textChanged( const QString & ) ), 865 this, SLOT( search( const QString& ) ) );
866 this, SLOT( search( const QString& ) ) ); 866#else
867#else 867 connect( searchEdit, SIGNAL( returnPressed( ) ),
868 connect( searchEdit, SIGNAL( returnPressed( ) ), 868 this, SLOT( search( ) ) );
869 this, SLOT( search( ) ) ); 869#endif
870#endif 870 QAction*a = new QAction( tr( "Find Next" ), geticon( "next" ), QString::null, 0, this, 0 );
871 QAction*a = new QAction( tr( "Find Next" ), geticon( "next" ), QString::null, 0, this, 0 ); 871 connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) );
872 connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) ); 872 a->addTo( searchBar );
873 a->addTo( searchBar ); 873
874 874 a = new QAction( tr( "Close Find" ), geticon( "close" ), QString::null, 0, this, 0 );
875 a = new QAction( tr( "Close Find" ), geticon( "close" ), QString::null, 0, this, 0 ); 875 connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) );
876 connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) ); 876 a->addTo( searchBar );
877 a->addTo( searchBar ); 877
878 878 searchBar->hide();
879 searchBar->hide(); 879
880 880 regBar = new QFloatBar( "Autogen", this, QMainWindow::Top, TRUE );
881 regBar = new QFloatBar( "Autogen", this, QMainWindow::Top, TRUE ); 881 connect(regBar, SIGNAL( OnHide() ), this, SLOT( restoreFocus() ));
882 connect(regBar, SIGNAL( OnHide() ), this, SLOT( restoreFocus() )); 882
883 883 regBar->setHorizontalStretchable( TRUE );
884 regBar->setHorizontalStretchable( TRUE ); 884
885 885 regEdit = new QLineEdit( regBar, "regEdit" );
886 regEdit = new QLineEdit( regBar, "regEdit" ); 886// regEdit->setFont( f );
887// regEdit->setFont( f ); 887
888 888 regBar->setStretchableWidget( regEdit );
889 regBar->setStretchableWidget( regEdit ); 889
890 890 connect( regEdit, SIGNAL( returnPressed( ) ),
891 connect( regEdit, SIGNAL( returnPressed( ) ), 891 this, SLOT( do_regaction() ) );
892 this, SLOT( do_regaction() ) ); 892
893 893 a = new QAction( tr( "Do Reg" ), geticon( "enter" ), QString::null, 0, this, 0 );
894 a = new QAction( tr( "Do Reg" ), geticon( "enter" ), QString::null, 0, this, 0 ); 894 connect( a, SIGNAL( activated() ), this, SLOT( do_regaction() ) );
895 connect( a, SIGNAL( activated() ), this, SLOT( do_regaction() ) ); 895 a->addTo( regBar );
896 a->addTo( regBar ); 896
897 897 a = new QAction( tr( "Close Edit" ), geticon( "close" ), QString::null, 0, this, 0 );
898 a = new QAction( tr( "Close Edit" ), geticon( "close" ), QString::null, 0, this, 0 ); 898 connect( a, SIGNAL( activated() ), this, SLOT( regClose() ) );
899 connect( a, SIGNAL( activated() ), this, SLOT( regClose() ) ); 899 a->addTo( regBar );
900 a->addTo( regBar ); 900
901 901 regBar->hide();
902 regBar->hide(); 902
903 903 m_fontBar = new QToolBar( "Autogen", this, QMainWindow::Top, TRUE );
904 m_fontBar = new QToolBar( "Autogen", this, QMainWindow::Top, TRUE ); 904
905 905 m_fontBar->setHorizontalStretchable( TRUE );
906 m_fontBar->setHorizontalStretchable( TRUE ); 906
907 907// qDebug("Font selector");
908// qDebug("Font selector"); 908 m_fontSelector = new QComboBox(false, m_fontBar);
909 m_fontSelector = new QComboBox(false, m_fontBar); 909 m_fontBar->setStretchableWidget( m_fontSelector );
910 m_fontBar->setStretchableWidget( m_fontSelector ); 910 {
911 { 911 QFontDatabase f;
912 QFontDatabase f; 912 QStringList flist = f.families();
913 QStringList flist = f.families(); 913 bool realfont = false;
914 bool realfont = false; 914 for (QStringList::Iterator nm = flist.begin(); nm != flist.end(); nm++)
915 for (QStringList::Iterator nm = flist.begin(); nm != flist.end(); nm++) 915 {
916 { 916 if (reader->m_fontname == *nm)
917 if (reader->m_fontname == *nm) 917 {
918 { 918 realfont = true;
919 realfont = true; 919 }
920 } 920 if ((*nm).contains(FIXEDFONT,false)) reader->m_fontControl.hasCourier(true, *nm);
921 if ((*nm).contains(FIXEDFONT,false)) reader->m_fontControl.hasCourier(true, *nm); 921 }
922 } 922 if (!realfont) reader->m_fontname = flist[0];
923 if (!realfont) reader->m_fontname = flist[0]; 923 } // delete the FontDatabase!!!
924 } // delete the FontDatabase!!! 924 connect( m_fontSelector, SIGNAL( activated(const QString& ) ),
925 connect( m_fontSelector, SIGNAL( activated(const QString& ) ), 925 this, SLOT( do_setfont(const QString&) ) );
926 this, SLOT( do_setfont(const QString&) ) ); 926 connect( m_fontSelector, SIGNAL( activated(int ) ),
927 connect( m_fontSelector, SIGNAL( activated(int ) ), 927 this, SLOT( do_setencoding(int) ) );
928 this, SLOT( do_setencoding(int) ) ); 928
929 929 m_fontBar->hide();
930 m_fontBar->hide(); 930 m_fontVisible = false;
931 m_fontVisible = false; 931#ifdef USEMSGS
932#ifdef USEMSGS 932 connect(qApp, SIGNAL( appMessage(const QCString&, const QByteArray& ) ),
933 connect(qApp, SIGNAL( appMessage(const QCString&, const QByteArray& ) ), 933 this, SLOT( msgHandler(const QCString&, const QByteArray&) ) );
934 this, SLOT( msgHandler(const QCString&, const QByteArray&) ) ); 934#endif
935#endif 935// qDebug("Initing");
936// qDebug("Initing"); 936
937 937 m_layout->addWidget(editorStack);
938 m_layout->addWidget(editorStack); 938 if (m_qtscroll != 0)
939 if (m_qtscroll != 0) 939 {
940 { 940 /*
941 /* 941 m_scrollbar = new QToolBar( "Autogen", this, (m_localscrollbar) ? QMainWindow::Left : QMainWindow::Right, TRUE );
942 m_scrollbar = new QToolBar( "Autogen", this, (m_localscrollbar) ? QMainWindow::Left : QMainWindow::Right, TRUE ); 942
943 943 m_scrollbar->setVerticalStretchable( TRUE );
944 m_scrollbar->setVerticalStretchable( TRUE ); 944 */
945 */ 945 scrollbar = m_scrollbar = new QScrollBar(QScrollBar::Vertical, widge);
946 scrollbar = m_scrollbar = new QScrollBar(QScrollBar::Vertical, widge); 946 m_layout->addWidget(scrollbar);
947 m_layout->addWidget(scrollbar); 947 scrollbar->setTracking(false);
948 scrollbar->setTracking(false); 948 //connect(scrollbar, SIGNAL(sliderMoved(int)), this, SLOT(actionscroll(int)) );
949 //connect(scrollbar, SIGNAL(sliderMoved(int)), this, SLOT(actionscroll(int)) ); 949 //m_scrollbar->setStretchableWidget( scrollbar );
950 //m_scrollbar->setStretchableWidget( scrollbar ); 950 if (m_scrollishidden)
951 if (m_scrollishidden) 951 {
952 { 952 m_scrollbar->hide();
953 m_scrollbar->hide(); 953 }
954 } 954 else
955 else 955 {
956 { 956 m_scrollbar->show();
957 m_scrollbar->show(); 957 }
958 } 958
959 959 setrotated(reader->m_rotated);
960 setrotated(reader->m_rotated); 960 }
961 } 961 else
962 else 962 {
963 { 963 m_scrollbar = NULL;
964 m_scrollbar = NULL; 964 }
965 } 965 setBackgroundBitmap();
966 setBackgroundBitmap(); 966 m_inverse_action->setOn(reader->bInverse);
967 m_inverse_action->setOn(reader->bInverse); 967 reader->init();
968 reader->init(); 968
969 969// qDebug("Inited");
970// qDebug("Inited"); 970// m_buttonAction[m_spaceTarget]->setOn(true);
971// m_buttonAction[m_spaceTarget]->setOn(true); 971// qDebug("fonting");
972// qDebug("fonting"); 972 do_setfont(reader->m_fontname);
973 do_setfont(reader->m_fontname); 973 // qDebug("fonted");
974 // qDebug("fonted"); 974 QFont progfont(reader->m_fontname, reader->m_fontControl.getsize(0));
975 QFont progfont(reader->m_fontname, reader->m_fontControl.getsize(0)); 975 m_prog->setFont( progfont );
976 m_prog->setFont( progfont ); 976 if (m_statusishidden) m_prog->hide();
977 if (m_statusishidden) m_prog->hide(); 977 if (!reader->m_lastfile.isEmpty())
978 if (!reader->m_lastfile.isEmpty()) 978 {
979 { 979 //qDebug("doclnk");
980 //qDebug("doclnk"); 980 //doc = new DocLnk(reader->m_lastfile);
981 //doc = new DocLnk(reader->m_lastfile); 981 //qDebug("doclnk done");
982 //qDebug("doclnk done"); 982 if (pOpenlist != NULL)
983 if (pOpenlist != NULL) 983 {
984 { 984
985 985/*
986/* 986 int ind = 0;
987 int ind = 0; 987 Bkmk* p = (*pOpenlist)[ind];
988 Bkmk* p = (*pOpenlist)[ind]; 988 while (p != NULL && toQString(CFiledata(p->anno()).name()) != reader->m_lastfile)
989 while (p != NULL && toQString(CFiledata(p->anno()).name()) != reader->m_lastfile) 989 {
990 { 990 p = (*pOpenlist)[++ind];
991 p = (*pOpenlist)[++ind]; 991 }
992 } 992*/
993*/ 993 Bkmk* p = NULL;
994 Bkmk* p = NULL; 994 for (CList<Bkmk>::iterator iter = pOpenlist->begin(); iter != pOpenlist->end(); iter++)
995 for (CList<Bkmk>::iterator iter = pOpenlist->begin(); iter != pOpenlist->end(); iter++) 995 {
996 { 996 p = iter.pContent();
997 p = iter.pContent(); 997 if (toQString(CFiledata(p->anno()).name()) == reader->m_lastfile)
998 if (toQString(CFiledata(p->anno()).name()) == reader->m_lastfile) 998 {
999 { 999 break;
1000 break; 1000 }
1001 } 1001 // qDebug("Item:%s", (const char*)toQString(CFiledata(p->anno()).name()));
1002 // qDebug("Item:%s", (const char*)toQString(CFiledata(p->anno()).name())); 1002 p = NULL;
1003 p = NULL; 1003 }
1004 } 1004 if (p != NULL)
1005 if (p != NULL) 1005 {
1006 { 1006 if (!openfrombkmk(p))
1007 if (!openfrombkmk(p)) 1007 {
1008 { 1008 showEditTools();
1009 showEditTools(); 1009 }
1010 } 1010 }
1011 } 1011 else
1012 else 1012 {
1013 { 1013 openFile( reader->m_lastfile );
1014 openFile( reader->m_lastfile ); 1014 }
1015 } 1015 }
1016 } 1016 else
1017 else 1017 {
1018 { 1018 if (!reader->m_lastfile.isEmpty())
1019 if (!reader->m_lastfile.isEmpty()) 1019 {
1020 { 1020 openFile( reader->m_lastfile );
1021 openFile( reader->m_lastfile ); 1021 }
1022 } 1022 }
1023 } 1023 }
1024 } 1024 else
1025 else 1025 {
1026 { 1026 showEditTools();
1027 showEditTools(); 1027 }
1028 } 1028// qApp->processEvents();
1029// qApp->processEvents(); 1029 if (m_scrollbar == NULL || m_scrollbar->isHidden())
1030 if (m_scrollbar == NULL || m_scrollbar->isHidden()) 1030 {
1031 { 1031 reader->m_scrollpos = m_localscroll;
1032 reader->m_scrollpos = m_localscroll; 1032 }
1033 } 1033 else
1034 else 1034 {
1035 { 1035 reader->m_scrollpos = (m_qtscroll == 0) ? m_localscroll : 0;
1036 reader->m_scrollpos = (m_qtscroll == 0) ? m_localscroll : 0; 1036 }
1037 } 1037 reader->bDoUpdates = true;
1038 reader->bDoUpdates = true; 1038 reader->update();
1039 reader->update(); 1039 config.setGroup("Version");
1040 config.setGroup("Version"); 1040 int major = config.readNumEntry("Major", 0);
1041 int major = config.readNumEntry("Major", 0); 1041 int bkmktype = config.readNumEntry("BkmkType", 0);
1042 int bkmktype = config.readNumEntry("BkmkType", 0); 1042 char minor = config.readNumEntry("Minor", 0);
1043 char minor = config.readNumEntry("Minor", 0); 1043 if (CheckVersion(major, bkmktype, minor))
1044 if (CheckVersion(major, bkmktype, minor)) 1044 {
1045 { 1045 config.writeEntry("Major", major);
1046 config.writeEntry("Major", major); 1046 config.writeEntry("BkmkType", bkmktype);
1047 config.writeEntry("BkmkType", bkmktype); 1047 config.writeEntry("Minor", (int)minor);
1048 config.writeEntry("Minor", (int)minor); 1048 }
1049 } 1049// qDebug("finished update");
1050// qDebug("finished update"); 1050 if (kmap.isEmpty())
1051 if (kmap.isEmpty()) 1051 {
1052 { 1052 QMessageBox::warning(this, PROGNAME, "You haven't mapped any keys yet!\n\nYou will be taken to the key\nmapping dialog.\nA few defaults are provided\nbut you can change then to\nsuit yourself.\n\nYou can change the key\nmapping at any time by\nselecting the Settings/Button\noption on the menu.");
1053 QMessageBox::warning(this, PROGNAME, "You haven't mapped any keys yet!\n\nYou will be taken to the key\nmapping dialog.\nA few defaults are provided\nbut you can change then to\nsuit yourself.\n\nYou can change the key\nmapping at any time by\nselecting the Settings/Button\noption on the menu."); 1053
1054 1054 m_buttonprefs->mapkey(Qt::NoButton, Key_Up, cesPageUp);
1055 m_buttonprefs->mapkey(Qt::NoButton, Key_Up, cesPageUp); 1055 m_buttonprefs->mapkey(Qt::NoButton, Key_Down, cesPageDown);
1056 m_buttonprefs->mapkey(Qt::NoButton, Key_Down, cesPageDown); 1056
1057 1057 m_buttonprefs->mapkey(Qt::NoButton, Key_Right, cesZoomIn);
1058 m_buttonprefs->mapkey(Qt::NoButton, Key_Right, cesZoomIn); 1058 m_buttonprefs->mapkey(Qt::NoButton, Key_Left, cesZoomOut);
1059 m_buttonprefs->mapkey(Qt::NoButton, Key_Left, cesZoomOut); 1059
1060 1060 showbuttonprefs();
1061 showbuttonprefs(); 1061 }
1062 } 1062}
1063} 1063
1064 1064void QTReaderApp::addtoolbars(Config* config)
1065void QTReaderApp::addtoolbars(Config* config) 1065{
1066{ 1066 config->setGroup("Toolbar");
1067 config->setGroup("Toolbar"); 1067
1068 1068 if (fileBar != NULL)
1069 if (fileBar != NULL) 1069 {
1070 { 1070#ifdef USEQPE
1071#ifdef USEQPE 1071 if (fileBar != menubar)
1072 if (fileBar != menubar) 1072 {
1073 { 1073 fileBar->clear();
1074 fileBar->clear(); 1074 }
1075 } 1075 else
1076 else 1076 {
1077 { 1077 m_preferences_action->removeFrom( filebar() );
1078 m_preferences_action->removeFrom( filebar() ); 1078 m_open_action->removeFrom( filebar() );
1079 m_open_action->removeFrom( filebar() ); 1079 m_close_action->removeFrom( filebar() );
1080 m_close_action->removeFrom( filebar() ); 1080 m_info_action->removeFrom( filebar() );
1081 m_info_action->removeFrom( filebar() ); 1081 m_touch_action->removeFrom( filebar() );
1082 m_touch_action->removeFrom( filebar() ); 1082 m_find_action->removeFrom( filebar() );
1083 m_find_action->removeFrom( filebar() ); 1083 }
1084 } 1084#else
1085#else 1085 fileBar->clear();
1086 fileBar->clear(); 1086#endif
1087#endif 1087 }
1088 } 1088
1089 1089 m_preferences_action->addTo( filebar() );
1090 m_preferences_action->addTo( filebar() ); 1090 addfilebar(config, "Open", m_open_action);
1091 addfilebar(config, "Open", m_open_action); 1091 addfilebar(config, "Close", m_close_action);
1092 addfilebar(config, "Close", m_close_action); 1092 addfilebar(config, "Info", m_info_action);
1093 addfilebar(config, "Info", m_info_action); 1093 addfilebar(config, "Two/One Touch", m_touch_action);
1094 addfilebar(config, "Two/One Touch", m_touch_action); 1094 addfilebar(config, "Find", m_find_action);
1095 addfilebar(config, "Find", m_find_action); 1095
1096 1096 if (navBar != NULL)
1097 if (navBar != NULL) 1097 {
1098 { 1098#ifdef USEQPE
1099#ifdef USEQPE 1099 if ((navBar == fileBar) && (fileBar == menubar))
1100 if ((navBar == fileBar) && (fileBar == menubar)) 1100#else
1101#else 1101 if (navBar == fileBar)
1102 if (navBar == fileBar) 1102#endif
1103#endif 1103 {
1104 { 1104 m_scrollButton->removeFrom( navbar() );
1105 m_scrollButton->removeFrom( navbar() ); 1105 m_start_action->removeFrom( navbar() );
1106 m_start_action->removeFrom( navbar() ); 1106 m_end_action->removeFrom( navbar() );
1107 m_end_action->removeFrom( navbar() ); 1107 m_jump_action->removeFrom( navbar() );
1108 m_jump_action->removeFrom( navbar() ); 1108 m_pageline_action->removeFrom( navbar() );
1109 m_pageline_action->removeFrom( navbar() ); 1109 m_pageup_action->removeFrom( navbar() );
1110 m_pageup_action->removeFrom( navbar() ); 1110 m_pagedn_action->removeFrom( navbar() );
1111 m_pagedn_action->removeFrom( navbar() ); 1111 m_back_action->removeFrom( navbar() );
1112 m_back_action->removeFrom( navbar() ); 1112 m_home_action->removeFrom( navbar() );
1113 m_home_action->removeFrom( navbar() ); 1113 m_forward_action->removeFrom( navbar() );
1114 m_forward_action->removeFrom( navbar() ); 1114 }
1115 } 1115 else if (navBar != fileBar)
1116 else if (navBar != fileBar) 1116 {
1117 { 1117 navBar->clear();
1118 navBar->clear(); 1118 }
1119 } 1119 }
1120 } 1120
1121 1121 addnavbar(config, "Scroll", m_scrollButton);
1122 addnavbar(config, "Scroll", m_scrollButton); 1122 addnavbar(config, "Goto Start", m_start_action);
1123 addnavbar(config, "Goto Start", m_start_action); 1123 addnavbar(config, "Goto End", m_end_action);
1124 addnavbar(config, "Goto End", m_end_action); 1124
1125 1125 addnavbar(config, "Jump", m_jump_action);
1126 addnavbar(config, "Jump", m_jump_action); 1126 addnavbar(config, "Page/Line Scroll", m_pageline_action);
1127 addnavbar(config, "Page/Line Scroll", m_pageline_action); 1127
1128 1128 addnavbar(config, "Page Up", m_pageup_action);
1129 addnavbar(config, "Page Up", m_pageup_action); 1129 addnavbar(config, "Page Down", m_pagedn_action);
1130 addnavbar(config, "Page Down", m_pagedn_action); 1130
1131 1131 addnavbar(config, "Back", m_back_action);
1132 addnavbar(config, "Back", m_back_action); 1132 addnavbar(config, "Home", m_home_action);
1133 addnavbar(config, "Home", m_home_action); 1133 addnavbar(config, "Forward", m_forward_action);
1134 addnavbar(config, "Forward", m_forward_action); 1134
1135 1135 if (viewBar != NULL)
1136 if (viewBar != NULL) 1136 {
1137 { 1137#ifdef USEQPE
1138#ifdef USEQPE 1138 if ((viewBar == fileBar) && (fileBar == menubar))
1139 if ((viewBar == fileBar) && (fileBar == menubar)) 1139#else
1140#else 1140 if (viewBar == fileBar)
1141 if (viewBar == fileBar) 1141#endif
1142#endif 1142 {
1143 { 1143 m_actFullscreen->removeFrom( filebar() );
1144 m_actFullscreen->removeFrom( filebar() ); 1144 m_rotate_action->removeFrom( viewbar() );
1145 m_rotate_action->removeFrom( viewbar() ); 1145 m_inverse_action->removeFrom( viewbar() );
1146 m_inverse_action->removeFrom( viewbar() ); 1146 m_zoomin_action->removeFrom( viewbar() );
1147 m_zoomin_action->removeFrom( viewbar() ); 1147 m_zoomout_action->removeFrom( viewbar() );
1148 m_zoomout_action->removeFrom( viewbar() ); 1148 m_setfont_action->removeFrom( viewbar() );
1149 m_setfont_action->removeFrom( viewbar() ); 1149 m_setenc_action->removeFrom( viewbar() );
1150 m_setenc_action->removeFrom( viewbar() ); 1150 m_setmono_action->removeFrom( viewbar() );
1151 m_setmono_action->removeFrom( viewbar() ); 1151 }
1152 } 1152 else if (viewBar != fileBar)
1153 else if (viewBar != fileBar) 1153 {
1154 { 1154 viewBar->clear();
1155 viewBar->clear(); 1155 }
1156 } 1156 }
1157 } 1157
1158 1158 addviewbar(config, "Fullscreen", m_actFullscreen);
1159 addviewbar(config, "Fullscreen", m_actFullscreen); 1159 addviewbar(config, "Rotate", m_rotate_action);
1160 addviewbar(config, "Rotate", m_rotate_action); 1160 addviewbar(config, "Invert Action", m_inverse_action);
1161 addviewbar(config, "Invert Action", m_inverse_action); 1161 addviewbar(config, "Zoom In", m_zoomin_action);
1162 addviewbar(config, "Zoom In", m_zoomin_action); 1162 addviewbar(config, "Zoom Out", m_zoomout_action);
1163 addviewbar(config, "Zoom Out", m_zoomout_action); 1163 addviewbar(config, "Set Font", m_setfont_action);
1164 addviewbar(config, "Set Font", m_setfont_action); 1164 addviewbar(config, "Encoding Select", m_setenc_action);
1165 addviewbar(config, "Encoding Select", m_setenc_action); 1165 addviewbar(config, "Ideogram Mode", m_setmono_action);
1166 addviewbar(config, "Ideogram Mode", m_setmono_action); 1166
1167 1167 if (markBar != NULL)
1168 if (markBar != NULL) 1168 {
1169 { 1169#ifdef USEQPE
1170#ifdef USEQPE 1170 if ((markBar == fileBar) && (fileBar == menubar))
1171 if ((markBar == fileBar) && (fileBar == menubar)) 1171#else
1172#else 1172 if (markBar == fileBar)
1173 if (markBar == fileBar) 1173#endif
1174#endif 1174 {
1175 { 1175 m_mark_action->removeFrom( markbar() );
1176 m_mark_action->removeFrom( markbar() ); 1176 m_annotate_action->removeFrom( markbar());
1177 m_annotate_action->removeFrom( markbar()); 1177 m_goto_action->removeFrom( markbar() );
1178 m_goto_action->removeFrom( markbar() ); 1178 m_delete_action->removeFrom( markbar() );
1179 m_delete_action->removeFrom( markbar() ); 1179 m_autogen_action->removeFrom( markbar() );
1180 m_autogen_action->removeFrom( markbar() ); 1180 m_clear_action->removeFrom( markbar() );
1181 m_clear_action->removeFrom( markbar() ); 1181 m_save_action->removeFrom( markbar() );
1182 m_save_action->removeFrom( markbar() ); 1182 m_tidy_action->removeFrom( markbar() );
1183 m_tidy_action->removeFrom( markbar() ); 1183 m_startBlock_action->removeFrom( markbar() );
1184 m_startBlock_action->removeFrom( markbar() ); 1184 m_endBlock_action->removeFrom( markbar() );
1185 m_endBlock_action->removeFrom( markbar() ); 1185 }
1186 } 1186 else if (markBar != fileBar)
1187 else if (markBar != fileBar) 1187 {
1188 { 1188 markBar->clear();
1189 markBar->clear(); 1189 }
1190 } 1190 }
1191 } 1191 addmarkbar(config, "Mark", m_mark_action);
1192 addmarkbar(config, "Mark", m_mark_action); 1192 addmarkbar(config, "Annotate", m_annotate_action);
1193 addmarkbar(config, "Annotate", m_annotate_action); 1193 addmarkbar(config, "Goto", m_goto_action);
1194 addmarkbar(config, "Goto", m_goto_action); 1194 addmarkbar(config, "Delete", m_delete_action);
1195 addmarkbar(config, "Delete", m_delete_action); 1195 addmarkbar(config, "Autogen", m_autogen_action);
1196 addmarkbar(config, "Autogen", m_autogen_action); 1196 addmarkbar(config, "Clear", m_clear_action);
1197 addmarkbar(config, "Clear", m_clear_action); 1197 addmarkbar(config, "Save", m_save_action);
1198 addmarkbar(config, "Save", m_save_action); 1198 addmarkbar(config, "Tidy", m_tidy_action);
1199 addmarkbar(config, "Tidy", m_tidy_action); 1199 addmarkbar(config, "Start Block", m_startBlock_action);
1200 addmarkbar(config, "Start Block", m_startBlock_action); 1200 addmarkbar(config, "Copy Block", m_endBlock_action);
1201 addmarkbar(config, "Copy Block", m_endBlock_action); 1201 if (checkbar(config, "Annotation indicator"))
1202 if (checkbar(config, "Annotation indicator")) 1202 {
1203 { 1203 if (m_bkmkAvail == NULL)
1204 if (m_bkmkAvail == NULL) 1204 {
1205 { 1205 m_bkmkAvail = new QAction( tr( "Annotation" ), geticon( "find" ), QString::null, 0, this, 0 );
1206 m_bkmkAvail = new QAction( tr( "Annotation" ), geticon( "find" ), QString::null, 0, this, 0 ); 1206 connect( m_bkmkAvail, SIGNAL( activated() ), this, SLOT( showAnnotation() ) );
1207 connect( m_bkmkAvail, SIGNAL( activated() ), this, SLOT( showAnnotation() ) ); 1207
1208 1208 m_bkmkAvail->setEnabled(false);
1209 m_bkmkAvail->setEnabled(false); 1209 }
1210 } 1210 QLabel *spacer = new QLabel(markBar, "");
1211 QLabel *spacer = new QLabel(markBar, ""); 1211 markbar()->setStretchableWidget(spacer);
1212 markbar()->setStretchableWidget(spacer); 1212 m_bkmkAvail->removeFrom( markbar() );
1213 m_bkmkAvail->removeFrom( markbar() ); 1213 m_bkmkAvail->addTo( markbar() );
1214 m_bkmkAvail->addTo( markbar() ); 1214 }
1215 } 1215 else
1216 else 1216 {
1217 { 1217 if (m_bkmkAvail != NULL)
1218 if (m_bkmkAvail != NULL) 1218 {
1219 { 1219 m_bkmkAvail->removeFrom( markbar() );
1220 m_bkmkAvail->removeFrom( markbar() ); 1220 delete m_bkmkAvail;
1221 delete m_bkmkAvail; 1221 m_bkmkAvail = NULL;
1222 m_bkmkAvail = NULL; 1222 }
1223 } 1223 }
1224 } 1224}
1225} 1225
1226 1226bool QTReaderApp::checkbar(Config* _config, const QString& key)
1227bool QTReaderApp::checkbar(Config* _config, const QString& key) 1227{
1228{ 1228 return _config->readBoolEntry(key, false);
1229 return _config->readBoolEntry(key, false); 1229}
1230} 1230
1231 1231
1232 1232QToolBar* QTReaderApp::filebar()
1233QToolBar* QTReaderApp::filebar() 1233{
1234{ 1234 if (fileBar == NULL)
1235 if (fileBar == NULL) 1235 {
1236 { 1236 switch (m_tbpol)
1237 switch (m_tbpol) 1237 {
1238 { 1238#ifdef USEQPE
1239#ifdef USEQPE 1239 case cesSingle:
1240 case cesSingle: 1240 // qDebug("Setting filebar to menubar");
1241 // qDebug("Setting filebar to menubar"); 1241 fileBar = menubar;
1242 fileBar = menubar; 1242 break;
1243 break; 1243#endif
1244#endif 1244 default:
1245 default: 1245 qDebug("Incorrect toolbar policy set");
1246 qDebug("Incorrect toolbar policy set"); 1246 case cesMenuTool:
1247 case cesMenuTool: 1247 case cesMultiple:
1248 case cesMultiple: 1248 // qDebug("Creating new file bar");
1249 // qDebug("Creating new file bar"); 1249 fileBar = new QToolBar("File", this, m_tbposition);
1250 fileBar = new QToolBar("File", this, m_tbposition); 1250 break;
1251 break; 1251 }
1252 } 1252 //fileBar->setHorizontalStretchable( true );
1253 //fileBar->setHorizontalStretchable( true ); 1253 }
1254 } 1254 return fileBar;
1255 return fileBar; 1255}
1256} 1256QToolBar* QTReaderApp::viewbar()
1257QToolBar* QTReaderApp::viewbar() 1257{
1258{ 1258 if (viewBar == NULL)
1259 if (viewBar == NULL) 1259 {
1260 { 1260 switch (m_tbpol)
1261 switch (m_tbpol) 1261 {
1262 { 1262 case cesMultiple:
1263 case cesMultiple: 1263 viewBar = new QToolBar("View", this, m_tbposition);
1264 viewBar = new QToolBar("View", this, m_tbposition); 1264 break;
1265 break; 1265 default:
1266 default: 1266 qDebug("Incorrect toolbar policy set");
1267 qDebug("Incorrect toolbar policy set"); 1267#ifdef USEQPE
1268#ifdef USEQPE 1268 case cesSingle:
1269 case cesSingle: 1269#endif
1270#endif 1270 case cesMenuTool:
1271 case cesMenuTool: 1271 viewBar = fileBar;
1272 viewBar = fileBar; 1272 break;
1273 break; 1273 }
1274 } 1274 }
1275 } 1275 return viewBar;
1276 return viewBar; 1276}
1277} 1277QToolBar* QTReaderApp::navbar()
1278QToolBar* QTReaderApp::navbar() 1278{
1279{ 1279 if (navBar == NULL)
1280 if (navBar == NULL) 1280 {
1281 { 1281 switch (m_tbpol)
1282 switch (m_tbpol) 1282 {
1283 { 1283 case cesMultiple:
1284 case cesMultiple: 1284 // qDebug("Creating new nav bar");
1285 // qDebug("Creating new nav bar"); 1285 navBar = new QToolBar("Navigation", this, m_tbposition);
1286 navBar = new QToolBar("Navigation", this, m_tbposition); 1286 break;
1287 break; 1287 default:
1288 default: 1288 qDebug("Incorrect toolbar policy set");
1289 qDebug("Incorrect toolbar policy set"); 1289#ifdef USEQPE
1290#ifdef USEQPE 1290 case cesSingle:
1291 case cesSingle: 1291#endif
1292#endif 1292 case cesMenuTool:
1293 case cesMenuTool: 1293 navBar = fileBar;
1294 navBar = fileBar; 1294 // qDebug("Setting navbar to filebar");
1295 // qDebug("Setting navbar to filebar"); 1295 break;
1296 break; 1296 }
1297 } 1297 }
1298 } 1298 return navBar;
1299 return navBar; 1299}
1300} 1300QToolBar* QTReaderApp::markbar()
1301QToolBar* QTReaderApp::markbar() 1301{
1302{ 1302 if (markBar == NULL)
1303 if (markBar == NULL) 1303 {
1304 { 1304 switch (m_tbpol)
1305 switch (m_tbpol) 1305 {
1306 { 1306 case cesMultiple:
1307 case cesMultiple: 1307 markBar = new QToolBar("Marks", this, m_tbposition);
1308 markBar = new QToolBar("Marks", this, m_tbposition); 1308 break;
1309 break; 1309 default:
1310 default: 1310 qDebug("Incorrect toolbar policy set");
1311 qDebug("Incorrect toolbar policy set"); 1311#ifdef USEQPE
1312#ifdef USEQPE 1312 case cesSingle:
1313 case cesSingle: 1313#endif
1314#endif 1314 case cesMenuTool:
1315 case cesMenuTool: 1315 markBar = fileBar;
1316 markBar = fileBar; 1316 break;
1317 break; 1317 }
1318 } 1318 }
1319 } 1319 return markBar;
1320 return markBar; 1320}
1321} 1321
1322 1322void QTReaderApp::addfilebar(Config* _config, const QString& key, QAction* a)
1323void QTReaderApp::addfilebar(Config* _config, const QString& key, QAction* a) 1323{
1324{ 1324 if (_config->readBoolEntry(key, false)) a->addTo( filebar() );
1325 if (_config->readBoolEntry(key, false)) a->addTo( filebar() ); 1325}
1326} 1326void QTReaderApp::addnavbar(Config* _config, const QString& key, QAction* a)
1327void QTReaderApp::addnavbar(Config* _config, const QString& key, QAction* a) 1327{
1328{ 1328 if (_config->readBoolEntry(key, false)) a->addTo( navbar() );
1329 if (_config->readBoolEntry(key, false)) a->addTo( navbar() ); 1329}
1330} 1330void QTReaderApp::addmarkbar(Config* _config, const QString& key, QAction* a)
1331void QTReaderApp::addmarkbar(Config* _config, const QString& key, QAction* a) 1331{
1332{ 1332 if (_config->readBoolEntry(key, false)) a->addTo( markbar() );
1333 if (_config->readBoolEntry(key, false)) a->addTo( markbar() ); 1333}
1334} 1334void QTReaderApp::addviewbar(Config* _config, const QString& key, QAction* a)
1335void QTReaderApp::addviewbar(Config* _config, const QString& key, QAction* a) 1335{
1336{ 1336 if (_config->readBoolEntry(key, false)) a->addTo( viewbar() );
1337 if (_config->readBoolEntry(key, false)) a->addTo( viewbar() ); 1337}
1338} 1338
1339 1339void QTReaderApp::suspend() { reader->suspend(); }
1340void QTReaderApp::suspend() { reader->suspend(); } 1340
1341 1341void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1342void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) 1342{
1343{ 1343#ifndef USEMSGS
1344#ifndef USEMSGS 1344 return;
1345 return; 1345#else
1346#else 1346 QString msg = QString::fromUtf8(_msg);
1347 QString msg = QString::fromUtf8(_msg); 1347
1348 1348 qDebug("Received:%s", (const char*)msg);
1349 qDebug("Received:%s", (const char*)msg); 1349 QDataStream stream( _data, IO_ReadOnly );
1350 QDataStream stream( _data, IO_ReadOnly ); 1350 if ( msg == "suspend()" )
1351 if ( msg == "suspend()" ) 1351 {
1352 { 1352 qDebug("Suspending");
1353 qDebug("Suspending"); 1353 suspend();
1354 suspend(); 1354 qDebug("Suspendedb");
1355 qDebug("Suspendedb"); 1355 }
1356 } 1356 return;
1357 return; 1357 /*
1358 /* 1358 QDataStream stream( _data, IO_ReadOnly );
1359 QDataStream stream( _data, IO_ReadOnly ); 1359 if ( msg == "info(QString)" )
1360 if ( msg == "info(QString)" ) 1360 {
1361 { 1361 QString info;
1362 QString info; 1362 stream >> info;
1363 stream >> info; 1363 QMessageBox::information(this, PROGNAME, info);
1364 QMessageBox::information(this, PROGNAME, info); 1364 }
1365 } 1365 else if ( msg == "Update(int)" )
1366 else if ( msg == "Update(int)" ) 1366 {
1367 { 1367 int info;
1368 int info; 1368 stream >> info;
1369 stream >> info; 1369 if (info)
1370 if (info) 1370 {
1371 { 1371 reader->bDoUpdates = true;
1372 reader->bDoUpdates = true; 1372 reader->refresh();
1373 reader->refresh(); 1373 }
1374 } 1374 else
1375 else 1375 {
1376 { 1376 reader->bDoUpdates = false;
1377 reader->bDoUpdates = false; 1377 }
1378 } 1378 }
1379 } 1379 else if ( msg == "warn(QString)" )
1380 else if ( msg == "warn(QString)" ) 1380 {
1381 { 1381 QString info;
1382 QString info; 1382 stream >> info;
1383 stream >> info; 1383 QMessageBox::warning(this, PROGNAME, info);
1384 QMessageBox::warning(this, PROGNAME, info); 1384 }
1385 } 1385 else if ( msg == "exit()" )
1386 else if ( msg == "exit()" ) 1386 {
1387 { 1387 m_dontSave = true;
1388 m_dontSave = true; 1388 close();
1389 close(); 1389 }
1390 } 1390 else if ( msg == "pageDown()" )
1391 else if ( msg == "pageDown()" ) 1391 {
1392 { 1392 reader->dopagedn();
1393 reader->dopagedn(); 1393 }
1394 } 1394 else if ( msg == "pageUp()" )
1395 else if ( msg == "pageUp()" ) 1395 {
1396 { 1396 reader->dopageup();
1397 reader->dopageup(); 1397 }
1398 } 1398 else if ( msg == "lineDown()" )
1399 else if ( msg == "lineDown()" ) 1399 {
1400 { 1400 reader->lineDown();
1401 reader->lineDown(); 1401 }
1402 } 1402 else if ( msg == "lineUp()" )
1403 else if ( msg == "lineUp()" ) 1403 {
1404 { 1404 reader->lineUp();
1405 reader->lineUp(); 1405 }
1406 } 1406 else if ( msg == "showText()" )
1407 else if ( msg == "showText()" ) 1407 {
1408 { 1408 showEditTools();
1409 showEditTools(); 1409 }
1410 } 1410 else if ( msg == "home()" )
1411 else if ( msg == "home()" ) 1411 {
1412 { 1412 reader->goHome();
1413 reader->goHome(); 1413 }
1414 } 1414 else if ( msg == "back()" )
1415 else if ( msg == "back()" ) 1415 {
1416 { 1416 reader->goBack();
1417 reader->goBack(); 1417 }
1418 } 1418 else if ( msg == "forward()" )
1419 else if ( msg == "forward()" ) 1419 {
1420 { 1420 reader->goForward();
1421 reader->goForward(); 1421 }
1422 } 1422 else if ( msg == "File/Open(QString)" )
1423 else if ( msg == "File/Open(QString)" ) 1423 {
1424 { 1424 QString info;
1425 QString info; 1425 stream >> info;
1426 stream >> info; 1426 openFile( info );
1427 openFile( info ); 1427 }
1428 } 1428 else if ( msg == "File/Info()" )
1429 else if ( msg == "File/Info()" ) 1429 {
1430 { 1430 showinfo();
1431 showinfo(); 1431 }
1432 } 1432 else if ( msg == "File/Action(QString)" )
1433 else if ( msg == "File/Action(QString)" ) 1433 {
1434 { 1434 QString info;
1435 QString info; 1435 stream >> info;
1436 stream >> info; 1436 m_spaceTarget = ActNameToInt(info);
1437 m_spaceTarget = ActNameToInt(info); 1437 }
1438 } 1438 else if ( msg == "Navigation/Scroll(int)" )
1439 else if ( msg == "Navigation/Scroll(int)" ) 1439 {
1440 { 1440 int info;
1441 int info; 1441 stream >> info;
1442 stream >> info; 1442 autoScroll(info);
1443 autoScroll(info); 1443 }
1444 } 1444
1445 1445 else if ( msg == "Navigation/GotoStart()" )
1446 else if ( msg == "Navigation/GotoStart()" ) 1446 {
1447 { 1447 gotoStart();
1448 gotoStart(); 1448 }
1449 } 1449 else if ( msg == "Navigation/GotoEnd()" )
1450 else if ( msg == "Navigation/GotoEnd()" ) 1450 {
1451 { 1451 gotoEnd();
1452 gotoEnd(); 1452 }
1453 } 1453 else if ( msg == "Navigation/Jump(int)" )
1454 else if ( msg == "Navigation/Jump(int)" ) 1454 {
1455 { 1455 int info;
1456 int info; 1456 stream >> info;
1457 stream >> info; 1457 reader->locate(info);
1458 reader->locate(info); 1458 }
1459 } 1459 else if ( msg == "Navigation/Page/LineScroll(int)" )
1460 else if ( msg == "Navigation/Page/LineScroll(int)" ) 1460 {
1461 { 1461 int info;
1462 int info; 1462 stream >> info;
1463 stream >> info; 1463 pagemode(info);
1464 pagemode(info); 1464 }
1465 } 1465 else if ( msg == "Navigation/SetOverlap(int)" )
1466 else if ( msg == "Navigation/SetOverlap(int)" ) 1466 {
1467 { 1467 int info;
1468 int info; 1468 stream >> info;
1469 stream >> info; 1469 reader->m_overlap = info;
1470 reader->m_overlap = info; 1470 }
1471 } 1471 else if ( msg == "Navigation/SetMargin(int)" )
1472 else if ( msg == "Navigation/SetMargin(int)" ) 1472 {
1473 { 1473 int info;
1474 int info; 1474 stream >> info;
1475 stream >> info; 1475 do_margin(info);
1476 do_margin(info); 1476 }
1477 } 1477 else if ( msg == "File/SetDictionary(QString)" )
1478 else if ( msg == "File/SetDictionary(QString)" ) 1478 {
1479 { 1479 QString info;
1480 QString info; 1480 stream >> info;
1481 stream >> info; 1481 do_settarget(info);
1482 do_settarget(info); 1482 }
1483 } 1483#ifdef _SCROLLPIPE
1484#ifdef _SCROLLPIPE 1484 else if ( msg == "File/SetScrollTarget(QString)" )
1485 else if ( msg == "File/SetScrollTarget(QString)" ) 1485 {
1486 { 1486 QString info;
1487 QString info; 1487 stream >> info;
1488 stream >> info; 1488 reader->m_pipetarget = info;
1489 reader->m_pipetarget = info; 1489 }
1490 } 1490#endif
1491#endif 1491 else if ( msg == "File/Two/OneTouch(int)" )
1492 else if ( msg == "File/Two/OneTouch(int)" ) 1492 {
1493 { 1493 int info;
1494 int info; 1494 stream >> info;
1495 stream >> info; 1495 setTwoTouch(info);
1496 setTwoTouch(info); 1496 }
1497 } 1497 else if ( msg == "Target/Annotation(int)" )
1498 else if ( msg == "Target/Annotation(int)" ) 1498 {
1499 { 1499 int info;
1500 int info; 1500 stream >> info;
1501 stream >> info; 1501 OnAnnotation(info);
1502 OnAnnotation(info); 1502 }
1503 } 1503 else if ( msg == "Target/Dictionary(int)" )
1504 else if ( msg == "Target/Dictionary(int)" ) 1504 {
1505 { 1505 int info;
1506 int info; 1506 stream >> info;
1507 stream >> info; 1507 OnDictionary(info);
1508 OnDictionary(info); 1508 }
1509 } 1509 else if ( msg == "Target/Clipboard(int)" )
1510 else if ( msg == "Target/Clipboard(int)" ) 1510 {
1511 { 1511 int info;
1512 int info; 1512 stream >> info;
1513 stream >> info; 1513 OnClipboard(info);
1514 OnClipboard(info); 1514 }
1515 } 1515 else if ( msg == "File/Find(QString)" )
1516 else if ( msg == "File/Find(QString)" ) 1516 {
1517 { 1517 QString info;
1518 QString info; 1518 stream >> info;
1519 stream >> info; 1519 QRegExp arg(info);
1520 QRegExp arg(info); 1520 size_t pos = reader->pagelocate();
1521 size_t pos = reader->pagelocate(); 1521 size_t start = pos;
1522 size_t start = pos; 1522 CDrawBuffer test(&(reader->m_fontControl));
1523 CDrawBuffer test(&(reader->m_fontControl)); 1523 reader->getline(&test);
1524 reader->getline(&test); 1524 while (arg.match(toQString(test.data())) == -1)
1525 while (arg.match(toQString(test.data())) == -1) 1525 {
1526 { 1526 pos = reader->locate();
1527 pos = reader->locate(); 1527 if (!reader->getline(&test))
1528 if (!reader->getline(&test)) 1528 {
1529 { 1529 QMessageBox::information(this, PROGNAME, QString("Can't find\n")+info);
1530 QMessageBox::information(this, PROGNAME, QString("Can't find\n")+info); 1530 pos = start;
1531 pos = start; 1531 break;
1532 break; 1532 }
1533 } 1533 }
1534 } 1534 reader->locate(pos);
1535 reader->locate(pos); 1535 }
1536 } 1536 else if ( msg == "File/Fullscreen(int)" )
1537 else if ( msg == "File/Fullscreen(int)" ) 1537 {
1538 { 1538 int info;
1539 int info; 1539 stream >> info;
1540 stream >> info; 1540 setfullscreen(info);
1541 setfullscreen(info); 1541 }
1542 } 1542 else if ( msg == "File/Continuous(int)" )
1543 else if ( msg == "File/Continuous(int)" ) 1543 {
1544 { 1544 int info;
1545 int info; 1545 stream >> info;
1546 stream >> info; 1546 setcontinuous(info);
1547 setcontinuous(info); 1547 }
1548 } 1548 else if ( msg == "Markup(QString)" )
1549 else if ( msg == "Markup(QString)" ) 1549 {
1550 { 1550 QString info;
1551 QString info; 1551 stream >> info;
1552 stream >> info; 1552 if (info == "Auto")
1553 if (info == "Auto") 1553 {
1554 { 1554 autofmt(true);
1555 autofmt(true); 1555 }
1556 } 1556 if (info == "None")
1557 if (info == "None") 1557 {
1558 { 1558 autofmt(false);
1559 autofmt(false); 1559 textfmt(false);
1560 textfmt(false); 1560 striphtml(false);
1561 striphtml(false); 1561 peanut(false);
1562 peanut(false); 1562 }
1563 } 1563 if (info == "Text")
1564 if (info == "Text") 1564 {
1565 { 1565 textfmt(true);
1566 textfmt(true); 1566 }
1567 } 1567 if (info == "HTML")
1568 if (info == "HTML") 1568 {
1569 { 1569 striphtml(true);
1570 striphtml(true); 1570 }
1571 } 1571 if (info == "Peanut/PML")
1572 if (info == "Peanut/PML") 1572 {
1573 { 1573 peanut(true);
1574 peanut(true); 1574 }
1575 } 1575 }
1576 } 1576 else if ( msg == "Layout/StripCR(int)" )
1577 else if ( msg == "Layout/StripCR(int)" ) 1577 {
1578 { 1578 int info;
1579 int info; 1579 stream >> info;
1580 stream >> info; 1580 stripcr(info);
1581 stripcr(info); 1581 }
1582 } 1582 else if ( msg == "Layout/Dehyphen(int)" )
1583 else if ( msg == "Layout/Dehyphen(int)" ) 1583 {
1584 { 1584 int info;
1585 int info; 1585 stream >> info;
1586 stream >> info; 1586 dehyphen(info);
1587 dehyphen(info); 1587 }
1588 } 1588 else if ( msg == "Layout/Depluck(int)" )
1589 else if ( msg == "Layout/Depluck(int)" ) 1589 {
1590 { 1590 int info;
1591 int info; 1591 stream >> info;
1592 stream >> info; 1592 depluck(info);
1593 depluck(info); 1593 }
1594 } 1594 else if ( msg == "Layout/Dejpluck(int)" )
1595 else if ( msg == "Layout/Dejpluck(int)" ) 1595 {
1596 { 1596 int info;
1597 int info; 1597 stream >> info;
1598 stream >> info; 1598 dejpluck(info);
1599 dejpluck(info); 1599 }
1600 } 1600 else if ( msg == "Layout/SingleSpace(int)" )
1601 else if ( msg == "Layout/SingleSpace(int)" ) 1601 {
1602 { 1602 int info;
1603 int info; 1603 stream >> info;
1604 stream >> info; 1604 onespace(info);
1605 onespace(info); 1605 }
1606 } 1606 else if ( msg == "Layout/Repalm(int)" )
1607 else if ( msg == "Layout/Repalm(int)" ) 1607 {
1608 { 1608 int info;
1609 int info; 1609 stream >> info;
1610 stream >> info; 1610 repalm(info);
1611 repalm(info); 1611 }
1612 } 1612 else if ( msg == "Layout/Unindent(int)" )
1613 else if ( msg == "Layout/Unindent(int)" ) 1613 {
1614 { 1614 int info;
1615 int info; 1615 stream >> info;
1616 stream >> info; 1616 unindent(info);
1617 unindent(info); 1617 }
1618 } 1618 else if ( msg == "Layout/Re-paragraph(int)" )
1619 else if ( msg == "Layout/Re-paragraph(int)" ) 1619 {
1620 { 1620 int info;
1621 int info; 1621 stream >> info;
1622 stream >> info; 1622 repara(info);
1623 repara(info); 1623 }
1624 } 1624 else if ( msg == "Layout/DoubleSpace(int)" )
1625 else if ( msg == "Layout/DoubleSpace(int)" ) 1625 {
1626 { 1626 int info;
1627 int info; 1627 stream >> info;
1628 stream >> info; 1628 dblspce(info);
1629 dblspce(info); 1629 }
1630 } 1630 else if ( msg == "Layout/Indent(int)" )
1631 else if ( msg == "Layout/Indent(int)" ) 1631 {
1632 { 1632 int info;
1633 int info; 1633 stream >> info;
1634 stream >> info; 1634 reader->bindenter = info;
1635 reader->bindenter = info; 1635 reader->setfilter(reader->getfilter());
1636 reader->setfilter(reader->getfilter()); 1636 }
1637 } 1637 else if ( msg == "Layout/Remap(int)" )
1638 else if ( msg == "Layout/Remap(int)" ) 1638 {
1639 { 1639 int info;
1640 int info; 1640 stream >> info;
1641 stream >> info; 1641 remap(info);
1642 remap(info); 1642 }
1643 } 1643 else if ( msg == "Layout/Embolden(int)" )
1644 else if ( msg == "Layout/Embolden(int)" ) 1644 {
1645 { 1645 int info;
1646 int info; 1646 stream >> info;
1647 stream >> info; 1647 embolden(info);
1648 embolden(info); 1648 }
1649 } 1649 else if ( msg == "Format/Ideogram/Word(int)" )
1650 else if ( msg == "Format/Ideogram/Word(int)" ) 1650 {
1651 { 1651 int info;
1652 int info; 1652 stream >> info;
1653 stream >> info; 1653 monospace(info);
1654 monospace(info); 1654 }
1655 } 1655 else if ( msg == "Format/SetWidth(int)" )
1656 else if ( msg == "Format/SetWidth(int)" ) 1656 {
1657 { 1657 int info;
1658 int info; 1658 stream >> info;
1659 stream >> info; 1659 reader->m_charpc = info;
1660 reader->m_charpc = info; 1660 reader->setfont();
1661 reader->setfont(); 1661 reader->refresh();
1662 reader->refresh(); 1662 }
1663 } 1663 else if ( msg == "Format/SetFont(QString,int)" )
1664 else if ( msg == "Format/SetFont(QString,int)" ) 1664 {
1665 { 1665 QString fontname;
1666 QString fontname; 1666 int size;
1667 int size; 1667 stream >> fontname;
1668 stream >> fontname; 1668 stream >> size;
1669 stream >> size; 1669 setfontHelper(fontname, size);
1670 setfontHelper(fontname, size); 1670 }
1671 } 1671 else if ( msg == "Marks/Autogen(QString)" )
1672 else if ( msg == "Marks/Autogen(QString)" ) 1672 {
1673 { 1673 QString info;
1674 QString info; 1674 stream >> info;
1675 stream >> info; 1675 do_autogen(info);
1676 do_autogen(info); 1676 }
1677 } 1677 else if ( msg == "File/StartBlock()" )
1678 else if ( msg == "File/StartBlock()" ) 1678 {
1679 { 1679 editMark();
1680 editMark(); 1680 }
1681 } 1681 else if ( msg == "File/CopyBlock()" )
1682 else if ( msg == "File/CopyBlock()" ) 1682 {
1683 { 1683 editCopy();
1684 editCopy(); 1684 }
1685 } 1685 */
1686 */ 1686#endif
1687#endif 1687}
1688} 1688
1689 1689ActionTypes QTReaderApp::ActNameToInt(const QString& _enc)
1690ActionTypes QTReaderApp::ActNameToInt(const QString& _enc) 1690{
1691{ 1691 for (int i = 0; i < MAX_ACTIONS; i++)
1692 for (int i = 0; i < MAX_ACTIONS; i++) 1692 {
1693 { 1693 if (m_buttonAction[i]->text() == _enc) return (ActionTypes)i;
1694 if (m_buttonAction[i]->text() == _enc) return (ActionTypes)i; 1694 }
1695 } 1695 return cesAutoScroll;
1696 return cesAutoScroll; 1696}
1697} 1697
1698 1698void QTReaderApp::setinverted(bool sfs)
1699void QTReaderApp::setinverted(bool sfs) 1699{
1700{ 1700 reader->setInverse(sfs);
1701 reader->setInverse(sfs); 1701 reader->setfilter(reader->getfilter());
1702 reader->setfilter(reader->getfilter()); 1702 reader->refresh();
1703 reader->refresh(); 1703}
1704} 1704
1705 1705void QTReaderApp::setrotated(bool sfs)
1706void QTReaderApp::setrotated(bool sfs) 1706{
1707{ 1707 reader->setrotated(sfs);
1708 reader->setrotated(sfs); 1708 if (sfs)
1709 if (sfs) 1709 {
1710 { 1710 m_layout->setDirection( (m_qtscroll == 2) ? QBoxLayout::BottomToTop : QBoxLayout::TopToBottom );
1711 m_layout->setDirection( (m_qtscroll == 2) ? QBoxLayout::BottomToTop : QBoxLayout::TopToBottom ); 1711 if (m_scrollbar != NULL)
1712 if (m_scrollbar != NULL) 1712 {
1713 { 1713 scrollbar->disconnect();
1714 scrollbar->disconnect(); 1714 m_scrollbar->setOrientation(Qt::Horizontal);
1715 m_scrollbar->setOrientation(Qt::Horizontal); 1715 connect(scrollbar, SIGNAL(nextLine()), reader, SLOT(lineUp()) );
1716 connect(scrollbar, SIGNAL(nextLine()), reader, SLOT(lineUp()) ); 1716 connect(scrollbar, SIGNAL(prevLine()), reader, SLOT(lineDown()) );
1717 connect(scrollbar, SIGNAL(prevLine()), reader, SLOT(lineDown()) ); 1717 connect(scrollbar, SIGNAL(nextPage()), reader, SLOT(dopageup()) );
1718 connect(scrollbar, SIGNAL(nextPage()), reader, SLOT(dopageup()) ); 1718 connect(scrollbar, SIGNAL(prevPage()), reader, SLOT(dopagedn()) );
1719 connect(scrollbar, SIGNAL(prevPage()), reader, SLOT(dopagedn()) ); 1719 connect(scrollbar, SIGNAL(sliderMoved(int)), this, SLOT(actionscroll(int)) );
1720 connect(scrollbar, SIGNAL(sliderMoved(int)), this, SLOT(actionscroll(int)) ); 1720 }
1721 } 1721 //reader->repaint(0, reader->m_left_border, reader->width(), reader->height()-2*reader->m_border);
1722 //reader->repaint(0, reader->m_left_border, reader->width(), reader->height()-2*reader->m_border); 1722 reader->repaint();
1723 reader->repaint(); 1723 }
1724 } 1724 else
1725 else 1725 {
1726 { 1726 m_layout->setDirection( (m_qtscroll == 2) ? QBoxLayout::RightToLeft : QBoxLayout::LeftToRight );
1727 m_layout->setDirection( (m_qtscroll == 2) ? QBoxLayout::RightToLeft : QBoxLayout::LeftToRight ); 1727 if (m_scrollbar != NULL)
1728 if (m_scrollbar != NULL) 1728 {
1729 { 1729 scrollbar->disconnect();
1730 scrollbar->disconnect(); 1730 m_scrollbar->setOrientation(Qt::Vertical);
1731 m_scrollbar->setOrientation(Qt::Vertical); 1731 connect(scrollbar, SIGNAL(nextLine()), reader, SLOT(lineDown()) );
1732 connect(scrollbar, SIGNAL(nextLine()), reader, SLOT(lineDown()) ); 1732 connect(scrollbar, SIGNAL(prevLine()), reader, SLOT(lineUp()) );
1733 connect(scrollbar, SIGNAL(prevLine()), reader, SLOT(lineUp()) ); 1733 connect(scrollbar, SIGNAL(nextPage()), reader, SLOT(dopagedn()) );
1734 connect(scrollbar, SIGNAL(nextPage()), reader, SLOT(dopagedn()) ); 1734 connect(scrollbar, SIGNAL(prevPage()), reader, SLOT(dopageup()) );
1735 connect(scrollbar, SIGNAL(prevPage()), reader, SLOT(dopageup()) ); 1735 connect(scrollbar, SIGNAL(sliderMoved(int)), this, SLOT(actionscroll(int)) );
1736 connect(scrollbar, SIGNAL(sliderMoved(int)), this, SLOT(actionscroll(int)) ); 1736 }
1737 } 1737 //reader->repaint(reader->m_border, 0, reader->width()-2*reader->m_border, reader->height());
1738 //reader->repaint(reader->m_border, 0, reader->width()-2*reader->m_border, reader->height()); 1738 reader->repaint();
1739 reader->repaint(); 1739 }
1740 } 1740 // reader->update();
1741 // reader->update(); 1741}
1742} 1742
1743 1743void QTReaderApp::setgrab(bool sfs)
1744void QTReaderApp::setgrab(bool sfs) 1744{
1745{ 1745#ifdef USEQPE
1746#ifdef USEQPE 1746 m_grabkeyboard = sfs;
1747 m_grabkeyboard = sfs; 1747 if (m_grabkeyboard)
1748 if (m_grabkeyboard) 1748 {
1749 { 1749 ((QPEApplication*)qApp)->grabKeyboard();
1750 ((QPEApplication*)qApp)->grabKeyboard(); 1750 }
1751 } 1751 else
1752 else 1752 {
1753 { 1753 ((QPEApplication*)qApp)->ungrabKeyboard();
1754 ((QPEApplication*)qApp)->ungrabKeyboard(); 1754 }
1755 } 1755#endif
1756#endif 1756}
1757} 1757
1758 1758void QTReaderApp::setfullscreen(bool sfs)
1759void QTReaderApp::setfullscreen(bool sfs) 1759{
1760{ 1760 reader->bDoUpdates = false;
1761 reader->bDoUpdates = false; 1761 m_fullscreen = sfs;
1762 m_fullscreen = sfs; 1762 showEditTools();
1763 showEditTools(); 1763// qApp->processEvents();
1764// qApp->processEvents(); 1764 reader->bDoUpdates = true;
1765 reader->bDoUpdates = true; 1765 reader->update();
1766 reader->update(); 1766}
1767} 1767/*
1768/* 1768void QTReaderApp::buttonActionSelected(QAction* _a)
1769void QTReaderApp::buttonActionSelected(QAction* _a) 1769{
1770{ 1770//// qDebug("es:%x : %s (%u)", _a, (const char *)(_a->text()), ActNameToInt(_a->text()));
1771//// qDebug("es:%x : %s (%u)", _a, (const char *)(_a->text()), ActNameToInt(_a->text())); 1771 m_spaceTarget = ActNameToInt(_a->text());
1772 m_spaceTarget = ActNameToInt(_a->text()); 1772}
1773} 1773*/
1774*/ 1774QTReaderApp::~QTReaderApp()
1775QTReaderApp::~QTReaderApp() 1775{
1776{ 1776}
1777} 1777
1778 1778void QTReaderApp::autoScroll(bool _b)
1779void QTReaderApp::autoScroll(bool _b) 1779{
1780{ 1780 reader->setautoscroll(_b);
1781 reader->setautoscroll(_b); 1781 setScrollState(reader->m_autoScroll);
1782 setScrollState(reader->m_autoScroll); 1782}
1783} 1783
1784 1784void QTReaderApp::zoomin()
1785void QTReaderApp::zoomin() 1785{
1786{ 1786 reader->zoomin();
1787 reader->zoomin(); 1787 QFont f(reader->m_fontname, reader->m_fontControl.getsize(0));
1788 QFont f(reader->m_fontname, reader->m_fontControl.getsize(0)); 1788 m_prog->setFont( f );
1789 m_prog->setFont( f ); 1789}
1790} 1790
1791 1791void QTReaderApp::zoomout()
1792void QTReaderApp::zoomout() 1792{
1793{ 1793 reader->zoomout();
1794 reader->zoomout(); 1794 QFont f(reader->m_fontname, reader->m_fontControl.getsize(0));
1795 QFont f(reader->m_fontname, reader->m_fontControl.getsize(0)); 1795 m_prog->setFont( f );
1796 m_prog->setFont( f ); 1796}
1797} 1797
1798 1798void QTReaderApp::clearBkmkList()
1799void QTReaderApp::clearBkmkList() 1799{
1800{ 1800 delete pBkmklist;
1801 delete pBkmklist; 1801 reader->pBkmklist = pBkmklist = NULL;
1802 reader->pBkmklist = pBkmklist = NULL; 1802 m_fBkmksChanged = false;
1803 m_fBkmksChanged = false; 1803 reader->refresh(true);
1804 reader->refresh(true); 1804}
1805} 1805
1806 1806void QTReaderApp::fileClose()
1807void QTReaderApp::fileClose() 1807{
1808{ 1808 CCloseDialog* cd = new CCloseDialog(reader->m_string, false, this);
1809 CCloseDialog* cd = new CCloseDialog(reader->m_string, false, this); 1809 if (cd->exec())
1810 if (cd->exec()) 1810 {
1811 { 1811 if (pOpenlist != NULL)
1812 if (pOpenlist != NULL) 1812 {
1813 { 1813 int ind = 0;
1814 int ind = 0; 1814 Bkmk* p = (*pOpenlist)[ind];
1815 Bkmk* p = (*pOpenlist)[ind]; 1815 while (p != NULL && toQString(CFiledata(p->anno()).name()) != reader->m_lastfile)
1816 while (p != NULL && toQString(CFiledata(p->anno()).name()) != reader->m_lastfile) 1816 {
1817 { 1817 p = (*pOpenlist)[++ind];
1818 p = (*pOpenlist)[++ind]; 1818 }
1819 } 1819 if (p != NULL) pOpenlist->erase(ind);
1820 if (p != NULL) pOpenlist->erase(ind); 1820 if (cd->delFile())
1821 if (cd->delFile()) 1821 {
1822 { 1822 unlink((const char*)reader->m_lastfile);
1823 unlink((const char*)reader->m_lastfile); 1823 }
1824 } 1824 if (cd->delMarks())
1825 if (cd->delMarks()) 1825 {
1826 { 1826#ifndef USEQPE
1827#ifndef USEQPE 1827 QDir d = QDir::home(); // "/"
1828 QDir d = QDir::home(); // "/" 1828 d.cd(APPDIR);
1829 d.cd(APPDIR); 1829 d.remove(reader->m_string);
1830 d.remove(reader->m_string); 1830#else /* USEQPE */
1831#else /* USEQPE */ 1831 unlink((const char *)Global::applicationFileName(APPDIR,reader->m_string));
1832 unlink((const char *)Global::applicationFileName(APPDIR,reader->m_string)); 1832#endif /* USEQPE */
1833#endif /* USEQPE */ 1833 }
1834 } 1834 if (cd->delConfig())
1835 if (cd->delConfig()) 1835 {
1836 { 1836#ifndef USEQPE
1837#ifndef USEQPE 1837 QDir d = QDir::home(); // "/"
1838 QDir d = QDir::home(); // "/" 1838 d.cd(APPDIR "/configs");
1839 d.cd(APPDIR "/configs"); 1839 d.remove(reader->m_string);
1840 d.remove(reader->m_string); 1840#else /* USEQPE */
1841#else /* USEQPE */ 1841 unlink((const char *)Global::applicationFileName(APPDIR "/configs",reader->m_string));
1842 unlink((const char *)Global::applicationFileName(APPDIR "/configs",reader->m_string)); 1842#endif /* USEQPE */
1843#endif /* USEQPE */ 1843 }
1844 } 1844 }
1845 } 1845
1846 1846 fileOpen2();
1847 fileOpen2(); 1847 }
1848 } 1848 delete cd;
1849 delete cd; 1849}
1850} 1850
1851 1851void QTReaderApp::updatefileinfo()
1852void QTReaderApp::updatefileinfo() 1852{
1853{ 1853 if (reader->m_string.isEmpty()) return;
1854 if (reader->m_string.isEmpty()) return; 1854 if (reader->m_lastfile.isEmpty()) return;
1855 if (reader->m_lastfile.isEmpty()) return; 1855 tchar* nm = fromQString(reader->m_string);
1856 tchar* nm = fromQString(reader->m_string); 1856 tchar* fl = fromQString(reader->m_lastfile);
1857 tchar* fl = fromQString(reader->m_lastfile); 1857// qDebug("Lastfile:%x", fl);
1858// qDebug("Lastfile:%x", fl); 1858 bool notadded = true;
1859 bool notadded = true; 1859 if (pOpenlist == NULL) pOpenlist = new CList<Bkmk>;
1860 if (pOpenlist == NULL) pOpenlist = new CList<Bkmk>; 1860 else
1861 else 1861 {
1862 { 1862 for (CList<Bkmk>::iterator iter = pOpenlist->begin(); iter != pOpenlist->end(); iter++)
1863 for (CList<Bkmk>::iterator iter = pOpenlist->begin(); iter != pOpenlist->end(); iter++) 1863 {
1864 { 1864 if (ustrcmp(CFiledata(iter->anno()).name(), fl) == 0)
1865 if (ustrcmp(CFiledata(iter->anno()).name(), fl) == 0) 1865 {
1866 { 1866 iter->value(reader->pagelocate());
1867 iter->value(reader->pagelocate()); 1867 unsigned short dlen;
1868 unsigned short dlen; 1868 unsigned char* data;
1869 unsigned char* data; 1869 CFiledata fd(iter->anno());
1870 CFiledata fd(iter->anno()); 1870 reader->setSaveData(data, dlen, fd.content(), fd.length());
1871 reader->setSaveData(data, dlen, fd.content(), fd.length()); 1871 // qDebug("Filedata(1):%u, %u", fd.length(), dlen);
1872 // qDebug("Filedata(1):%u, %u", fd.length(), dlen); 1872 // getstate(data, dlen);
1873 // getstate(data, dlen); 1873 iter->setAnno(data, dlen);
1874 iter->setAnno(data, dlen); 1874 notadded = false;
1875 notadded = false; 1875 delete [] data;
1876 delete [] data; 1876 break;
1877 break; 1877 }
1878 } 1878 }
1879 } 1879 }
1880 } 1880// qDebug("Added?:%x", notadded);
1881// qDebug("Added?:%x", notadded); 1881 if (notadded)
1882 if (notadded) 1882 {
1883 { 1883 struct stat fnstat;
1884 struct stat fnstat; 1884 stat((const char *)reader->m_lastfile, &fnstat);
1885 stat((const char *)reader->m_lastfile, &fnstat); 1885 CFiledata fd(fnstat.st_mtime, fl);
1886 CFiledata fd(fnstat.st_mtime, fl); 1886 unsigned short dlen;
1887 unsigned short dlen; 1887 unsigned char* data;
1888 unsigned char* data; 1888 reader->setSaveData(data, dlen, fd.content(), fd.length());
1889 reader->setSaveData(data, dlen, fd.content(), fd.length()); 1889 pOpenlist->push_front(Bkmk(nm, data, dlen, reader->pagelocate()));
1890 pOpenlist->push_front(Bkmk(nm, data, dlen, reader->pagelocate())); 1890 //qDebug("Filedata(2):%u, %u", fd.length(), dlen);
1891 //qDebug("Filedata(2):%u, %u", fd.length(), dlen); 1891 delete [] data;
1892 delete [] data; 1892 }
1893 } 1893 delete [] nm;
1894 delete [] nm; 1894 delete [] fl;
1895 delete [] fl; 1895}
1896} 1896
1897 1897void QTReaderApp::fileOpen()
1898void QTReaderApp::fileOpen() 1898{
1899{ 1899/*
1900/* 1900 menu->hide();
1901 menu->hide(); 1901 fileBar->hide();
1902 fileBar->hide(); 1902 if (regVisible) regBar->hide();
1903 if (regVisible) regBar->hide(); 1903 if (searchVisible) searchBar->hide();
1904 if (searchVisible) searchBar->hide(); 1904*/
1905*/ 1905// qDebug("fileOpen");
1906// qDebug("fileOpen"); 1906// if (!reader->m_lastfile.isEmpty())
1907// if (!reader->m_lastfile.isEmpty()) 1907 updatefileinfo();
1908 updatefileinfo(); 1908 fileOpen2();
1909 fileOpen2(); 1909}
1910} 1910
1911 1911void QTReaderApp::fileOpen2()
1912void QTReaderApp::fileOpen2() 1912{
1913{ 1913 if (pBkmklist != NULL)
1914 if (pBkmklist != NULL) 1914 {
1915 { 1915 if (m_fBkmksChanged)
1916 if (m_fBkmksChanged) 1916 {
1917 { 1917 if (QMessageBox::warning(this, PROGNAME, "Save bookmarks?", "Save", "Don't bother") == 0)
1918 if (QMessageBox::warning(this, PROGNAME, "Save bookmarks?", "Save", "Don't bother") == 0) 1918 savebkmks();
1919 savebkmks(); 1919 }
1920 } 1920 delete pBkmklist;
1921 delete pBkmklist; 1921 reader->pBkmklist = pBkmklist = NULL;
1922 reader->pBkmklist = pBkmklist = NULL; 1922 m_fBkmksChanged = false;
1923 m_fBkmksChanged = false; 1923 }
1924 } 1924 reader->disableAutoscroll();
1925 reader->disableAutoscroll(); 1925/*
1926/* 1926 editorStack->raiseWidget( fileSelector );
1927 editorStack->raiseWidget( fileSelector ); 1927 fileSelector->reread();
1928 fileSelector->reread(); 1928*/
1929*/ 1929 bool usebrowser = true;
1930 bool usebrowser = true; 1930 if (pOpenlist != NULL)
1931 if (pOpenlist != NULL) 1931 {
1932 { 1932 m_nBkmkAction = cOpenFile;
1933 m_nBkmkAction = cOpenFile; 1933 if (listbkmk(pOpenlist, "Browse")) usebrowser = false;
1934 if (listbkmk(pOpenlist, "Browse")) usebrowser = false; 1934 }
1935 } 1935 if (usebrowser)
1936 if (usebrowser) 1936 {
1937 { 1937 QString fn = usefilebrowser();
1938 QString fn = usefilebrowser(); 1938 //qApp->processEvents();
1939 //qApp->processEvents(); 1939 if (!fn.isEmpty() && QFileInfo(fn).isFile())
1940 if (!fn.isEmpty() && QFileInfo(fn).isFile()) 1940 {
1941 { 1941 openFile(fn);
1942 openFile(fn); 1942 }
1943 } 1943 reader->setFocus();
1944 reader->setFocus(); 1944 }
1945 } 1945// reader->refresh();
1946// reader->refresh(); 1946// qDebug("HEIGHT:%d", reader->m_lastheight);
1947// qDebug("HEIGHT:%d", reader->m_lastheight); 1947}
1948} 1948
1949 1949QString QTReaderApp::usefilebrowser()
1950QString QTReaderApp::usefilebrowser() 1950{
1951{ 1951#ifndef USEQPE
1952#ifndef USEQPE 1952 QString s( QFileDialog::getOpenFileName( reader->m_lastfile, QString::null, this ) );
1953 QString s( QFileDialog::getOpenFileName( reader->m_lastfile, QString::null, this ) ); 1953 return s;
1954 return s; 1954#else
1955#else 1955 QString fn;
1956 QString fn; 1956#ifdef OPIE
1957#ifdef OPIE 1957 QMap<QString, QStringList> mimeTypes;
1958 QMap<QString, QStringList> mimeTypes; 1958 QStringList etypes;
1959 QStringList etypes; 1959 etypes << "etext/*";
1960 etypes << "etext/*"; 1960 mimeTypes.insert( tr("eText"), etypes );
1961 mimeTypes.insert( tr("eText"), etypes ); 1961 QStringList types;
1962 QStringList types; 1962 types << "text/*";
1963 types << "text/*"; 1963 mimeTypes.insert( tr("Text"), types );
1964 mimeTypes.insert( tr("Text"), types ); 1964 mimeTypes.insert( tr("All"), "*/*" );
1965 mimeTypes.insert( tr("All"), "*/*" ); 1965 fn = OFileDialog::getOpenFileName(OFileSelector::EXTENDED_ALL, QFileInfo(reader->m_lastfile).dirPath(true), QString::null, mimeTypes, 0, "OpieReader");
1966 fn = OFileDialog::getOpenFileName(OFileSelector::EXTENDED_ALL, QFileInfo(reader->m_lastfile).dirPath(true), QString::null, mimeTypes, 0, "OpieReader"); 1966#else
1967#else 1967 fileBrowser* fb = new fileBrowser(false, this,"OpieReader",!m_bFloatingDialog,
1968 fileBrowser* fb = new fileBrowser(false, this,"OpieReader",!m_bFloatingDialog, 1968 0,
1969 0, 1969 // WStyle_Customize | WStyle_NoBorderEx,
1970 // WStyle_Customize | WStyle_NoBorderEx, 1970 "*", QFileInfo(reader->m_lastfile).dirPath(true));
1971 "*", QFileInfo(reader->m_lastfile).dirPath(true)); 1971
1972 1972
1973 1973 if (fb->exec())
1974 if (fb->exec()) 1974 {
1975 { 1975 fn = fb->getCurrentFile();
1976 fn = fb->getCurrentFile(); 1976 }
1977 } 1977// qDebug("Selected %s", (const char*)fn);
1978// qDebug("Selected %s", (const char*)fn); 1978 delete fb;
1979 delete fb; 1979#endif
1980#endif 1980 showEditTools();
1981 showEditTools(); 1981 return fn;
1982 return fn; 1982#endif
1983#endif 1983}
1984} 1984
1985 1985void QTReaderApp::showgraphic(QImage& pm)
1986void QTReaderApp::showgraphic(QImage& pm) 1986{
1987{ 1987 m_graphicwin->setImage(pm);
1988 m_graphicwin->setImage(pm); 1988 editorStack->raiseWidget( m_graphicwin );
1989 editorStack->raiseWidget( m_graphicwin ); 1989 hidetoolbars();
1990 hidetoolbars(); 1990 m_graphicwin->setFocus();
1991 m_graphicwin->setFocus(); 1991}
1992} 1992
1993 1993void QTReaderApp::showbuttonprefs()
1994void QTReaderApp::showbuttonprefs() 1994{
1995{ 1995 editorStack->raiseWidget( m_buttonprefs );
1996 editorStack->raiseWidget( m_buttonprefs ); 1996 hidetoolbars();
1997 hidetoolbars(); 1997 m_buttonprefs->setFocus();
1998 m_buttonprefs->setFocus(); 1998 m_kmapchanged = true;
1999 m_kmapchanged = true; 1999}
2000} 2000
2001 2001void QTReaderApp::showprefs()
2002void QTReaderApp::showprefs() 2002{
2003{ 2003 CPrefs* prefwin = new CPrefs(reader->width(), !m_bFloatingDialog, this);
2004 CPrefs* prefwin = new CPrefs(reader->width(), !m_bFloatingDialog, this); 2004
2005 2005 // prefwin->Debounce(m_debounce);
2006 // prefwin->Debounce(m_debounce); 2006 prefwin->bgtype(m_bgtype);
2007 prefwin->bgtype(m_bgtype); 2007 prefwin->repalm(reader->brepalm);
2008 prefwin->repalm(reader->brepalm); 2008 prefwin->kern(reader->bkern);
2009 prefwin->kern(reader->bkern); 2009 prefwin->hyphenate(reader->hyphenate);
2010 prefwin->hyphenate(reader->hyphenate); 2010 // prefwin->customhyphen(reader->buffdoc.getCustomHyphen());
2011 // prefwin->customhyphen(reader->buffdoc.getCustomHyphen()); 2011 prefwin->scrolltype(reader->m_scrolltype);
2012 prefwin->scrolltype(reader->m_scrolltype); 2012 prefwin->scrollstep(reader->m_scrollstep);
2013 prefwin->scrollstep(reader->m_scrollstep); 2013 prefwin->scrollcolor(m_scrollcolor);
2014 prefwin->scrollcolor(m_scrollcolor); 2014 prefwin->minibarcol(m_scrollbarcolor);
2015 prefwin->minibarcol(m_scrollbarcolor); 2015 prefwin->foreground(m_foreground);
2016 prefwin->foreground(m_foreground); 2016 prefwin->background(m_background);
2017 prefwin->background(m_background); 2017 prefwin->twotouch(m_twoTouch);
2018 prefwin->twotouch(m_twoTouch); 2018 prefwin->propfontchange(m_propogatefontchange);
2019 prefwin->propfontchange(m_propogatefontchange); 2019 prefwin->StripCR(reader->bstripcr);
2020 prefwin->StripCR(reader->bstripcr); 2020 prefwin->Dehyphen(reader->bdehyphen);
2021 prefwin->Dehyphen(reader->bdehyphen); 2021 prefwin->SingleSpace(reader->bonespace);
2022 prefwin->SingleSpace(reader->bonespace); 2022 prefwin->Unindent(reader->bunindent);
2023 prefwin->Unindent(reader->bunindent); 2023 prefwin->Reparagraph(reader->brepara);
2024 prefwin->Reparagraph(reader->brepara); 2024 prefwin->DoubleSpace(reader->bdblspce);
2025 prefwin->DoubleSpace(reader->bdblspce); 2025 prefwin->Remap(reader->bremap);
2026 prefwin->Remap(reader->bremap); 2026 prefwin->Embolden(reader->bmakebold);
2027 prefwin->Embolden(reader->bmakebold); 2027 prefwin->FullJustify(reader->bfulljust);
2028 prefwin->FullJustify(reader->bfulljust); 2028 // prefwin->Inverse(reader->bInverse);
2029 // prefwin->Inverse(reader->bInverse); 2029 // prefwin->Negative(reader->bNegative);
2030 // prefwin->Negative(reader->bNegative); 2030 prefwin->FixGraphics(reader->m_fontControl.FixGraphics());
2031 prefwin->FixGraphics(reader->m_fontControl.FixGraphics()); 2031 prefwin->ParaLead(reader->getextraspace());
2032 prefwin->ParaLead(reader->getextraspace()); 2032 prefwin->LineLead(reader->getlead());
2033 prefwin->LineLead(reader->getlead()); 2033 prefwin->TopMargin(reader->m_abstopmargin);
2034 prefwin->TopMargin(reader->m_abstopmargin); 2034 prefwin->BottomMargin(reader->m_absbottommargin);
2035 prefwin->BottomMargin(reader->m_absbottommargin); 2035 prefwin->LeftMargin(reader->m_absleft_border);
2036 prefwin->LeftMargin(reader->m_absleft_border); 2036 prefwin->RightMargin(reader->m_absright_border);
2037 prefwin->RightMargin(reader->m_absright_border); 2037 prefwin->Indent(reader->bindenter);
2038 prefwin->Indent(reader->bindenter); 2038 if (reader->bautofmt)
2039 if (reader->bautofmt) 2039 {
2040 { 2040 prefwin->Markup(0);
2041 prefwin->Markup(0); 2041 }
2042 } 2042 else if (reader->btextfmt)
2043 else if (reader->btextfmt) 2043 {
2044 { 2044 prefwin->Markup(2);
2045 prefwin->Markup(2); 2045 }
2046 } 2046 else if (reader->bstriphtml)
2047 else if (reader->bstriphtml) 2047 {
2048 { 2048 prefwin->Markup(3);
2049 prefwin->Markup(3); 2049 }
2050 } 2050 else if (reader->bpeanut)
2051 else if (reader->bpeanut) 2051 {
2052 { 2052 prefwin->Markup(4);
2053 prefwin->Markup(4); 2053 }
2054 } 2054 else
2055 else 2055 {
2056 { 2056 prefwin->Markup(1);
2057 prefwin->Markup(1); 2057 }
2058 } 2058 prefwin->Depluck(reader->bdepluck);
2059 prefwin->Depluck(reader->bdepluck); 2059 prefwin->Dejpluck(reader->bdejpluck);
2060 prefwin->Dejpluck(reader->bdejpluck); 2060 prefwin->Continuous(reader->m_continuousDocument);
2061 prefwin->Continuous(reader->m_continuousDocument); 2061
2062 2062 prefwin->dictApplication(m_targetapp);
2063 prefwin->dictApplication(m_targetapp); 2063 prefwin->dictMessage(m_targetmsg);
2064 prefwin->dictMessage(m_targetmsg); 2064
2065 2065 /*
2066 /* 2066 prefwin->leftScroll(m_leftScroll);
2067 prefwin->leftScroll(m_leftScroll); 2067 prefwin->rightScroll(m_rightScroll);
2068 prefwin->rightScroll(m_rightScroll); 2068 prefwin->upScroll(m_upScroll);
2069 prefwin->upScroll(m_upScroll); 2069 prefwin->downScroll(m_downScroll);
2070 prefwin->downScroll(m_downScroll); 2070 */
2071 */ 2071
2072 2072 prefwin->miscannotation(m_doAnnotation);
2073 prefwin->miscannotation(m_doAnnotation); 2073 prefwin->miscdictionary(m_doDictionary);
2074 prefwin->miscdictionary(m_doDictionary); 2074 prefwin->miscclipboard(m_doClipboard);
2075 prefwin->miscclipboard(m_doClipboard); 2075
2076 2076 prefwin->SwapMouse(reader->m_swapmouse);
2077 prefwin->SwapMouse(reader->m_swapmouse); 2077
2078 2078 prefwin->Font(reader->m_fontname);
2079 prefwin->Font(reader->m_fontname); 2079
2080 2080 prefwin->gfxsize(reader->getBaseSize());
2081 prefwin->gfxsize(reader->getBaseSize()); 2081
2082 2082 prefwin->pageoverlap(reader->m_overlap);
2083 prefwin->pageoverlap(reader->m_overlap); 2083
2084 2084 prefwin->ideogram(reader->m_bMonoSpaced);
2085 prefwin->ideogram(reader->m_bMonoSpaced); 2085
2086 2086 prefwin->encoding(reader->m_encd);
2087 prefwin->encoding(reader->m_encd); 2087
2088 2088 prefwin->ideogramwidth(reader->m_charpc);
2089 prefwin->ideogramwidth(reader->m_charpc); 2089
2090 2090 if (prefwin->exec())
2091 if (prefwin->exec()) 2091 {
2092 { 2092 // m_debounce = prefwin->Debounce();
2093 // m_debounce = prefwin->Debounce(); 2093 reader->brepalm = prefwin->repalm();
2094 reader->brepalm = prefwin->repalm(); 2094 reader->bkern = prefwin->kern();
2095 reader->bkern = prefwin->kern(); 2095 reader->hyphenate = prefwin->hyphenate();
2096 reader->hyphenate = prefwin->hyphenate(); 2096 // reader->buffdoc.setCustomHyphen(prefwin->customhyphen());
2097 // reader->buffdoc.setCustomHyphen(prefwin->customhyphen()); 2097 reader->m_scrolltype = prefwin->scrolltype();
2098 reader->m_scrolltype = prefwin->scrolltype(); 2098 reader->m_scrollstep = prefwin->scrollstep();
2099 reader->m_scrollstep = prefwin->scrollstep(); 2099 m_scrollcolor = prefwin->scrollcolor();
2100 m_scrollcolor = prefwin->scrollcolor(); 2100 setscrollcolour();
2101 setscrollcolour(); 2101 m_scrollbarcolor = prefwin->minibarcol();
2102 m_scrollbarcolor = prefwin->minibarcol(); 2102 setscrollbarcolour();
2103 setscrollbarcolour(); 2103 m_foreground = prefwin->foreground();
2104 m_foreground = prefwin->foreground(); 2104 reader->setForeground(getcolour(m_foreground));
2105 reader->setForeground(getcolour(m_foreground)); 2105 m_background = prefwin->background();
2106 m_background = prefwin->background(); 2106 reader->setBackground(getcolour(m_background));
2107 reader->setBackground(getcolour(m_background)); 2107 m_twoTouch = prefwin->twotouch();
2108 m_twoTouch = prefwin->twotouch(); 2108 reader->setTwoTouch(m_twoTouch);
2109 reader->setTwoTouch(m_twoTouch); 2109 m_touch_action->setOn(m_twoTouch);
2110 m_touch_action->setOn(m_twoTouch); 2110
2111 2111 reader->bstripcr = prefwin->StripCR();
2112 reader->bstripcr = prefwin->StripCR(); 2112 reader->bdehyphen = prefwin->Dehyphen();
2113 reader->bdehyphen = prefwin->Dehyphen(); 2113 reader->bonespace = prefwin->SingleSpace();
2114 reader->bonespace = prefwin->SingleSpace(); 2114 reader->bunindent = prefwin->Unindent();
2115 reader->bunindent = prefwin->Unindent(); 2115 reader->brepara = prefwin->Reparagraph();
2116 reader->brepara = prefwin->Reparagraph(); 2116 reader->bdblspce = prefwin->DoubleSpace();
2117 reader->bdblspce = prefwin->DoubleSpace(); 2117 reader->bremap = prefwin->Remap();
2118 reader->bremap = prefwin->Remap(); 2118 reader->bmakebold = prefwin->Embolden();
2119 reader->bmakebold = prefwin->Embolden(); 2119 reader->bfulljust = prefwin->FullJustify();
2120 reader->bfulljust = prefwin->FullJustify(); 2120 //if (reader->bInverse != prefwin->Inverse()) reader->setInverse(prefwin->Inverse());
2121 //if (reader->bInverse != prefwin->Inverse()) reader->setInverse(prefwin->Inverse()); 2121 //if (reader->bNegative != prefwin->Negative()) reader->setNegative();
2122 //if (reader->bNegative != prefwin->Negative()) reader->setNegative(); 2122 reader->m_fontControl.FixGraphics(prefwin->FixGraphics());
2123 reader->m_fontControl.FixGraphics(prefwin->FixGraphics()); 2123
2124 2124 reader->setextraspace(prefwin->ParaLead());
2125 reader->setextraspace(prefwin->ParaLead()); 2125 reader->setlead(prefwin->LineLead());
2126 reader->setlead(prefwin->LineLead()); 2126 reader->m_abstopmargin = prefwin->TopMargin();
2127 reader->m_abstopmargin = prefwin->TopMargin(); 2127 reader->m_absbottommargin = prefwin->BottomMargin();
2128 reader->m_absbottommargin = prefwin->BottomMargin(); 2128 reader->m_absleft_border = prefwin->LeftMargin();
2129 reader->m_absleft_border = prefwin->LeftMargin(); 2129 reader->m_absright_border = prefwin->RightMargin();
2130 reader->m_absright_border = prefwin->RightMargin(); 2130 reader->bindenter = prefwin->Indent();
2131 reader->bindenter = prefwin->Indent(); 2131 reader->bautofmt = reader->btextfmt = reader->bstriphtml = reader->bpeanut = false;
2132 reader->bautofmt = reader->btextfmt = reader->bstriphtml = reader->bpeanut = false; 2132 switch (prefwin->Markup())
2133 switch (prefwin->Markup()) 2133 {
2134 { 2134 case 0:
2135 case 0: 2135 reader->bautofmt = true;
2136 reader->bautofmt = true; 2136 break;
2137 break; 2137 case 1:
2138 case 1: 2138 break;
2139 break; 2139 case 2:
2140 case 2: 2140 reader->btextfmt = true;
2141 reader->btextfmt = true; 2141 break;
2142 break; 2142 case 3:
2143 case 3: 2143 reader->bstriphtml = true;
2144 reader->bstriphtml = true; 2144 break;
2145 break; 2145 case 4:
2146 case 4: 2146 reader->bpeanut = true;
2147 reader->bpeanut = true; 2147 break;
2148 break; 2148 default:
2149 default: 2149 qDebug("Format out of range");
2150 qDebug("Format out of range"); 2150 }
2151 } 2151 reader->bdepluck = prefwin->Depluck();
2152 reader->bdepluck = prefwin->Depluck(); 2152 reader->bdejpluck = prefwin->Dejpluck();
2153 reader->bdejpluck = prefwin->Dejpluck(); 2153 reader->setContinuous(prefwin->Continuous());
2154 reader->setContinuous(prefwin->Continuous()); 2154
2155 2155 /*
2156 /* 2156 m_leftScroll = prefwin->leftScroll();
2157 m_leftScroll = prefwin->leftScroll(); 2157 m_rightScroll = prefwin->rightScroll();
2158 m_rightScroll = prefwin->rightScroll(); 2158 m_upScroll = prefwin->upScroll();
2159 m_upScroll = prefwin->upScroll(); 2159 m_downScroll = prefwin->downScroll();
2160 m_downScroll = prefwin->downScroll(); 2160 */
2161 */ 2161 m_targetapp = prefwin->dictApplication();
2162 m_targetapp = prefwin->dictApplication(); 2162 m_targetmsg = prefwin->dictMessage();
2163 m_targetmsg = prefwin->dictMessage(); 2163
2164 2164 m_doAnnotation = prefwin->miscannotation();
2165 m_doAnnotation = prefwin->miscannotation(); 2165 m_doDictionary = prefwin->miscdictionary();
2166 m_doDictionary = prefwin->miscdictionary(); 2166 m_doClipboard = prefwin->miscclipboard();
2167 m_doClipboard = prefwin->miscclipboard(); 2167 reader->m_swapmouse = prefwin->SwapMouse();
2168 reader->m_swapmouse = prefwin->SwapMouse(); 2168 reader->setBaseSize(prefwin->gfxsize());
2169 reader->setBaseSize(prefwin->gfxsize()); 2169 reader->m_overlap = prefwin->pageoverlap();
2170 reader->m_overlap = prefwin->pageoverlap(); 2170 reader->m_bMonoSpaced = prefwin->ideogram();
2171 reader->m_bMonoSpaced = prefwin->ideogram(); 2171 m_setmono_action->setOn(reader->m_bMonoSpaced);
2172 m_setmono_action->setOn(reader->m_bMonoSpaced); 2172 reader->m_encd = prefwin->encoding();
2173 reader->m_encd = prefwin->encoding(); 2173 reader->m_charpc = prefwin->ideogramwidth();
2174 reader->m_charpc = prefwin->ideogramwidth(); 2174
2175 2175 if (
2176 if ( 2176 reader->m_fontname != prefwin->Font()
2177 reader->m_fontname != prefwin->Font() 2177 ||
2178 || 2178 m_propogatefontchange != prefwin->propfontchange())
2179 m_propogatefontchange != prefwin->propfontchange()) 2179 {
2180 { 2180 m_propogatefontchange = prefwin->propfontchange();
2181 m_propogatefontchange = prefwin->propfontchange(); 2181 setfontHelper(prefwin->Font());
2182 setfontHelper(prefwin->Font()); 2182 }
2183 } 2183 if (m_bgtype != (bground)prefwin->bgtype())
2184 if (m_bgtype != (bground)prefwin->bgtype()) 2184 {
2185 { 2185 m_bgtype = (bground)prefwin->bgtype();
2186 m_bgtype = (bground)prefwin->bgtype(); 2186 setBackgroundBitmap();
2187 setBackgroundBitmap(); 2187 }
2188 } 2188 delete prefwin;
2189 delete prefwin; 2189 reader->setfilter(reader->getfilter());
2190 reader->setfilter(reader->getfilter()); 2190 reader->refresh();
2191 reader->refresh(); 2191 }
2192 } 2192 else
2193 else 2193 {
2194 { 2194 delete prefwin;
2195 delete prefwin; 2195 }
2196 } 2196}
2197} 2197
2198 2198void QTReaderApp::showtoolbarprefs()
2199void QTReaderApp::showtoolbarprefs() 2199{
2200{ 2200#ifdef USEQPE
2201#ifdef USEQPE 2201 CBarPrefs* prefwin = new CBarPrefs(APPDIR, !m_bFloatingDialog, this);
2202 CBarPrefs* prefwin = new CBarPrefs(APPDIR, !m_bFloatingDialog, this); 2202#else
2203#else 2203 QFileInfo fi;
2204 QFileInfo fi; 2204 QDir d = QDir::home(); // "/"
2205 QDir d = QDir::home(); // "/" 2205 if ( !d.cd(APPDIR) )
2206 if ( !d.cd(APPDIR) ) 2206 { // "/tmp"
2207 { // "/tmp" 2207 qWarning( "Cannot find the \"~/%s\" directory", APPDIR );
2208 qWarning( "Cannot find the \"~/%s\" directory", APPDIR ); 2208 d = QDir::home();
2209 d = QDir::home(); 2209 d.mkdir(APPDIR);
2210 d.mkdir(APPDIR); 2210 d.cd(APPDIR);
2211 d.cd(APPDIR); 2211 }
2212 } 2212 fi.setFile(d, INIFILE);
2213 fi.setFile(d, INIFILE); 2213 CBarPrefs* prefwin = new CBarPrefs(fi.absFilePath(), !m_bFloatingDialog, this);
2214 CBarPrefs* prefwin = new CBarPrefs(fi.absFilePath(), !m_bFloatingDialog, this); 2214#endif
2215#endif 2215 prefwin->tbpolicy(m_tbpolsave);
2216 prefwin->tbpolicy(m_tbpolsave); 2216 prefwin->tbposition(m_tbposition-2);
2217 prefwin->tbposition(m_tbposition-2); 2217 prefwin->tbmovable(m_tbmovesave);
2218 prefwin->tbmovable(m_tbmovesave); 2218 prefwin->floating(m_bFloatingDialog);
2219 prefwin->floating(m_bFloatingDialog); 2219 prefwin->qtscroll(m_qtscroll);
2220 prefwin->qtscroll(m_qtscroll); 2220 prefwin->localscroll(m_localscroll);
2221 prefwin->localscroll(m_localscroll); 2221 if (prefwin->exec())
2222 if (prefwin->exec()) 2222 {
2223 { 2223 m_bFloatingDialog = prefwin->floating();
2224 m_bFloatingDialog = prefwin->floating(); 2224 if (
2225 if ( 2225 m_tbpolsave != (ToolbarPolicy)prefwin->tbpolicy()
2226 m_tbpolsave != (ToolbarPolicy)prefwin->tbpolicy() 2226 ||
2227 || 2227 m_tbposition != (ToolBarDock)(prefwin->tbposition()+2)
2228 m_tbposition != (ToolBarDock)(prefwin->tbposition()+2) 2228 ||
2229 || 2229 m_tbmovesave != prefwin->tbmovable()
2230 m_tbmovesave != prefwin->tbmovable() 2230 ||
2231 || 2231 m_qtscroll != prefwin->qtscroll()
2232 m_qtscroll != prefwin->qtscroll() 2232 // ||
2233 // || 2233 // m_localscrollbar != prefwin->scrollonleft()
2234 // m_localscrollbar != prefwin->scrollonleft() 2234 )
2235 ) 2235 {
2236 { 2236 QMessageBox::warning(this, PROGNAME, "Some changes won't take effect\nuntil the next time the\napplication is started");
2237 QMessageBox::warning(this, PROGNAME, "Some changes won't take effect\nuntil the next time the\napplication is started"); 2237 }
2238 } 2238 m_tbpolsave = (ToolbarPolicy)prefwin->tbpolicy();
2239 m_tbpolsave = (ToolbarPolicy)prefwin->tbpolicy(); 2239 m_tbposition = (ToolBarDock)(prefwin->tbposition()+2);
2240 m_tbposition = (ToolBarDock)(prefwin->tbposition()+2); 2240 m_tbmovesave = prefwin->tbmovable();
2241 m_tbmovesave = prefwin->tbmovable(); 2241 reader->m_scrollpos = m_localscroll = prefwin->localscroll();
2242 reader->m_scrollpos = m_localscroll = prefwin->localscroll(); 2242 if (m_qtscroll != prefwin->qtscroll())
2243 if (m_qtscroll != prefwin->qtscroll()) 2243 {
2244 { 2244 m_qtscroll = prefwin->qtscroll();
2245 m_qtscroll = prefwin->qtscroll(); 2245 setrotated(reader->m_rotated);
2246 setrotated(reader->m_rotated); 2246 }
2247 } 2247 if (m_scrollbar == NULL || m_scrollbar->isHidden())
2248 if (m_scrollbar == NULL || m_scrollbar->isHidden()) 2248 {
2249 { 2249 reader->m_scrollpos = m_localscroll;
2250 reader->m_scrollpos = m_localscroll; 2250 }
2251 } 2251 else
2252 else 2252 {
2253 { 2253 reader->m_scrollpos = (m_qtscroll == 0) ? m_localscroll : 0;
2254 reader->m_scrollpos = (m_qtscroll == 0) ? m_localscroll : 0; 2254 }
2255 } 2255 bool isChanged = prefwin->isChanged();
2256 bool isChanged = prefwin->isChanged(); 2256 delete prefwin;
2257 delete prefwin; 2257#ifdef USEQPE
2258#ifdef USEQPE 2258 Config config( APPDIR );
2259 Config config( APPDIR ); 2259#else
2260#else 2260 QFileInfo fi;
2261 QFileInfo fi; 2261 QDir d = QDir::home(); // "/"
2262 QDir d = QDir::home(); // "/" 2262 if ( !d.cd(APPDIR) )
2263 if ( !d.cd(APPDIR) ) 2263 { // "/tmp"
2264 { // "/tmp" 2264 qWarning( "Cannot find the \"~/%s\" directory", APPDIR );
2265 qWarning( "Cannot find the \"~/%s\" directory", APPDIR ); 2265 d = QDir::home();
2266 d = QDir::home(); 2266 d.mkdir(APPDIR);
2267 d.mkdir(APPDIR); 2267 d.cd(APPDIR);
2268 d.cd(APPDIR); 2268 }
2269 } 2269 fi.setFile(d, INIFILE);
2270 fi.setFile(d, INIFILE); 2270 Config config( fi.absFilePath() );
2271 Config config( fi.absFilePath() ); 2271#endif
2272#endif 2272 if (isChanged) addtoolbars(&config);
2273 if (isChanged) addtoolbars(&config); 2273 }
2274 } 2274 else
2275 else 2275 {
2276 { 2276 delete prefwin;
2277 delete prefwin; 2277 }
2278 } 2278}
2279} 2279
2280 2280void QTReaderApp::showinfo()
2281void QTReaderApp::showinfo() 2281{
2282{ 2282 unsigned long ds, fs, ts, pl, dl;
2283 unsigned long ds, fs, ts, pl, dl; 2283 if (reader->empty())
2284 if (reader->empty()) 2284 {
2285 { 2285 QMessageBox::information(this, PROGNAME, "No file loaded", 1);
2286 QMessageBox::information(this, PROGNAME, "No file loaded", 1); 2286 }
2287 } 2287 else
2288 else 2288 {
2289 { 2289 reader->sizes(fs,ts);
2290 reader->sizes(fs,ts); 2290 ds = reader->buffdoc.endSection() - reader->buffdoc.startSection();
2291 ds = reader->buffdoc.endSection() - reader->buffdoc.startSection(); 2291 pl = reader->pagelocate();
2292 pl = reader->pagelocate(); 2292 dl = pl - reader->buffdoc.startSection();
2293 dl = pl - reader->buffdoc.startSection(); 2293 m_infoWin->setFileSize(fs);
2294 m_infoWin->setFileSize(fs); 2294 m_infoWin->setTextSize(ts);
2295 m_infoWin->setTextSize(ts); 2295 m_infoWin->setRatio(100-(100*fs + (ts >> 1))/ts);
2296 m_infoWin->setRatio(100-(100*fs + (ts >> 1))/ts); 2296 m_infoWin->setLocation(pl);
2297 m_infoWin->setLocation(pl); 2297 m_infoWin->setRead((100*pl + (ts >> 1))/ts);
2298 m_infoWin->setRead((100*pl + (ts >> 1))/ts); 2298 m_infoWin->setDocSize(ds);
2299 m_infoWin->setDocSize(ds); 2299 m_infoWin->setDocLocation(dl);
2300 m_infoWin->setDocLocation(dl); 2300 m_infoWin->setDocRead((100*dl + (ds >> 1))/ds);
2301 m_infoWin->setDocRead((100*dl + (ds >> 1))/ds); 2301 m_infoWin->setZoom(reader->m_fontControl.currentsize()*10);
2302 m_infoWin->setZoom(reader->m_fontControl.currentsize()*10); 2302 m_infoWin->setAbout(QString("\nApplication (c) Tim Wentford\n")+reader->about());
2303 m_infoWin->setAbout(QString("\nApplication (c) Tim Wentford\n")+reader->about()); 2303 editorStack->raiseWidget( m_infoWin );
2304 editorStack->raiseWidget( m_infoWin ); 2304 hidetoolbars();
2305 hidetoolbars(); 2305 m_infoWin->setFocus();
2306 m_infoWin->setFocus(); 2306 }
2307 } 2307}
2308} 2308
2309 2309void QTReaderApp::addAnno(const QString& name, const QString& text, size_t posn, size_t posn2)
2310void QTReaderApp::addAnno(const QString& name, const QString& text, size_t posn, size_t posn2) 2310{
2311{ 2311 if (pBkmklist == NULL) reader->pBkmklist = pBkmklist = new CList<Bkmk>;
2312 if (pBkmklist == NULL) reader->pBkmklist = pBkmklist = new CList<Bkmk>; 2312#ifdef _UNICODE
2313#ifdef _UNICODE 2313 CBuffer buff(name.length()+1);
2314 CBuffer buff(name.length()+1); 2314 int i;
2315 int i; 2315 for (i = 0; i < name.length(); i++)
2316 for (i = 0; i < name.length(); i++) 2316 {
2317 { 2317 buff[i] = name[i].unicode();
2318 buff[i] = name[i].unicode(); 2318 }
2319 } 2319 buff[i] = 0;
2320 buff[i] = 0; 2320 CBuffer buff2(text.length()+1);
2321 CBuffer buff2(text.length()+1); 2321 for (i = 0; i < text.length(); i++)
2322 for (i = 0; i < text.length(); i++) 2322 {
2323 { 2323 buff2[i] = text[i].unicode();
2324 buff2[i] = text[i].unicode(); 2324 }
2325 } 2325 buff2[i] = 0;
2326 buff2[i] = 0; 2326 Bkmk b(buff.data(), buff2.data(), posn, posn2);
2327 Bkmk b(buff.data(), buff2.data(), posn, posn2); 2327 QColor c = m_annoWin->getColor();
2328 QColor c = m_annoWin->getColor(); 2328 int red,green,blue;
2329 int red,green,blue; 2329 c.rgb(&red, &green, &blue);
2330 c.rgb(&red, &green, &blue); 2330 b.red(red);
2331 b.red(red); 2331 b.green(green);
2332 b.green(green); 2332 b.blue(blue);
2333 b.blue(blue); 2333 pBkmklist->push_front(b);
2334 pBkmklist->push_front(b); 2334#else
2335#else 2335 pBkmklist->push_front(Bkmk((const tchar*)text,posn));
2336 pBkmklist->push_front(Bkmk((const tchar*)text,posn)); 2336#endif
2337#endif 2337 m_fBkmksChanged = true;
2338 m_fBkmksChanged = true; 2338 pBkmklist->sort();
2339 pBkmklist->sort(); 2339}
2340} 2340
2341 2341void QTReaderApp::addAnno(const QString& name, const QString& text)
2342void QTReaderApp::addAnno(const QString& name, const QString& text) 2342{
2343{ 2343 if (m_annoIsEditing)
2344 if (m_annoIsEditing) 2344 {
2345 { 2345 if (name.isEmpty())
2346 if (name.isEmpty()) 2346 {
2347 { 2347 QMessageBox::information(this, PROGNAME, "Need a name for the bookmark\nPlease try again", 1);
2348 QMessageBox::information(this, PROGNAME, "Need a name for the bookmark\nPlease try again", 1); 2348 }
2349 } 2349 else
2350 else 2350 {
2351 { 2351 addAnno(name, text, m_annoWin->getPosn(), m_annoWin->getPosn2());
2352 addAnno(name, text, m_annoWin->getPosn(), m_annoWin->getPosn2()); 2352 }
2353 } 2353 showEditTools();
2354 showEditTools(); 2354 }
2355 } 2355 else
2356 else 2356 {
2357 { 2357 if (m_annoWin->edited())
2358 if (m_annoWin->edited()) 2358 {
2359 { 2359 CBuffer buff(text.length()+1);
2360 CBuffer buff(text.length()+1); 2360 int i;
2361 int i; 2361 for (i = 0; i < text.length(); i++)
2362 for (i = 0; i < text.length(); i++) 2362 {
2363 { 2363 buff[i] = text[i].unicode();
2364 buff[i] = text[i].unicode(); 2364 }
2365 } 2365 buff[i] = 0;
2366 buff[i] = 0; 2366 m_fBkmksChanged = true;
2367 m_fBkmksChanged = true; 2367 m_anno->setAnno(buff.data());
2368 m_anno->setAnno(buff.data()); 2368 }
2369 } 2369 QColor c = m_annoWin->getColor();
2370 QColor c = m_annoWin->getColor(); 2370 int red,green,blue;
2371 int red,green,blue; 2371 c.rgb(&red, &green, &blue);
2372 c.rgb(&red, &green, &blue); 2372 m_anno->red(red);
2373 m_anno->red(red); 2373 m_anno->green(green);
2374 m_anno->green(green); 2374 m_anno->blue(blue);
2375 m_anno->blue(blue); 2375 bool found = findNextBookmark(m_anno->value()+1);
2376 bool found = findNextBookmark(m_anno->value()+1); 2376 if (found)
2377 if (found) 2377 {
2378 { 2378 m_annoWin->setName(toQString(m_anno->name()));
2379 m_annoWin->setName(toQString(m_anno->name())); 2379 m_annoWin->setAnno(toQString(m_anno->anno()));
2380 m_annoWin->setAnno(toQString(m_anno->anno())); 2380 m_annoWin->setColor(QColor(m_anno->red(), m_anno->green(), m_anno->blue()));
2381 m_annoWin->setColor(QColor(m_anno->red(), m_anno->green(), m_anno->blue())); 2381 }
2382 } 2382 else
2383 else 2383 {
2384 { 2384 showEditTools();
2385 showEditTools(); 2385 }
2386 } 2386 }
2387 } 2387}
2388} 2388
2389 2389bool QTReaderApp::findNextBookmark(size_t start)
2390bool QTReaderApp::findNextBookmark(size_t start) 2390{
2391{ 2391 bool found = false;
2392 bool found = false; 2392 for (CList<Bkmk>::iterator iter = pBkmklist->begin(); iter != pBkmklist->end(); iter++)
2393 for (CList<Bkmk>::iterator iter = pBkmklist->begin(); iter != pBkmklist->end(); iter++) 2393 {
2394 { 2394 if (iter->value() >= start)
2395 if (iter->value() >= start) 2395 {
2396 { 2396 if (iter->value() < reader->locate())
2397 if (iter->value() < reader->locate()) 2397 {
2398 { 2398 found = true;
2399 found = true; 2399 m_anno = iter.pContent();
2400 m_anno = iter.pContent(); 2400 }
2401 } 2401 break;
2402 break; 2402 }
2403 } 2403 }
2404 } 2404 return found;
2405 return found; 2405}
2406} 2406
2407 2407void QTReaderApp::addanno()
2408void QTReaderApp::addanno() 2408{
2409{ 2409 if (reader->empty())
2410 if (reader->empty()) 2410 {
2411 { 2411 QMessageBox::information(this, PROGNAME, "No file loaded", 1);
2412 QMessageBox::information(this, PROGNAME, "No file loaded", 1); 2412 }
2413 } 2413 else
2414 else 2414 {
2415 { 2415 m_annoWin->setName("");
2416 m_annoWin->setName(""); 2416 m_annoWin->setAnno("");
2417 m_annoWin->setAnno(""); 2417 m_annoWin->setPosn(reader->pagelocate());
2418 m_annoWin->setPosn(reader->pagelocate()); 2418 m_annoIsEditing = true;
2419 m_annoIsEditing = true; 2419 editorStack->raiseWidget( m_annoWin );
2420 editorStack->raiseWidget( m_annoWin ); 2420 hidetoolbars();
2421 hidetoolbars(); 2421#ifdef USEQPE
2422#ifdef USEQPE 2422 Global::showInputMethod();
2423 Global::showInputMethod(); 2423#endif
2424#endif 2424 m_annoWin->setFocus();
2425 m_annoWin->setFocus(); 2425 }
2426 } 2426}
2427} 2427
2428 2428void QTReaderApp::infoClose()
2429void QTReaderApp::infoClose() 2429{
2430{ 2430 m_debounce = m_buttonprefs->Debounce();
2431 m_debounce = m_buttonprefs->Debounce(); 2431 if (m_kmapchanged)
2432 if (m_kmapchanged) 2432 {
2433 { 2433 m_kmapchanged = false;
2434 m_kmapchanged = false; 2434#ifndef USEQPE
2435#ifndef USEQPE 2435 QDir d = QDir::home(); // "/"
2436 QDir d = QDir::home(); // "/" 2436 d.cd(APPDIR);
2437 d.cd(APPDIR); 2437 QFileInfo fi(d, ".keymap");
2438 QFileInfo fi(d, ".keymap"); 2438 FILE* f = fopen((const char *)fi.absFilePath(), "w");
2439 FILE* f = fopen((const char *)fi.absFilePath(), "w"); 2439#else /* USEQPE */
2440#else /* USEQPE */ 2440 FILE* f = fopen((const char *)Global::applicationFileName(APPDIR,".keymap"), "w");
2441 FILE* f = fopen((const char *)Global::applicationFileName(APPDIR,".keymap"), "w"); 2441#endif /* USEQPE */
2442#endif /* USEQPE */ 2442 if (f != NULL)
2443 if (f != NULL) 2443 {
2444 { 2444 uint cnt = KEYMAPVERSION;
2445 uint cnt = KEYMAPVERSION; 2445 fwrite(&cnt, sizeof(cnt), 1, f);
2446 fwrite(&cnt, sizeof(cnt), 1, f); 2446 cnt = kmap.count();
2447 cnt = kmap.count(); 2447 fwrite(&cnt, sizeof(cnt), 1, f);
2448 fwrite(&cnt, sizeof(cnt), 1, f); 2448 for (QMap<orKey,int>::Iterator i = kmap.begin(); i != kmap.end(); i++)
2449 for (QMap<orKey,int>::Iterator i = kmap.begin(); i != kmap.end(); i++) 2449 {
2450 { 2450 orKey key = i.key();
2451 orKey key = i.key(); 2451 int data = i.data();
2452 int data = i.data(); 2452 fwrite(&key, sizeof(key), 1, f);
2453 fwrite(&key, sizeof(key), 1, f); 2453 fwrite(&data, sizeof(data), 1, f);
2454 fwrite(&data, sizeof(data), 1, f); 2454 qDebug("Saved %s as %u", (const char*)key.text(), data);
2455 qDebug("Saved %s as %u", (const char*)key.text(), data); 2455 }
2456 } 2456 fclose(f);
2457 fclose(f); 2457 }
2458 } 2458 }
2459 } 2459 showEditTools();
2460 showEditTools(); 2460}
2461} 2461
2462 2462/*
2463/* 2463void QTReaderApp::fileRevert()
2464void QTReaderApp::fileRevert() 2464{
2465{ 2465 clear();
2466 clear(); 2466 fileOpen();
2467 fileOpen(); 2467}
2468} 2468
2469 2469void QTReaderApp::editCut()
2470void QTReaderApp::editCut() 2470{
2471{ 2471#ifndef QT_NO_CLIPBOARD
2472#ifndef QT_NO_CLIPBOARD 2472 editor->cut();
2473 editor->cut(); 2473#endif
2474#endif 2474}
2475} 2475*/
2476*/ 2476void QTReaderApp::editMark()
2477void QTReaderApp::editMark() 2477{
2478{ 2478 m_savedpos = reader->pagelocate();
2479 m_savedpos = reader->pagelocate(); 2479}
2480} 2480
2481 2481void QTReaderApp::editCopy()
2482void QTReaderApp::editCopy() 2482{
2483{ 2483 QClipboard* cb = QApplication::clipboard();
2484 QClipboard* cb = QApplication::clipboard(); 2484 QString text;
2485 QString text; 2485 int ch;
2486 int ch; 2486 unsigned long currentpos = reader->pagelocate();
2487 unsigned long currentpos = reader->pagelocate(); 2487 unsigned long endpos = reader->locate();
2488 unsigned long endpos = reader->locate(); 2488 if (m_savedpos == 0xffffffff)
2489 if (m_savedpos == 0xffffffff) 2489 {
2490 { 2490 m_savedpos = currentpos;
2491 m_savedpos = currentpos; 2491 }
2492 } 2492 reader->jumpto(m_savedpos);
2493 reader->jumpto(m_savedpos); 2493 while (reader->explocate() < endpos && (ch = reader->getch()) != UEOF)
2494 while (reader->explocate() < endpos && (ch = reader->getch()) != UEOF) 2494 {
2495 { 2495 text += ch;
2496 text += ch; 2496 }
2497 } 2497 cb->setText(text);
2498 cb->setText(text); 2498 reader->locate(currentpos);
2499 reader->locate(currentpos); 2499 m_savedpos = 0xffffffff;
2500 m_savedpos = 0xffffffff; 2500}
2501} 2501
2502 2502void QTReaderApp::gotoStart()
2503void QTReaderApp::gotoStart() 2503{
2504{ 2504 reader->locate(reader->buffdoc.startSection());
2505 reader->locate(reader->buffdoc.startSection()); 2505}
2506} 2506
2507 2507void QTReaderApp::gotoEnd()
2508void QTReaderApp::gotoEnd() 2508{
2509{ 2509 reader->dopageup(reader->buffdoc.endSection());
2510 reader->dopageup(reader->buffdoc.endSection()); 2510}
2511} 2511
2512 2512void QTReaderApp::pageup()
2513void QTReaderApp::pageup() 2513{
2514{ 2514 reader->NavUp();
2515 reader->NavUp(); 2515}
2516} 2516
2517 2517void QTReaderApp::pagedn()
2518void QTReaderApp::pagedn() 2518{
2519{ 2519 reader->NavDown();
2520 reader->NavDown(); 2520}
2521} 2521
2522 2522void QTReaderApp::pagemode(bool _b)
2523void QTReaderApp::pagemode(bool _b) 2523{
2524{ 2524 reader->setpagemode(_b);
2525 reader->setpagemode(_b); 2525}
2526} 2526
2527 2527/*
2528/* 2528void QTReaderApp::setspacing()
2529void QTReaderApp::setspacing() 2529{
2530{ 2530 m_nRegAction = cMonoSpace;
2531 m_nRegAction = cMonoSpace; 2531 char lcn[20];
2532 char lcn[20]; 2532 sprintf(lcn, "%lu", reader->m_charpc);
2533 sprintf(lcn, "%lu", reader->m_charpc); 2533 regEdit->setText(lcn);
2534 regEdit->setText(lcn); 2534 do_regedit();
2535 do_regedit(); 2535}
2536} 2536*/
2537*/ 2537void QTReaderApp::settarget()
2538void QTReaderApp::settarget() 2538{
2539{ 2539 m_nRegAction = cSetTarget;
2540 m_nRegAction = cSetTarget; 2540 QString text = ((m_targetapp.isEmpty()) ? QString("") : m_targetapp)
2541 QString text = ((m_targetapp.isEmpty()) ? QString("") : m_targetapp) 2541 + "/"
2542 + "/" 2542 + ((m_targetmsg.isEmpty()) ? QString("") : m_targetmsg);
2543 + ((m_targetmsg.isEmpty()) ? QString("") : m_targetmsg); 2543 regEdit->setText(text);
2544 regEdit->setText(text); 2544 do_regedit();
2545 do_regedit(); 2545}
2546} 2546
2547 2547/*
2548/* 2548void QTReaderApp::do_mono(const QString& lcn)
2549void QTReaderApp::do_mono(const QString& lcn) 2549{
2550{ 2550 bool ok;
2551 bool ok; 2551 unsigned long ulcn = lcn.toULong(&ok);
2552 unsigned long ulcn = lcn.toULong(&ok); 2552 if (ok)
2553 if (ok) 2553 {
2554 { 2554 reader->m_charpc = ulcn;
2555 reader->m_charpc = ulcn; 2555 reader->setfont();
2556 reader->setfont(); 2556 reader->refresh();
2557 reader->refresh(); 2557 //reader->setmono(true);
2558 //reader->setmono(true); 2558 }
2559 } 2559 else
2560 else 2560 QMessageBox::information(this, PROGNAME, "Must be a number");
2561 QMessageBox::information(this, PROGNAME, "Must be a number"); 2561}
2562} 2562*/
2563*/ 2563/*
2564/* 2564void QTReaderApp::editPaste()
2565void QTReaderApp::editPaste() 2565{
2566{ 2566#ifndef QT_NO_CLIPBOARD
2567#ifndef QT_NO_CLIPBOARD 2567 editor->paste();
2568 editor->paste(); 2568#endif
2569#endif 2569}
2570} 2570*/
2571*/ 2571
2572 2572void QTReaderApp::editFind()
2573void QTReaderApp::editFind() 2573{
2574{ 2574 searchStart = reader->pagelocate();
2575 searchStart = reader->pagelocate(); 2575#ifdef __ISEARCH
2576#ifdef __ISEARCH 2576 searchStack = new QStack<searchrecord>;
2577 searchStack = new QStack<searchrecord>; 2577#endif
2578#endif 2578#ifdef USEQPE
2579#ifdef USEQPE 2579 Global::showInputMethod();
2580 Global::showInputMethod(); 2580#endif
2581#endif 2581 searchBar->show();
2582 searchBar->show(); 2582 searchVisible = TRUE;
2583 searchVisible = TRUE; 2583 searchEdit->setFocus();
2584 searchEdit->setFocus(); 2584#ifdef __ISEARCH
2585#ifdef __ISEARCH 2585 searchStack->push(new searchrecord("",reader->pagelocate()));
2586 searchStack->push(new searchrecord("",reader->pagelocate())); 2586#endif
2587#endif 2587}
2588} 2588
2589 2589void QTReaderApp::findNext()
2590void QTReaderApp::findNext() 2590{
2591{ 2591// // qDebug("findNext called\n");
2592// // qDebug("findNext called\n"); 2592#ifdef __ISEARCH
2593#ifdef __ISEARCH 2593 QString arg = searchEdit->text();
2594 QString arg = searchEdit->text(); 2594#else
2595#else 2595 QRegExp arg = searchEdit->text();
2596 QRegExp arg = searchEdit->text(); 2596#endif
2597#endif 2597 CDrawBuffer test(&(reader->m_fontControl));
2598 CDrawBuffer test(&(reader->m_fontControl)); 2598 size_t start = reader->pagelocate();
2599 size_t start = reader->pagelocate(); 2599 reader->jumpto(start);
2600 reader->jumpto(start); 2600 reader->getline(&test);
2601 reader->getline(&test); 2601 dosearch(start, test, arg);
2602 dosearch(start, test, arg); 2602}
2603} 2603
2604 2604void QTReaderApp::findClose()
2605void QTReaderApp::findClose() 2605{
2606{ 2606 searchVisible = FALSE;
2607 searchVisible = FALSE; 2607 searchEdit->setText("");
2608 searchEdit->setText(""); 2608#ifdef USEQPE
2609#ifdef USEQPE 2609 Global::hideInputMethod();
2610 Global::hideInputMethod(); 2610#endif
2611#endif 2611 searchBar->hide();
2612 searchBar->hide(); 2612#ifdef __ISEARCH
2613#ifdef __ISEARCH 2613// searchStack = new QStack<searchrecord>;
2614// searchStack = new QStack<searchrecord>; 2614 while (!searchStack->isEmpty())
2615 while (!searchStack->isEmpty()) 2615 {
2616 { 2616 delete searchStack->pop();
2617 delete searchStack->pop(); 2617 }
2618 } 2618 delete searchStack;
2619 delete searchStack; 2619#endif
2620#endif 2620 reader->setFocus();
2621 reader->setFocus(); 2621}
2622} 2622
2623 2623void QTReaderApp::regClose()
2624void QTReaderApp::regClose() 2624{
2625{ 2625 regVisible = FALSE;
2626 regVisible = FALSE; 2626 regEdit->setText("");
2627 regEdit->setText(""); 2627 regBar->hide();
2628 regBar->hide(); 2628#ifdef USEQPE
2629#ifdef USEQPE 2629 Global::hideInputMethod();
2630 Global::hideInputMethod(); 2630#endif
2631#endif 2631 reader->setFocus();
2632 reader->setFocus(); 2632}
2633} 2633
2634 2634#ifdef __ISEARCH
2635#ifdef __ISEARCH 2635bool QTReaderApp::dosearch(size_t start, CDrawBuffer& test, const QString& arg)
2636bool QTReaderApp::dosearch(size_t start, CDrawBuffer& test, const QString& arg) 2636#else
2637#else 2637bool QTReaderApp::dosearch(size_t start, CDrawBuffer& test, const QRegExp& arg)
2638bool QTReaderApp::dosearch(size_t start, CDrawBuffer& test, const QRegExp& arg) 2638#endif
2639#endif 2639{
2640{ 2640 bool ret = true;
2641 bool ret = true; 2641 unsigned long fs, ts;
2642 unsigned long fs, ts; 2642 reader->sizes(fs,ts);
2643 reader->sizes(fs,ts); 2643 size_t pos = reader->locate();
2644 size_t pos = reader->locate(); 2644 pbar->setGeometry(searchBar->x(),searchBar->y(),searchBar->width(), searchBar->height());
2645 pbar->setGeometry(searchBar->x(),searchBar->y(),searchBar->width(), searchBar->height()); 2645 pbar->show();
2646 pbar->show(); 2646 pbar->raise();
2647 pbar->raise(); 2647 pbar->reset();
2648 pbar->reset(); 2648 int offset;
2649 int offset; 2649 int lastpc = (100*pos)/ts;
2650 int lastpc = (100*pos)/ts; 2650 pbar->setProgress(lastpc);
2651 pbar->setProgress(lastpc); 2651// qApp->processEvents();
2652// qApp->processEvents(); 2652 if (reader->buffdoc.getpara(test) >= 0)
2653 if (reader->buffdoc.getpara(test) >= 0) 2653 {
2654 { 2654 reader->setFocus();
2655 reader->setFocus(); 2655#ifdef __ISEARCH
2656#ifdef __ISEARCH 2656 while (strstr(test.data(),(const tchar*)arg) == NULL)
2657 while (strstr(test.data(),(const tchar*)arg) == NULL) 2657#else
2658#else 2658#ifdef _UNICODE
2659#ifdef _UNICODE 2659 while ((offset = arg.match(toQString(test.data()))) == -1)
2660 while ((offset = arg.match(toQString(test.data()))) == -1) 2660#else
2661#else 2661 while (arg.match(test.data()) == -1)
2662 while (arg.match(test.data()) == -1) 2662#endif
2663#endif 2663#endif
2664#endif 2664 {
2665 { 2665 pos = reader->locate();
2666 pos = reader->locate(); 2666 int pc = (100*pos)/ts;
2667 int pc = (100*pos)/ts; 2667 if (pc != lastpc)
2668 if (pc != lastpc) 2668 {
2669 { 2669 pbar->setProgress(pc);
2670 pbar->setProgress(pc); 2670 qApp->processEvents();
2671 qApp->processEvents(); 2671 reader->setFocus();
2672 reader->setFocus(); 2672 lastpc = pc;
2673 lastpc = pc; 2673 }
2674 } 2674
2675 2675 if (reader->buffdoc.getpara(test) < 0)
2676 if (reader->buffdoc.getpara(test) < 0) 2676 {
2677 { 2677 if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2)
2678 if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2) 2678 pos = searchStart;
2679 pos = searchStart; 2679 else
2680 else 2680 pos = start;
2681 pos = start; 2681 findClose();
2682 findClose(); 2682 pbar->hide();
2683 pbar->hide(); 2683 reader->locate(pos);
2684 reader->locate(pos); 2684 return false;
2685 return false; 2685 }
2686 } 2686 }
2687 } 2687// qDebug("Found it at %u:%u", pos, offset);
2688// qDebug("Found it at %u:%u", pos, offset); 2688 pbar->hide();
2689 pbar->hide(); 2689// qDebug("Hid");
2690// qDebug("Hid"); 2690 reader->locate(pos+offset);
2691 reader->locate(pos+offset); 2691// qDebug("Loacted");
2692// qDebug("Loacted"); 2692// qDebug("page up");
2693// qDebug("page up"); 2693 ret = true;
2694 ret = true; 2694 }
2695 } 2695 else
2696 else 2696 {
2697 { 2697 if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2)
2698 if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2) 2698 pos = searchStart;
2699 pos = searchStart; 2699 else
2700 else 2700 pos = start;
2701 pos = start; 2701 ret = false;
2702 ret = false; 2702 findClose();
2703 findClose(); 2703 }
2704 } 2704 return ret;
2705 return ret; 2705}
2706} 2706
2707 2707#ifdef __ISEARCH
2708#ifdef __ISEARCH 2708void QTReaderApp::search(const QString & arg)
2709void QTReaderApp::search(const QString & arg) 2709{
2710{ 2710 searchrecord* ss = searchStack->top();
2711 searchrecord* ss = searchStack->top(); 2711 CBuffer test;
2712 CBuffer test; 2712 size_t start = reader->pagelocate();
2713 size_t start = reader->pagelocate(); 2713 bool haspopped = false;
2714 bool haspopped = false; 2714 while (arg.left(ss->s.length()) != ss->s)
2715 while (arg.left(ss->s.length()) != ss->s) 2715 {
2716 { 2716 haspopped = true;
2717 haspopped = true; 2717 start = ss->pos;
2718 start = ss->pos; 2718// reader->locate(start);
2719// reader->locate(start); 2719 searchStack->pop();
2720 searchStack->pop(); 2720 delete ss;
2721 delete ss; 2721 }
2722 } 2722 if (haspopped) reader->locate(start);
2723 if (haspopped) reader->locate(start); 2723/*
2724/* 2724 if (arg.length() < ss->len)
2725 if (arg.length() < ss->len) 2725 {
2726 { 2726 start = ss->pos;
2727 start = ss->pos; 2727 reader->locate(start);
2728 reader->locate(start); 2728 searchStack->pop();
2729 searchStack->pop(); 2729 delete ss;
2730 delete ss; 2730 }
2731 } 2731*/
2732*/ 2732 else
2733 else 2733 {
2734 { 2734 start = reader->pagelocate();
2735 start = reader->pagelocate(); 2735 reader->jumpto(start);
2736 reader->jumpto(start); 2736 searchStack->push(new searchrecord(arg,start));
2737 searchStack->push(new searchrecord(arg,start)); 2737 }
2738 } 2738 dosearch(start, test, arg);
2739 dosearch(start, test, arg); 2739}
2740} 2740#else
2741#else 2741void QTReaderApp::search()
2742void QTReaderApp::search() 2742{
2743{ 2743 findNext();
2744 findNext(); 2744}
2745} 2745#endif
2746#endif 2746
2747 2747void QTReaderApp::openFile( const QString &f )
2748void QTReaderApp::openFile( const QString &f ) 2748{
2749{ 2749// qDebug("File:%s", (const char*)f);
2750// qDebug("File:%s", (const char*)f); 2750// openFile(DocLnk(f));
2751// openFile(DocLnk(f)); 2751//}
2752//} 2752//
2753// 2753//void QTReaderApp::openFile( const DocLnk &f )
2754//void QTReaderApp::openFile( const DocLnk &f ) 2754//{
2755//{ 2755 clear();
2756 clear(); 2756 QFileInfo fm(f);
2757 QFileInfo fm(f); 2757 if ( fm.exists() )
2758 if ( fm.exists() ) 2758 {
2759 { 2759// QMessageBox::information(0, "Progress", "Calling fileNew()");
2760// QMessageBox::information(0, "Progress", "Calling fileNew()"); 2760#ifdef USEQPE
2761#ifdef USEQPE 2761 if (fm.extension( FALSE ) == "desktop")
2762 if (fm.extension( FALSE ) == "desktop") 2762 {
2763 { 2763 DocLnk d(f);
2764 DocLnk d(f); 2764 QFileInfo fnew(d.file());
2765 QFileInfo fnew(d.file()); 2765 fm = fnew;
2766 fm = fnew; 2766 if (!fm.exists()) return;
2767 if (!fm.exists()) return; 2767 }
2768 } 2768#endif
2769#endif 2769 clear();
2770 clear(); 2770 reader->setText(fm.baseName(), fm.absFilePath());
2771 reader->setText(fm.baseName(), fm.absFilePath()); 2771 m_loadedconfig = readconfig(APPDIR "/configs", reader->m_string, false);
2772 m_loadedconfig = readconfig(APPDIR "/configs", reader->m_string, false); 2772 qDebug("Showing tools");
2773 qDebug("Showing tools"); 2773 showEditTools();
2774 showEditTools(); 2774 qDebug("Shown tools");
2775 qDebug("Shown tools"); 2775 readbkmks();
2776 readbkmks(); 2776 qDebug("read markss");
2777 qDebug("read markss"); 2777 m_savedpos = 0xffffffff;
2778 m_savedpos = 0xffffffff; 2778 }
2779 } 2779 else
2780 else 2780 {
2781 { 2781 QString msg = f;
2782 QString msg = f; 2782 msg += "\nFile does not exist";
2783 msg += "\nFile does not exist"; 2783 QMessageBox::information(this, PROGNAME, msg);
2784 QMessageBox::information(this, PROGNAME, msg); 2784 reader->m_lastfile = QString::null;
2785 reader->m_lastfile = QString::null; 2785 }
2786 } 2786
2787 2787}
2788} 2788/*
2789/* 2789void QTReaderApp::resizeEvent(QResizeEvent* e)
2790void QTReaderApp::resizeEvent(QResizeEvent* e) 2790{
2791{ 2791 if (m_fullscreen)
2792 if (m_fullscreen) 2792 {
2793 { 2793 showNormal();
2794 showNormal(); 2794 showFullScreen();
2795 showFullScreen(); 2795 }
2796 } 2796}
2797} 2797*/
2798*/ 2798void QTReaderApp::handlekey(QKeyEvent* e)
2799void QTReaderApp::handlekey(QKeyEvent* e) 2799{
2800{ 2800// qDebug("Keypress event");
2801// qDebug("Keypress event"); 2801 timeb now;
2802 timeb now; 2802 ftime(&now);
2803 ftime(&now); 2803 unsigned long etime = (1000*(now.time - m_lastkeytime.time) + now.millitm)-m_lastkeytime.millitm;
2804 unsigned long etime = (1000*(now.time - m_lastkeytime.time) + now.millitm)-m_lastkeytime.millitm; 2804 if (etime < m_debounce)
2805 if (etime < m_debounce) 2805 {
2806 { 2806 return;
2807 return; 2807 }
2808 } 2808 switch(e->key())
2809 switch(e->key()) 2809 {
2810 { 2810 case Key_Escape:
2811 case Key_Escape: 2811 // qDebug("escape event");
2812 // qDebug("escape event"); 2812 if (m_disableesckey)
2813 if (m_disableesckey) 2813 {
2814 { 2814 m_disableesckey = false;
2815 m_disableesckey = false; 2815 }
2816 } 2816 else
2817 else 2817 {
2818 { 2818 m_bcloseDisabled = true;
2819 m_bcloseDisabled = true; 2819 if (m_fullscreen)
2820 if (m_fullscreen) 2820 {
2821 { 2821 m_actFullscreen->setOn(false);
2822 m_actFullscreen->setOn(false); 2822 e->accept();
2823 e->accept(); 2823 }
2824 } 2824 else
2825 else 2825 {
2826 { 2826 // qDebug("escape action");
2827 // qDebug("escape action"); 2827 doAction(e);
2828 doAction(e); 2828 }
2829 } 2829 }
2830 } 2830 break;
2831 break; 2831 /*
2832 /* 2832 case Key_Left:
2833 case Key_Left: 2833 {
2834 { 2834 if (reader->m_autoScroll)
2835 if (reader->m_autoScroll) 2835 {
2836 { 2836 reader->reduceScroll();
2837 reader->reduceScroll(); 2837 }
2838 } 2838 else
2839 else 2839 {
2840 { 2840 doAction(e);
2841 doAction(e); 2841 }
2842 } 2842 }
2843 } 2843 break;
2844 break; 2844 case Key_Right:
2845 case Key_Right: 2845 {
2846 { 2846 if (reader->m_autoScroll)
2847 if (reader->m_autoScroll) 2847 {
2848 { 2848 reader->increaseScroll();
2849 reader->increaseScroll(); 2849 }
2850 } 2850 else
2851 else 2851 {
2852 { 2852 doAction(e);
2853 doAction(e); 2853 }
2854 } 2854 }
2855 } 2855 break;
2856 break; 2856 case Key_Up:
2857 case Key_Up: 2857 {
2858 { 2858 if (reader->m_autoScroll)
2859 if (reader->m_autoScroll) 2859 {
2860 { 2860 reader->increaseScroll();
2861 reader->increaseScroll(); 2861 }
2862 } 2862 else
2863 else 2863 {
2864 { 2864 doAction(e);
2865 doAction(e); 2865 }
2866 } 2866 }
2867 } 2867 break;
2868 break; 2868 case Key_Down:
2869 case Key_Down: 2869 {
2870 { 2870 if (reader->m_autoScroll)
2871 if (reader->m_autoScroll) 2871 {
2872 { 2872 reader->reduceScroll();
2873 reader->reduceScroll(); 2873 }
2874 } 2874 else
2875 else 2875 {
2876 { 2876 doAction(e);
2877 doAction(e); 2877 }
2878 } 2878 }
2879 } 2879 break;
2880 break; 2880 */
2881 */ 2881 default:
2882 default: 2882 {
2883 { 2883 doAction(e);
2884 doAction(e); 2884 }
2885 } 2885
2886 2886/*
2887/* 2887 QString msg("Key press was:");
2888 QString msg("Key press was:"); 2888 QString key;
2889 QString key; 2889 msg += key.setNum(e->key());
2890 msg += key.setNum(e->key()); 2890 QMessageBox::information(this, PROGNAME, msg);
2891 QMessageBox::information(this, PROGNAME, msg); 2891*/
2892*/ 2892 }
2893 } 2893 ftime(&m_lastkeytime);
2894 ftime(&m_lastkeytime); 2894}
2895} 2895
2896 2896#ifdef NEWFULLSCREEN
2897#ifdef NEWFULLSCREEN 2897void QTReaderApp::enableFullscreen()
2898void QTReaderApp::enableFullscreen() 2898{
2899{ 2899 setFixedSize(qApp->desktop()->size());
2900 setFixedSize(qApp->desktop()->size()); 2900 showNormal();
2901 showNormal(); 2901 reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0));
2902 reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0)); 2902 showFullScreen();
2903 showFullScreen(); 2903}
2904} 2904
2905 2905void QTReaderApp::resizeEvent(QResizeEvent *)
2906void QTReaderApp::resizeEvent(QResizeEvent *) 2906{
2907{ 2907 if (m_fullscreen && (size() != qApp->desktop()->size()))
2908 if (m_fullscreen && (size() != qApp->desktop()->size())) 2908 {
2909 { 2909 enableFullscreen();
2910 enableFullscreen(); 2910 }
2911 } 2911}
2912} 2912
2913 2913void QTReaderApp::focusInEvent(QFocusEvent*)
2914void QTReaderApp::focusInEvent(QFocusEvent*) 2914{
2915{ 2915 if (m_fullscreen)
2916 if (m_fullscreen) 2916 {
2917 { 2917 enableFullscreen();
2918 enableFullscreen(); 2918 raise();
2919 raise(); 2919 }
2920 } 2920}
2921} 2921#endif
2922#endif 2922
2923 2923void QTReaderApp::showEditTools()
2924void QTReaderApp::showEditTools() 2924{
2925{ 2925// if ( !doc )
2926// if ( !doc ) 2926 //close();
2927 //close(); 2927 if (m_fullscreen)
2928 if (m_fullscreen) 2928 {
2929 { 2929#ifdef USEQPE
2930#ifdef USEQPE 2930 if (menubar != NULL) menubar->hide();
2931 if (menubar != NULL) menubar->hide(); 2931#endif
2932#endif 2932 if (fileBar != NULL) fileBar->hide();
2933 if (fileBar != NULL) fileBar->hide(); 2933 if (viewBar != NULL) viewBar->hide();
2934 if (viewBar != NULL) viewBar->hide(); 2934 if (navBar != NULL) navBar->hide();
2935 if (navBar != NULL) navBar->hide(); 2935 if (markBar != NULL) markBar->hide();
2936 if (markBar != NULL) markBar->hide(); 2936 if (m_prog != NULL)
2937 if (m_prog != NULL) 2937 {
2938 { 2938 // qDebug("Hiding status");
2939 // qDebug("Hiding status"); 2939 m_prog->hide();
2940 m_prog->hide(); 2940 }
2941 } 2941 searchBar->hide();
2942 searchBar->hide(); 2942 regBar->hide();
2943 regBar->hide(); 2943#ifdef USEQPE
2944#ifdef USEQPE 2944 Global::hideInputMethod();
2945 Global::hideInputMethod(); 2945#endif
2946#endif 2946 if (m_scrollbar != NULL) m_scrollbar->hide();
2947 if (m_scrollbar != NULL) m_scrollbar->hide(); 2947 m_fontBar->hide();
2948 m_fontBar->hide(); 2948 //showNormal();
2949 //showNormal(); 2949#ifdef NEWFULLSCREEN
2950#ifdef NEWFULLSCREEN 2950 enableFullscreen();
2951 enableFullscreen(); 2951#else
2952#else 2952 showFullScreen();
2953 showFullScreen(); 2953#endif
2954#endif 2954 }
2955 } 2955 else
2956 else 2956 {
2957 { 2957 //qDebug("him");
2958 //qDebug("him"); 2958#ifdef USEQPE
2959#ifdef USEQPE 2959 Global::hideInputMethod();
2960 Global::hideInputMethod(); 2960#endif
2961#endif 2961 //qDebug("eb");
2962 //qDebug("eb"); 2962 if (m_scrollbar != NULL)
2963 if (m_scrollbar != NULL) 2963 {
2964 { 2964 if (m_scrollishidden)
2965 if (m_scrollishidden) 2965 {
2966 { 2966 m_scrollbar->hide();
2967 m_scrollbar->hide(); 2967 }
2968 } 2968 else
2969 else 2969 {
2970 { 2970 m_scrollbar->show();
2971 m_scrollbar->show(); 2971 }
2972 } 2972 }
2973 } 2973 if (!m_hidebars)
2974 if (!m_hidebars) 2974 {
2975 { 2975#ifdef USEQPE
2976#ifdef USEQPE 2976 menubar->show();
2977 menubar->show(); 2977#endif
2978#endif 2978 if (fileBar != NULL) fileBar->show();
2979 if (fileBar != NULL) fileBar->show(); 2979 if (viewBar != NULL) viewBar->show();
2980 if (viewBar != NULL) viewBar->show(); 2980 if (navBar != NULL) navBar->show();
2981 if (navBar != NULL) navBar->show(); 2981 if (markBar != NULL) markBar->show();
2982 if (markBar != NULL) markBar->show(); 2982 if (m_prog != NULL && !m_statusishidden)
2983 if (m_prog != NULL && !m_statusishidden) 2983 {
2984 { 2984 // qDebug("Showing status");
2985 // qDebug("Showing status"); 2985 m_prog->show();
2986 m_prog->show(); 2986 // qDebug("Shown status");
2987 // qDebug("Shown status"); 2987 }
2988 } 2988 // qDebug("Showing mb");
2989 // qDebug("Showing mb"); 2989 mb->show();
2990 mb->show(); 2990 }
2991 } 2991 if ( searchVisible )
2992 if ( searchVisible ) 2992 {
2993 { 2993#ifdef USEQPE
2994#ifdef USEQPE 2994 Global::showInputMethod();
2995 Global::showInputMethod(); 2995#endif
2996#endif 2996 searchBar->show();
2997 searchBar->show(); 2997 }
2998 } 2998 if ( regVisible )
2999 if ( regVisible ) 2999 {
3000 { 3000#ifdef USEQPE
3001#ifdef USEQPE 3001 Global::showInputMethod();
3002 Global::showInputMethod(); 3002#endif
3003#endif 3003 regBar->show();
3004 regBar->show(); 3004 }
3005 } 3005 if (m_fontVisible) m_fontBar->show();
3006 if (m_fontVisible) m_fontBar->show(); 3006 //qDebug("sn");
3007 //qDebug("sn"); 3007 showNormal();
3008 showNormal(); 3008 //qDebug("sm");
3009 //qDebug("sm"); 3009#ifdef USEQPE
3010#ifdef USEQPE 3010 showMaximized();
3011 showMaximized(); 3011#endif
3012#endif 3012 //setCentralWidget(reader);
3013 //setCentralWidget(reader); 3013 }
3014 } 3014
3015 3015 // qDebug("uc");
3016 // qDebug("uc"); 3016 updateCaption();
3017 updateCaption(); 3017 // qDebug("rw");
3018 // qDebug("rw"); 3018 editorStack->raiseWidget( reader );
3019 editorStack->raiseWidget( reader ); 3019 // qDebug("sf");
3020 // qDebug("sf"); 3020 reader->setFocus();
3021 reader->setFocus(); 3021 // qDebug("ref");
3022 // qDebug("ref"); 3022 reader->refresh(true);
3023 reader->refresh(true); 3023 // qDebug("done");
3024 // qDebug("done"); 3024}
3025} 3025/*
3026/* 3026void QTReaderApp::save()
3027void QTReaderApp::save() 3027{
3028{ 3028 if ( !doc )
3029 if ( !doc ) 3029 return;
3030 return; 3030 if ( !editor->edited() )
3031 if ( !editor->edited() ) 3031 return;
3032 return; 3032
3033 3033 QString rt = editor->text();
3034 QString rt = editor->text(); 3034 QString pt = rt;
3035 QString pt = rt; 3035
3036 3036 if ( doc->name().isEmpty() ) {
3037 if ( doc->name().isEmpty() ) { 3037 unsigned ispace = pt.find( ' ' );
3038 unsigned ispace = pt.find( ' ' ); 3038 unsigned ienter = pt.find( '\n' );
3039 unsigned ienter = pt.find( '\n' ); 3039 int i = (ispace < ienter) ? ispace : ienter;
3040 int i = (ispace < ienter) ? ispace : ienter; 3040 QString docname;
3041 QString docname; 3041 if ( i == -1 ) {
3042 if ( i == -1 ) { 3042 if ( pt.isEmpty() )
3043 if ( pt.isEmpty() ) 3043 docname = "Empty Text";
3044 docname = "Empty Text"; 3044 else
3045 else 3045 docname = pt;
3046 docname = pt; 3046 } else {
3047 } else { 3047 docname = pt.left( i );
3048 docname = pt.left( i ); 3048 }
3049 } 3049 doc->setName(docname);
3050 doc->setName(docname); 3050 }
3051 } 3051 FileManager fm;
3052 FileManager fm; 3052 fm.saveFile( *doc, rt );
3053 fm.saveFile( *doc, rt ); 3053}
3054} 3054*/
3055*/ 3055
3056 3056void QTReaderApp::clear()
3057void QTReaderApp::clear() 3057{
3058{ 3058// if (doc != 0)
3059// if (doc != 0) 3059// {
3060// { 3060// QMessageBox::information(this, PROGNAME, "Deleting doc", 1);
3061// QMessageBox::information(this, PROGNAME, "Deleting doc", 1); 3061 //delete doc;
3062 //delete doc; 3062// QMessageBox::information(this, PROGNAME, "Deleted doc", 1);
3063// QMessageBox::information(this, PROGNAME, "Deleted doc", 1); 3063 //doc = 0;
3064 //doc = 0; 3064 // }
3065 // } 3065 reader->clear();
3066 reader->clear(); 3066}
3067} 3067
3068 3068void QTReaderApp::updateCaption()
3069void QTReaderApp::updateCaption() 3069{
3070{ 3070// if ( !doc )
3071// if ( !doc ) 3071 //setCaption( tr("QTReader") );
3072 //setCaption( tr("QTReader") ); 3072// else {
3073// else { 3073 //QString s = doc->name();
3074 //QString s = doc->name(); 3074 //if ( s.isEmpty() )
3075 //if ( s.isEmpty() ) 3075 // s = tr( "Unnamed" );
3076 // s = tr( "Unnamed" ); 3076 setCaption( reader->m_string + " - " + tr(SHORTPROGNAME) );
3077 setCaption( reader->m_string + " - " + tr(SHORTPROGNAME) ); 3077// }
3078// } 3078}
3079} 3079
3080 3080void QTReaderApp::setDocument(const QString& fileref)
3081void QTReaderApp::setDocument(const QString& fileref) 3081{
3082{ 3082//QMessageBox::information(0, "setDocument", fileref);
3083//QMessageBox::information(0, "setDocument", fileref); 3083 openFile(fileref);
3084 openFile(fileref); 3084// showEditTools();
3085// showEditTools(); 3085}
3086} 3086
3087 3087void QTReaderApp::closeEvent( QCloseEvent *e )
3088void QTReaderApp::closeEvent( QCloseEvent *e ) 3088{
3089{ 3089// qDebug("Close event");
3090// qDebug("Close event"); 3090 if (m_fullscreen)
3091 if (m_fullscreen) 3091 {
3092 { 3092 m_fullscreen = false;
3093 m_fullscreen = false; 3093 showEditTools();
3094 showEditTools(); 3094 e->ignore();
3095 e->ignore(); 3095 }
3096 } 3096 else if (editorStack->visibleWidget() == m_buttonprefs)
3097 else if (editorStack->visibleWidget() == m_buttonprefs) 3097 {
3098 { 3098 m_buttonprefs->mapkey(Qt::NoButton, Key_Escape);
3099 m_buttonprefs->mapkey(Qt::NoButton, Key_Escape); 3099 e->ignore();
3100 e->ignore(); 3100 }
3101 } 3101 else if (m_dontSave)
3102 else if (m_dontSave) 3102 {
3103 { 3103 e->accept();
3104 e->accept(); 3104 }
3105 } 3105 else
3106 else 3106 {
3107 { 3107 if (editorStack->visibleWidget() == reader)
3108 if (editorStack->visibleWidget() == reader) 3108 {
3109 { 3109 if ((kmap.find(orKey(Qt::NoButton,Key_Escape,false)) != kmap.end()) && m_bcloseDisabled)
3110 if ((kmap.find(orKey(Qt::NoButton,Key_Escape,false)) != kmap.end()) && m_bcloseDisabled) 3110 {
3111 { 3111 //qDebug("Close disabled");
3112 //qDebug("Close disabled"); 3112 m_bcloseDisabled = false;
3113 m_bcloseDisabled = false; 3113 e->ignore();
3114 e->ignore(); 3114 }
3115 } 3115 else
3116 else 3116 {
3117 { 3117 if (m_fontVisible)
3118 if (m_fontVisible) 3118 {
3119 { 3119 m_fontBar->hide();
3120 m_fontBar->hide(); 3120 m_fontVisible = false;
3121 m_fontVisible = false; 3121 e->ignore();
3122 e->ignore(); 3122 return;
3123 return; 3123 }
3124 } 3124 if (regVisible)
3125 if (regVisible) 3125 {
3126 { 3126 regBar->hide();
3127 regBar->hide(); 3127#ifdef USEQPE
3128#ifdef USEQPE 3128 Global::hideInputMethod();
3129 Global::hideInputMethod(); 3129#endif
3130#endif 3130 regVisible = false;
3131 regVisible = false; 3131 e->ignore();
3132 e->ignore(); 3132 return;
3133 return; 3133 }
3134 } 3134 if (searchVisible)
3135 if (searchVisible) 3135 {
3136 { 3136 searchBar->hide();
3137 searchBar->hide(); 3137#ifdef USEQPE
3138#ifdef USEQPE 3138 Global::hideInputMethod();
3139 Global::hideInputMethod(); 3139#endif
3140#endif 3140 searchVisible = false;
3141 searchVisible = false; 3141 e->ignore();
3142 e->ignore(); 3142 return;
3143 return; 3143 }
3144 } 3144 if (m_fBkmksChanged && pBkmklist != NULL)
3145 if (m_fBkmksChanged && pBkmklist != NULL) 3145 {
3146 { 3146 if (QMessageBox::warning(this, PROGNAME, "Save bookmarks?", "Save", "Don't bother") == 0)
3147 if (QMessageBox::warning(this, PROGNAME, "Save bookmarks?", "Save", "Don't bother") == 0) 3147 savebkmks();
3148 savebkmks(); 3148 delete pBkmklist;
3149 delete pBkmklist; 3149 reader->pBkmklist = pBkmklist = NULL;
3150 reader->pBkmklist = pBkmklist = NULL; 3150 m_fBkmksChanged = false;
3151 m_fBkmksChanged = false; 3151 }
3152 } 3152 updatefileinfo();
3153 updatefileinfo(); 3153 saveprefs();
3154 saveprefs(); 3154 e->accept();
3155 e->accept(); 3155 }
3156 } 3156 }
3157 } 3157 else
3158 else 3158 {
3159 { 3159 showEditTools();
3160 showEditTools(); 3160 m_disableesckey = true;
3161 m_disableesckey = true; 3161 }
3162 } 3162 }
3163 } 3163}
3164} 3164
3165 3165void QTReaderApp::do_gotomark()
3166void QTReaderApp::do_gotomark() 3166{
3167{ 3167 m_nBkmkAction = cGotoBkmk;
3168 m_nBkmkAction = cGotoBkmk; 3168 if (!listbkmk(pBkmklist))
3169 if (!listbkmk(pBkmklist)) 3169 QMessageBox::information(this, PROGNAME, "No bookmarks in memory");
3170 QMessageBox::information(this, PROGNAME, "No bookmarks in memory"); 3170}
3171} 3171
3172 3172void QTReaderApp::do_delmark()
3173void QTReaderApp::do_delmark() 3173{
3174{ 3174 m_nBkmkAction = cDelBkmk;
3175 m_nBkmkAction = cDelBkmk; 3175 if (!listbkmk(pBkmklist))
3176 if (!listbkmk(pBkmklist)) 3176 QMessageBox::information(this, PROGNAME, "No bookmarks in memory");
3177 QMessageBox::information(this, PROGNAME, "No bookmarks in memory"); 3177}
3178} 3178
3179 3179bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab)
3180bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab) 3180{
3181{ 3181 bkmkselector->clear();
3182 bkmkselector->clear(); 3182 if (_lab.isEmpty())
3183 if (_lab.isEmpty()) 3183 bkmkselector->setText("Cancel");
3184 bkmkselector->setText("Cancel"); 3184 else
3185 else 3185 bkmkselector->setText(_lab);
3186 bkmkselector->setText(_lab); 3186 int cnt = 0;
3187 int cnt = 0; 3187 if (plist != NULL)
3188 if (plist != NULL) 3188 {
3189 { 3189 for (CList<Bkmk>::iterator i = plist->begin(); i != plist->end(); i++)
3190 for (CList<Bkmk>::iterator i = plist->begin(); i != plist->end(); i++) 3190 {
3191 { 3191#ifdef _UNICODE
3192#ifdef _UNICODE 3192 // qDebug("Item:%s", (const char*)toQString(i->name()));
3193 // qDebug("Item:%s", (const char*)toQString(i->name())); 3193 bkmkselector->insertItem(toQString(i->name()));
3194 bkmkselector->insertItem(toQString(i->name())); 3194#else
3195#else 3195 bkmkselector->insertItem(i->name());
3196 bkmkselector->insertItem(i->name()); 3196#endif
3197#endif 3197 cnt++;
3198 cnt++; 3198 }
3199 } 3199 }
3200 } 3200 if (cnt > 0)
3201 if (cnt > 0) 3201 {
3202 { 3202 hidetoolbars();
3203 hidetoolbars(); 3203 editorStack->raiseWidget( bkmkselector );
3204 editorStack->raiseWidget( bkmkselector ); 3204 return true;
3205 return true; 3205 }
3206 } 3206 else
3207 else 3207 return false;
3208 return false; 3208}
3209} 3209
3210 3210void QTReaderApp::do_autogen()
3211void QTReaderApp::do_autogen() 3211{
3212{ 3212 m_nRegAction = cAutoGen;
3213 m_nRegAction = cAutoGen; 3213 regEdit->setText(m_autogenstr);
3214 regEdit->setText(m_autogenstr); 3214 do_regedit();
3215 do_regedit(); 3215}
3216} 3216
3217 3217void QTReaderApp::do_regedit()
3218void QTReaderApp::do_regedit() 3218{
3219{ 3219// fileBar->hide();
3220// fileBar->hide(); 3220 reader->bDoUpdates = false;
3221 reader->bDoUpdates = false; 3221// qDebug("Showing regbar");
3222// qDebug("Showing regbar"); 3222 regBar->show();
3223 regBar->show(); 3223// qDebug("Showing kbd");
3224// qDebug("Showing kbd"); 3224#ifdef USEQPE
3225#ifdef USEQPE 3225 Global::showInputMethod();
3226 Global::showInputMethod(); 3226#endif
3227#endif 3227 regVisible = true;
3228 regVisible = true; 3228 regEdit->setFocus();
3229 regEdit->setFocus(); 3229// qApp->processEvents();
3230// qApp->processEvents(); 3230 reader->bDoUpdates = true;
3231 reader->bDoUpdates = true; 3231 reader->update();
3232 reader->update(); 3232}
3233} 3233
3234 3234bool QTReaderApp::openfrombkmk(Bkmk* bk)
3235bool QTReaderApp::openfrombkmk(Bkmk* bk) 3235{
3236{ 3236 QString fn = toQString(
3237 QString fn = toQString( 3237 CFiledata(bk->anno()).name()
3238 CFiledata(bk->anno()).name() 3238 );
3239 ); 3239 //qDebug("fileinfo");
3240 //qDebug("fileinfo"); 3240 if (!fn.isEmpty() && QFileInfo(fn).isFile())
3241 if (!fn.isEmpty() && QFileInfo(fn).isFile()) 3241 {
3242 { 3242 //qDebug("Opening");
3243 //qDebug("Opening"); 3243 openFile(fn);
3244 openFile(fn); 3244 struct stat fnstat;
3245 struct stat fnstat; 3245 stat((const char *)reader->m_lastfile, &fnstat);
3246 stat((const char *)reader->m_lastfile, &fnstat); 3246
3247 3247 if (CFiledata(bk->anno()).date()
3248 if (CFiledata(bk->anno()).date() 3248 != fnstat.st_mtime)
3249 != fnstat.st_mtime) 3249 {
3250 { 3250 CFiledata fd(bk->anno());
3251 CFiledata fd(bk->anno()); 3251 fd.setdate(fnstat.st_mtime);
3252 fd.setdate(fnstat.st_mtime); 3252 bk->value(0);
3253 bk->value(0); 3253 }
3254 } 3254 else
3255 else 3255 {
3256 { 3256 unsigned short svlen = bk->filedatalen();
3257 unsigned short svlen = bk->filedatalen(); 3257 unsigned char* svdata = bk->filedata();
3258 unsigned char* svdata = bk->filedata(); 3258 reader->putSaveData(svdata, svlen);
3259 reader->putSaveData(svdata, svlen); 3259 // setstate(svdata, svlen);
3260 // setstate(svdata, svlen); 3260 if (svlen != 0)
3261 if (svlen != 0) 3261 {
3262 { 3262 QMessageBox::warning(this, PROGNAME, "Not all file data used\nNew version?");
3263 QMessageBox::warning(this, PROGNAME, "Not all file data used\nNew version?"); 3263 }
3264 } 3264 // qDebug("updating");
3265 // qDebug("updating"); 3265 // showEditTools();
3266 // showEditTools(); 3266 reader->locate(bk->value());
3267 reader->locate(bk->value()); 3267 }
3268 } 3268 return true;
3269 return true; 3269 }
3270 } 3270 else
3271 else 3271 {
3272 { 3272 return false;
3273 return false; 3273 }
3274 } 3274}
3275} 3275
3276 3276void QTReaderApp::gotobkmk(int ind)
3277void QTReaderApp::gotobkmk(int ind) 3277{
3278{ 3278 qDebug("gbkmk");
3279 qDebug("gbkmk"); 3279 showEditTools();
3280 showEditTools(); 3280 switch (m_nBkmkAction)
3281 switch (m_nBkmkAction) 3281 {
3282 { 3282 case cOpenFile:
3283 case cOpenFile: 3283 {
3284 { 3284 // qApp->processEvents();
3285 // qApp->processEvents(); 3285 if (!openfrombkmk((*pOpenlist)[ind]))
3286 if (!openfrombkmk((*pOpenlist)[ind])) 3286 {
3287 { 3287 pOpenlist->erase(ind);
3288 pOpenlist->erase(ind); 3288 QMessageBox::information(this, PROGNAME, "Can't find file");
3289 QMessageBox::information(this, PROGNAME, "Can't find file"); 3289 }
3290 } 3290 }
3291 } 3291 break;
3292 break; 3292 case cGotoBkmk:
3293 case cGotoBkmk: 3293 reader->buffdoc.saveposn(reader->m_lastfile, reader->pagelocate());
3294 reader->buffdoc.saveposn(reader->m_lastfile, reader->pagelocate()); 3294 reader->locate((*pBkmklist)[ind]->value());
3295 reader->locate((*pBkmklist)[ind]->value()); 3295 break;
3296 break; 3296 case cDelBkmk:
3297 case cDelBkmk: 3297 //// qDebug("Deleting:%s\n",(*pBkmklist)[ind]->name());
3298 //// qDebug("Deleting:%s\n",(*pBkmklist)[ind]->name()); 3298 pBkmklist->erase(ind);
3299 pBkmklist->erase(ind); 3299 m_fBkmksChanged = true;
3300 m_fBkmksChanged = true; 3300 reader->refresh(true);
3301 reader->refresh(true); 3301 // pBkmklist->sort();
3302 // pBkmklist->sort(); 3302 break;
3303 break; 3303 case cRmBkmkFile:
3304 case cRmBkmkFile: 3304 {
3305 { 3305#ifndef USEQPE
3306#ifndef USEQPE 3306 QDir d = QDir::home(); // "/"
3307 QDir d = QDir::home(); // "/" 3307 d.cd(APPDIR);
3308 d.cd(APPDIR); 3308 d.remove(bkmkselector->text(ind));
3309 d.remove(bkmkselector->text(ind)); 3309#else /* USEQPE */
3310#else /* USEQPE */ 3310 unlink((const char *)Global::applicationFileName(APPDIR,bkmkselector->text(ind)));
3311 unlink((const char *)Global::applicationFileName(APPDIR,bkmkselector->text(ind))); 3311#endif /* USEQPE */
3312#endif /* USEQPE */ 3312 }
3313 } 3313 break;
3314 break; 3314 case cLdConfig:
3315 case cLdConfig: 3315 readconfig(APPDIR "/configs", bkmkselector->text(ind), false);
3316 readconfig(APPDIR "/configs", bkmkselector->text(ind), false); 3316 break;
3317 break; 3317 case cLdTheme:
3318 case cLdTheme: 3318 m_themename = bkmkselector->text(ind);
3319 m_themename = bkmkselector->text(ind); 3319 readconfig(QString(APPDIR "/Themes/")+m_themename , "config", false);
3320 readconfig(QString(APPDIR "/Themes/")+m_themename , "config", false); 3320 setBackgroundBitmap();
3321 setBackgroundBitmap(); 3321 break;
3322 break; 3322 case cRmConfig:
3323 case cRmConfig: 3323 {
3324 { 3324#ifndef USEQPE
3325#ifndef USEQPE 3325 QDir d = QDir::home(); // "/"
3326 QDir d = QDir::home(); // "/" 3326 d.cd(APPDIR "/configs");
3327 d.cd(APPDIR "/configs"); 3327 d.remove(bkmkselector->text(ind));
3328 d.remove(bkmkselector->text(ind)); 3328#else /* USEQPE */
3329#else /* USEQPE */ 3329 unlink((const char *)Global::applicationFileName(APPDIR "/configs",bkmkselector->text(ind)));
3330 unlink((const char *)Global::applicationFileName(APPDIR "/configs",bkmkselector->text(ind))); 3330#endif /* USEQPE */
3331#endif /* USEQPE */ 3331 }
3332 } 3332 break;
3333 break; 3333 case cExportLinks:
3334 case cExportLinks: 3334 {
3335 { 3335#ifndef USEQPE
3336#ifndef USEQPE 3336 QDir d = QDir::home(); // "/"
3337 QDir d = QDir::home(); // "/" 3337 d.cd(APPDIR "/urls");
3338 d.cd(APPDIR "/urls"); 3338 QFileInfo fi(d, bkmkselector->text(ind));
3339 QFileInfo fi(d, bkmkselector->text(ind)); 3339 if (fi.exists())
3340 if (fi.exists()) 3340 {
3341 { 3341 QString outfile( QFileDialog::getSaveFileName( QString::null, QString::null, this ) );
3342 QString outfile( QFileDialog::getSaveFileName( QString::null, QString::null, this ) ); 3342 if (!outfile.isEmpty())
3343 if (!outfile.isEmpty()) 3343 {
3344 { 3344 FILE* fout = fopen((const char *)outfile, "w");
3345 FILE* fout = fopen((const char *)outfile, "w"); 3345 if (fout != NULL)
3346 if (fout != NULL) 3346 {
3347 { 3347 FILE* fin = fopen((const char *)fi.absFilePath(), "r");
3348 FILE* fin = fopen((const char *)fi.absFilePath(), "r"); 3348 if (fin != NULL)
3349 if (fin != NULL) 3349 {
3350 { 3350 fprintf(fout, "<html><body>\n");
3351 fprintf(fout, "<html><body>\n"); 3351 int ch = 0;
3352 int ch = 0; 3352 while ((ch = fgetc(fin)) != EOF)
3353 while ((ch = fgetc(fin)) != EOF) 3353 {
3354 { 3354 fputc(ch, fout);
3355 fputc(ch, fout); 3355 }
3356 } 3356 fclose(fin);
3357 fclose(fin); 3357 fprintf(fout, "</html></body>\n");
3358 fprintf(fout, "</html></body>\n"); 3358 d.remove(bkmkselector->text(ind));
3359 d.remove(bkmkselector->text(ind)); 3359 }
3360 } 3360 fclose(fout);
3361 fclose(fout); 3361 }
3362 } 3362 else
3363 else 3363 QMessageBox::information(this, PROGNAME, "Couldn't open output");
3364 QMessageBox::information(this, PROGNAME, "Couldn't open output"); 3364 }
3365 } 3365 }
3366 } 3366#else /* USEQPE */
3367#else /* USEQPE */ 3367 FILE* fin = fopen((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)), "r");
3368 FILE* fin = fopen((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)), "r"); 3368 if (fin != NULL)
3369 if (fin != NULL) 3369 {
3370 { 3370 bool allok = false;
3371 bool allok = false; 3371#ifdef OPIE
3372#ifdef OPIE 3372 QString outfile = OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL, QString::null, QString::null, MimeTypes(), 0, "OpieReader");
3373 QString outfile = OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL, QString::null, QString::null, MimeTypes(), 0, "OpieReader"); 3373 if (!outfile.isEmpty())
3374 if (!outfile.isEmpty()) 3374 {
3375 { 3375 FILE* fout = fopen((const char *)outfile, "w");
3376 FILE* fout = fopen((const char *)outfile, "w"); 3376 if (fout != NULL)
3377 if (fout != NULL) 3377 {
3378 { 3378 fprintf(fout, "<html><body>\n");
3379 fprintf(fout, "<html><body>\n"); 3379 int ch = 0;
3380 int ch = 0; 3380 while ((ch = fgetc(fin)) != EOF)
3381 while ((ch = fgetc(fin)) != EOF) 3381 {
3382 { 3382 fputc(ch, fout);
3383 fputc(ch, fout); 3383 }
3384 } 3384 fprintf(fout, "</html></body>\n");
3385 fprintf(fout, "</html></body>\n"); 3385 fclose(fout);
3386 fclose(fout); 3386 allok = true;
3387 allok = true; 3387 }
3388 } 3388 else
3389 else 3389 QMessageBox::information(this, PROGNAME, "Couldn't open output");
3390 QMessageBox::information(this, PROGNAME, "Couldn't open output"); 3390 }
3391 } 3391 fclose(fin);
3392 fclose(fin); 3392 if (allok) unlink((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)));
3393 if (allok) unlink((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind))); 3393#else
3394#else 3394 fileBrowser* fb = new fileBrowser(true, this,"OpieReader",!m_bFloatingDialog, 0, "*", QString::null);
3395 fileBrowser* fb = new fileBrowser(true, this,"OpieReader",!m_bFloatingDialog, 0, "*", QString::null); 3395 if (fb->exec())
3396 if (fb->exec()) 3396 {
3397 { 3397 QString outfile = fb->getCurrentFile();
3398 QString outfile = fb->getCurrentFile(); 3398 FILE* fout = fopen((const char *)outfile, "w");
3399 FILE* fout = fopen((const char *)outfile, "w"); 3399 if (fout != NULL)
3400 if (fout != NULL) 3400 {
3401 { 3401 fprintf(fout, "<html><body>\n");
3402 fprintf(fout, "<html><body>\n"); 3402 int ch = 0;
3403 int ch = 0; 3403 while ((ch = fgetc(fin)) != EOF)
3404 while ((ch = fgetc(fin)) != EOF) 3404 {
3405 { 3405 fputc(ch, fout);
3406 fputc(ch, fout); 3406 }
3407 } 3407 fprintf(fout, "</html></body>\n");
3408 fprintf(fout, "</html></body>\n"); 3408 fclose(fout);
3409 fclose(fout); 3409 allok = true;
3410 allok = true; 3410 }
3411 } 3411 else
3412 else 3412 QMessageBox::information(this, PROGNAME, "Couldn't open output");
3413 QMessageBox::information(this, PROGNAME, "Couldn't open output"); 3413 }
3414 } 3414 delete fb;
3415 delete fb; 3415 fclose(fin);
3416 fclose(fin); 3416 if (allok) unlink((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)));
3417 if (allok) unlink((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind))); 3417#endif
3418#endif 3418 }
3419 } 3419 else
3420 else 3420 {
3421 { 3421 QMessageBox::information(this, PROGNAME, "Couldn't open input");
3422 QMessageBox::information(this, PROGNAME, "Couldn't open input"); 3422 }
3423 } 3423
3424 3424/*
3425/* 3425 CFileSelector *f = new CFileSelector("text/html", this, NULL, !m_bFloatingDialog, TRUE, TRUE );
3426 CFileSelector *f = new CFileSelector("text/html", this, NULL, !m_bFloatingDialog, TRUE, TRUE ); 3426 int ret = f->exec();
3427 int ret = f->exec(); 3427 qDebug("Return:%d", ret);
3428 qDebug("Return:%d", ret); 3428 DocLnk* doc = f->getDoc();
3429 DocLnk* doc = f->getDoc(); 3429 if (doc != NULL)
3430 if (doc != NULL) 3430 {
3431 { 3431 FILE* fin = fopen((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)), "r");
3432 FILE* fin = fopen((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)), "r"); 3432 QString rt;
3433 QString rt; 3433 rt = "<html><body>\n";
3434 rt = "<html><body>\n"; 3434 int ch = 0;
3435 int ch = 0; 3435 while ((ch = fgetc(fin)) != EOF)
3436 while ((ch = fgetc(fin)) != EOF) 3436 {
3437 { 3437 rt += (char)ch;
3438 rt += (char)ch; 3438 }
3439 } 3439 fclose(fin);
3440 fclose(fin); 3440 rt += "</html></body>\n";
3441 rt += "</html></body>\n"; 3441 if ( doc->name().isEmpty() )
3442 if ( doc->name().isEmpty() ) 3442 {
3443 { 3443 doc->setName(bkmkselector->text(ind));
3444 doc->setName(bkmkselector->text(ind)); 3444 }
3445 } 3445 FileManager fm;
3446 FileManager fm; 3446 fm.saveFile( *doc, rt );
3447 fm.saveFile( *doc, rt ); 3447 qDebug("YES");
3448 qDebug("YES"); 3448 }
3449 } 3449 else
3450 else 3450 {
3451 { 3451 qDebug("NO");
3452 qDebug("NO"); 3452 }
3453 } 3453 delete f;
3454 delete f; 3454*/
3455*/ 3455
3456 3456#endif /* USEQPE */
3457#endif /* USEQPE */ 3457 }
3458 } 3458 break;
3459 break; 3459 }
3460 } 3460}
3461} 3461
3462 3462void QTReaderApp::cancelbkmk()
3463void QTReaderApp::cancelbkmk() 3463{
3464{ 3464 if (m_nBkmkAction == cOpenFile)
3465 if (m_nBkmkAction == cOpenFile) 3465 {
3466 { 3466 QString fn = usefilebrowser();
3467 QString fn = usefilebrowser(); 3467 if (!fn.isEmpty() && QFileInfo(fn).isFile()) openFile(fn);
3468 if (!fn.isEmpty() && QFileInfo(fn).isFile()) openFile(fn); 3468 }
3469 } 3469 showEditTools();
3470 showEditTools(); 3470}
3471} 3471
3472 3472void QTReaderApp::reparastring()
3473void QTReaderApp::reparastring() 3473{
3474{ 3474 m_nRegAction = cRepara;
3475 m_nRegAction = cRepara; 3475 regEdit->setText(reader->m_reparastring);
3476 regEdit->setText(reader->m_reparastring); 3476 do_regedit();
3477 do_regedit(); 3477}
3478} 3478
3479 3479void QTReaderApp::do_reparastring(const QString& _lcn)
3480void QTReaderApp::do_reparastring(const QString& _lcn) 3480{
3481{ 3481 reader->m_reparastring = _lcn;
3482 reader->m_reparastring = _lcn; 3482 if (reader->brepara)
3483 if (reader->brepara) 3483 {
3484 { 3484 reader->bDoUpdates = true;
3485 reader->bDoUpdates = true; 3485 reader->setfilter(reader->getfilter());
3486 reader->setfilter(reader->getfilter()); 3486 }
3487 } 3487}
3488} 3488
3489 3489void QTReaderApp::jump()
3490void QTReaderApp::jump() 3490{
3491{ 3491 m_nRegAction = cJump;
3492 m_nRegAction = cJump; 3492 char lcn[20];
3493 char lcn[20]; 3493 sprintf(lcn, "%lu", reader->pagelocate());
3494 sprintf(lcn, "%lu", reader->pagelocate()); 3494 regEdit->setText(lcn);
3495 regEdit->setText(lcn); 3495 do_regedit();
3496 do_regedit(); 3496}
3497} 3497
3498 3498void QTReaderApp::do_jump(const QString& _lcn)
3499void QTReaderApp::do_jump(const QString& _lcn) 3499{
3500{ 3500 bool ok;
3501 bool ok; 3501 QString lcn = _lcn.stripWhiteSpace();
3502 QString lcn = _lcn.stripWhiteSpace(); 3502 unsigned long ulcn = lcn.toULong(&ok);
3503 unsigned long ulcn = lcn.toULong(&ok); 3503 if (!ok)
3504 if (!ok) 3504 {
3505 { 3505 double pc = 0.0;
3506 double pc = 0.0; 3506#ifdef _WINDOWS
3507#ifdef _WINDOWS 3507 if (lcn.at(lcn.length()-1) == '%')
3508 if (lcn.at(lcn.length()-1) == '%') 3508#else
3509#else 3509 if (lcn[lcn.length()-1] == '%')
3510 if (lcn[lcn.length()-1] == '%') 3510#endif
3511#endif 3511 {
3512 { 3512 lcn = lcn.left(lcn.length()-1);
3513 lcn = lcn.left(lcn.length()-1); 3513 pc = lcn.toDouble(&ok);
3514 pc = lcn.toDouble(&ok); 3514 }
3515 } 3515 else
3516 else 3516 {
3517 { 3517 pc = lcn.toDouble(&ok);
3518 pc = lcn.toDouble(&ok); 3518 }
3519 } 3519 if (ok && 0 <= pc && pc <= 100)
3520 if (ok && 0 <= pc && pc <= 100) 3520 {
3521 { 3521 ulcn = (pc*(reader->buffdoc.endSection()-reader->buffdoc.startSection()))/100 + reader->buffdoc.startSection();
3522 ulcn = (pc*(reader->buffdoc.endSection()-reader->buffdoc.startSection()))/100 + reader->buffdoc.startSection(); 3522 }
3523 } 3523 else
3524 else 3524 {
3525 { 3525 ok = false;
3526 ok = false; 3526 }
3527 } 3527 }
3528 } 3528 if (ok)
3529 if (ok) 3529 reader->locate(ulcn);
3530 reader->locate(ulcn); 3530 else
3531 else 3531 QMessageBox::information(this, PROGNAME, "Must be a number\nor a percentage");
3532 QMessageBox::information(this, PROGNAME, "Must be a number\nor a percentage"); 3532}
3533} 3533
3534 3534void QTReaderApp::do_regaction()
3535void QTReaderApp::do_regaction() 3535{
3536{ 3536 reader->bDoUpdates = false;
3537 reader->bDoUpdates = false; 3537 regBar->hide();
3538 regBar->hide(); 3538#ifdef USEQPE
3539#ifdef USEQPE 3539 Global::hideInputMethod();
3540 Global::hideInputMethod(); 3540#endif
3541#endif 3541 regVisible = false;
3542 regVisible = false; 3542 switch(m_nRegAction)
3543 switch(m_nRegAction) 3543 {
3544 { 3544 case cAutoGen:
3545 case cAutoGen: 3545 do_autogen(regEdit->text());
3546 do_autogen(regEdit->text()); 3546 break;
3547 break; 3547 case cAddBkmk:
3548 case cAddBkmk: 3548 do_addbkmk(regEdit->text());
3549 do_addbkmk(regEdit->text()); 3549 break;
3550 break; 3550 case cRepara:
3551 case cRepara: 3551 do_reparastring(regEdit->text());
3552 do_reparastring(regEdit->text()); 3552 break;
3553 break; 3553 case cJump:
3554 case cJump: 3554 do_jump(regEdit->text());
3555 do_jump(regEdit->text()); 3555 break;
3556 break; 3556/*
3557/* 3557 case cMonoSpace:
3558 case cMonoSpace: 3558 do_mono(regEdit->text());
3559 do_mono(regEdit->text()); 3559 break;
3560 break; 3560*/
3561*/ 3561 case cSetTarget:
3562 case cSetTarget: 3562 do_settarget(regEdit->text());
3563 do_settarget(regEdit->text()); 3563 break;
3564 break; 3564#ifdef _SCROLLPIPE
3565#ifdef _SCROLLPIPE 3565 case cSetPipeTarget:
3566 case cSetPipeTarget: 3566 do_setpipetarget(regEdit->text());
3567 do_setpipetarget(regEdit->text()); 3567 break;
3568 break; 3568#endif
3569#endif 3569 case cSetConfigName:
3570 case cSetConfigName: 3570 // qDebug("Saving config");
3571 // qDebug("Saving config"); 3571 do_saveconfig(regEdit->text(), false);
3572 do_saveconfig(regEdit->text(), false); 3572 break;
3573 break; 3573 }
3574 } 3574// reader->restore();
3575// reader->restore(); 3575// fileBar->show();
3576// fileBar->show(); 3576 reader->setFocus();
3577 reader->setFocus(); 3577// qApp->processEvents();
3578// qApp->processEvents(); 3578 reader->bDoUpdates = true;
3579 reader->bDoUpdates = true; 3579 reader->update();
3580 reader->update(); 3580}
3581} 3581
3582 3582void QTReaderApp::do_settarget(const QString& _txt)
3583void QTReaderApp::do_settarget(const QString& _txt) 3583{
3584{ 3584 int ind = _txt.find('/');
3585 int ind = _txt.find('/'); 3585 if (ind == -1)
3586 if (ind == -1) 3586 {
3587 { 3587 m_targetapp = "";
3588 m_targetapp = ""; 3588 m_targetmsg = "";
3589 m_targetmsg = ""; 3589 QMessageBox::information(this, PROGNAME, "Format is\nappname/messagename");
3590 QMessageBox::information(this, PROGNAME, "Format is\nappname/messagename"); 3590 }
3591 } 3591 else
3592 else 3592 {
3593 { 3593 m_targetapp = _txt.left(ind);
3594 m_targetapp = _txt.left(ind); 3594 m_targetmsg = _txt.right(_txt.length()-ind-1);
3595 m_targetmsg = _txt.right(_txt.length()-ind-1); 3595 }
3596 } 3596}
3597} 3597
3598 3598void QTReaderApp::chooseencoding()
3599void QTReaderApp::chooseencoding() 3599{
3600{ 3600 m_fontSelector->clear();
3601 m_fontSelector->clear(); 3601 m_fontSelector->insertItem("Ascii");
3602 m_fontSelector->insertItem("Ascii"); 3602 m_fontSelector->insertItem("UTF-8");
3603 m_fontSelector->insertItem("UTF-8"); 3603 m_fontSelector->insertItem("UCS-2(BE)");
3604 m_fontSelector->insertItem("UCS-2(BE)"); 3604 m_fontSelector->insertItem("USC-2(LE)");
3605 m_fontSelector->insertItem("USC-2(LE)"); 3605 m_fontSelector->insertItem("Palm");
3606 m_fontSelector->insertItem("Palm"); 3606 for (unicodetable::iterator iter = unicodetable::begin(); iter != unicodetable::end(); iter++)
3607 for (unicodetable::iterator iter = unicodetable::begin(); iter != unicodetable::end(); iter++) 3607 {
3608 { 3608 m_fontSelector->insertItem(iter->mime);
3609 m_fontSelector->insertItem(iter->mime); 3609 } // delete the FontDatabase!!!
3610 } // delete the FontDatabase!!! 3610 m_fontSelector->setCurrentItem (reader->m_encd);
3611 m_fontSelector->setCurrentItem (reader->m_encd); 3611 m_fontAction = cChooseEncoding;
3612 m_fontAction = cChooseEncoding; 3612 m_fontBar->show();
3613 m_fontBar->show(); 3613 m_fontVisible = true;
3614 m_fontVisible = true; 3614}
3615} 3615
3616 3616void QTReaderApp::setfont()
3617void QTReaderApp::setfont() 3617{
3618{ 3618 m_fontSelector->clear();
3619 m_fontSelector->clear(); 3619 {
3620 { 3620 QFontDatabase f;
3621 QFontDatabase f; 3621 QStringList flist = f.families();
3622 QStringList flist = f.families(); 3622 m_fontSelector->insertStringList(flist);
3623 m_fontSelector->insertStringList(flist); 3623 } // delete the FontDatabase!!!
3624 } // delete the FontDatabase!!! 3624
3625 3625 for (int i = 1; i <= m_fontSelector->count(); i++)
3626 for (int i = 1; i <= m_fontSelector->count(); i++) 3626 {
3627 { 3627 if (m_fontSelector->text(i) == reader->m_fontname)
3628 if (m_fontSelector->text(i) == reader->m_fontname) 3628 {
3629 { 3629 m_fontSelector->setCurrentItem(i);
3630 m_fontSelector->setCurrentItem(i); 3630 break;
3631 break; 3631 }
3632 } 3632 }
3633 } 3633 m_fontAction = cChooseFont;
3634 m_fontAction = cChooseFont; 3634 m_fontBar->show();
3635 m_fontBar->show(); 3635 m_fontVisible = true;
3636 m_fontVisible = true; 3636}
3637} 3637
3638 3638void QTReaderApp::setfontHelper(const QString& lcn, int size)
3639void QTReaderApp::setfontHelper(const QString& lcn, int size) 3639{
3640{ 3640 if (size == 0) size = reader->m_fontControl.currentsize();
3641 if (size == 0) size = reader->m_fontControl.currentsize(); 3641 if (m_propogatefontchange)
3642 if (m_propogatefontchange) 3642 {
3643 { 3643 QFont f(lcn, 10);
3644 QFont f(lcn, 10); 3644 bkmkselector->setFont( f );
3645 bkmkselector->setFont( f ); 3645 regEdit->setFont( f );
3646 regEdit->setFont( f ); 3646 searchEdit->setFont( f );
3647 searchEdit->setFont( f ); 3647 m_annoWin->setFont( f );
3648 m_annoWin->setFont( f ); 3648 }
3649 } 3649 reader->m_fontname = lcn;
3650 reader->m_fontname = lcn; 3650 if (!reader->ChangeFont(size))
3651 if (!reader->ChangeFont(size)) 3651 {
3652 { 3652 reader->ChangeFont(size);
3653 reader->ChangeFont(size); 3653 }
3654 } 3654}
3655} 3655
3656 3656void QTReaderApp::do_setencoding(int i)
3657void QTReaderApp::do_setencoding(int i) 3657{
3658{ 3658 qDebug("setencoding:%d", i);
3659 qDebug("setencoding:%d", i); 3659 if (m_fontAction == cChooseEncoding)
3660 if (m_fontAction == cChooseEncoding) 3660 {
3661 { 3661 reader->setencoding(i);
3662 reader->setencoding(i); 3662 }
3663 } 3663 reader->refresh();
3664 reader->refresh(); 3664 m_fontBar->hide();
3665 m_fontBar->hide(); 3665 m_fontVisible = false;
3666 m_fontVisible = false; 3666// qDebug("showedit");
3667// qDebug("showedit"); 3667 if (reader->isVisible()) showEditTools();
3668 if (reader->isVisible()) showEditTools(); 3668// qDebug("showeditdone");
3669// qDebug("showeditdone"); 3669}
3670} 3670
3671 3671void QTReaderApp::do_setfont(const QString& lcn)
3672void QTReaderApp::do_setfont(const QString& lcn) 3672{
3673{ 3673 if (m_fontAction == cChooseFont)
3674 if (m_fontAction == cChooseFont) 3674 {
3675 { 3675 setfontHelper(lcn);
3676 setfontHelper(lcn); 3676 }
3677 } 3677 reader->refresh();
3678 reader->refresh(); 3678 m_fontBar->hide();
3679 m_fontBar->hide(); 3679 m_fontVisible = false;
3680 m_fontVisible = false; 3680 // qDebug("setfont");
3681 // qDebug("setfont"); 3681 //if (reader->isVisible())
3682 //if (reader->isVisible()) 3682 showEditTools();
3683 showEditTools(); 3683// qDebug("showeditdone");
3684// qDebug("showeditdone"); 3684}
3685} 3685
3686 3686void QTReaderApp::do_autogen(const QString& regText)
3687void QTReaderApp::do_autogen(const QString& regText) 3687{
3688{ 3688 unsigned long fs, ts;
3689 unsigned long fs, ts; 3689 reader->sizes(fs,ts);
3690 reader->sizes(fs,ts); 3690// // qDebug("Reg:%s\n", (const tchar*)(regEdit->text()));
3691// // qDebug("Reg:%s\n", (const tchar*)(regEdit->text())); 3691 m_autogenstr = regText;
3692 m_autogenstr = regText; 3692 QRegExp re(regText);
3693 QRegExp re(regText); 3693 CBuffer buff;
3694 CBuffer buff; 3694 if (pBkmklist != NULL) delete pBkmklist;
3695 if (pBkmklist != NULL) delete pBkmklist; 3695 reader->pBkmklist = pBkmklist = new CList<Bkmk>;
3696 reader->pBkmklist = pBkmklist = new CList<Bkmk>; 3696 m_fBkmksChanged = true;
3697 m_fBkmksChanged = true; 3697
3698 3698 pbar->setGeometry(regBar->x(),regBar->y(),regBar->width(), regBar->height());
3699 pbar->setGeometry(regBar->x(),regBar->y(),regBar->width(), regBar->height()); 3699 pbar->show();
3700 pbar->show(); 3700 pbar->raise();
3701 pbar->raise(); 3701 pbar->reset();
3702 pbar->reset(); 3702 reader->update();
3703 reader->update(); 3703 qApp->processEvents();
3704 qApp->processEvents(); 3704 reader->setFocus();
3705 reader->setFocus(); 3705 reader->jumpto(0);
3706 reader->jumpto(0); 3706 int lastpc = 0;
3707 int lastpc = 0; 3707 int i = 0;
3708 int i = 0; 3708 while (i >= 0)
3709 while (i >= 0) 3709 {
3710 { 3710 unsigned int lcn = reader->locate();
3711 unsigned int lcn = reader->locate(); 3711 int pc = (100*lcn)/ts;
3712 int pc = (100*lcn)/ts; 3712 if (pc != lastpc)
3713 if (pc != lastpc) 3713 {
3714 { 3714 pbar->setProgress(pc);
3715 pbar->setProgress(pc); 3715 qApp->processEvents();
3716 qApp->processEvents(); 3716 if (reader->locate() != lcn) reader->jumpto(lcn);
3717 if (reader->locate() != lcn) reader->jumpto(lcn); 3717 reader->setFocus();
3718 reader->setFocus(); 3718 lastpc = pc;
3719 lastpc = pc; 3719 }
3720 } 3720 i = reader->buffdoc.getpara(buff);
3721 i = reader->buffdoc.getpara(buff); 3721#ifdef _UNICODE
3722#ifdef _UNICODE 3722 if (re.match(toQString(buff.data())) != -1)
3723 if (re.match(toQString(buff.data())) != -1) 3723#else
3724#else 3724 if (re.match(buff.data()) != -1)
3725 if (re.match(buff.data()) != -1) 3725#endif
3726#endif 3726 pBkmklist->push_back(Bkmk(buff.data(), NULL, lcn));
3727 pBkmklist->push_back(Bkmk(buff.data(), NULL, lcn)); 3727 }
3728 } 3728 pBkmklist->sort();
3729 pBkmklist->sort(); 3729 pbar->setProgress(100);
3730 pbar->setProgress(100); 3730 qApp->processEvents();
3731 qApp->processEvents(); 3731 pbar->hide();
3732 pbar->hide(); 3732 reader->refresh();
3733 reader->refresh(); 3733}
3734} 3734
3735 3735void QTReaderApp::saveprefs()
3736void QTReaderApp::saveprefs() 3736{
3737{ 3737 do_saveconfig( APPDIR, true );
3738 do_saveconfig( APPDIR, true ); 3738 savefilelist();
3739 savefilelist(); 3739}
3740} 3740
3741 3741/*
3742/* 3742void QTReaderApp::oldFile()
3743void QTReaderApp::oldFile() 3743{
3744{ 3744// qDebug("oldFile called");
3745// qDebug("oldFile called"); 3745 reader->setText(true);
3746 reader->setText(true); 3746// qDebug("settext called");
3747// qDebug("settext called"); 3747 showEditTools();
3748 showEditTools(); 3748// qDebug("showedit called");
3749// qDebug("showedit called"); 3749}
3750} 3750*/
3751*/ 3751
3752 3752/*
3753/* 3753void info_cb(Fl_Widget* o, void* _data)
3754void info_cb(Fl_Widget* o, void* _data) 3754{
3755{ 3755
3756 3756 if (infowin == NULL)
3757 if (infowin == NULL) 3757 {
3758 { 3758
3759 3759 infowin = new Fl_Window(160,240);
3760 infowin = new Fl_Window(160,240); 3760 filename = new Fl_Output(45,5,110,14,"Filename");
3761 filename = new Fl_Output(45,5,110,14,"Filename"); 3761 filesize = new Fl_Output(45,25,110,14,"Filesize");
3762 filesize = new Fl_Output(45,25,110,14,"Filesize"); 3762 textsize = new Fl_Output(45,45,110,14,"Textsize");
3763 textsize = new Fl_Output(45,45,110,14,"Textsize"); 3763 comprat = new CBar(45,65,110,14,"Ratio %");
3764 comprat = new CBar(45,65,110,14,"Ratio %"); 3764 posn = new Fl_Output(45,85,110,14,"Location");
3765 posn = new Fl_Output(45,85,110,14,"Location"); 3765 frcn = new CBar(45,105,110,14,"% Read");
3766 frcn = new CBar(45,105,110,14,"% Read"); 3766 about = new Fl_Multiline_Output(5,125,150,90);
3767 about = new Fl_Multiline_Output(5,125,150,90); 3767 about->value("TWReader - $Name$\n\nA file reader program for the Agenda\n\nReads text, PalmDoc and ppms format files");
3768 about->value("TWReader - $Name$\n\nA file reader program for the Agenda\n\nReads text, PalmDoc and ppms format files"); 3768 Fl_Button *jump_accept = new Fl_Button(62,220,35,14,"Okay");
3769 Fl_Button *jump_accept = new Fl_Button(62,220,35,14,"Okay"); 3769 infowin->set_modal();
3770 infowin->set_modal(); 3770 }
3771 } 3771 if (((reader_ui *)_data)->g_filename[0] != '\0')
3772 if (((reader_ui *)_data)->g_filename[0] != '\0') 3772 {
3773 { 3773 unsigned long fs,ts;
3774 unsigned long fs,ts; 3774 tchar sz[20];
3775 tchar sz[20]; 3775 ((reader_ui *)_data)->input->sizes(fs,ts);
3776 ((reader_ui *)_data)->input->sizes(fs,ts); 3776 unsigned long pl = ((reader_ui *)_data)->input->locate();
3777 unsigned long pl = ((reader_ui *)_data)->input->locate(); 3777
3778 3778 filename->value(((reader_ui *)_data)->g_filename);
3779 filename->value(((reader_ui *)_data)->g_filename); 3779
3780 3780 sprintf(sz,"%u",fs);
3781 sprintf(sz,"%u",fs); 3781 filesize->value(sz);
3782 filesize->value(sz); 3782
3783 3783 sprintf(sz,"%u",ts);
3784 sprintf(sz,"%u",ts); 3784 textsize->value(sz);
3785 textsize->value(sz); 3785
3786 3786 comprat->value(100-(100*fs + (ts >> 1))/ts);
3787 comprat->value(100-(100*fs + (ts >> 1))/ts); 3787
3788 3788 sprintf(sz,"%u",pl);
3789 sprintf(sz,"%u",pl); 3789 posn->value(sz);
3790 posn->value(sz); 3790
3791 3791 frcn->value((100*pl + (ts >> 1))/ts);
3792 frcn->value((100*pl + (ts >> 1))/ts); 3792 }
3793 } 3793 infowin->show();
3794 infowin->show(); 3794}
3795} 3795*/
3796*/ 3796
3797 3797void QTReaderApp::savebkmks()
3798void QTReaderApp::savebkmks() 3798{
3799{ 3799 if (pBkmklist != NULL)
3800 if (pBkmklist != NULL) 3800 {
3801 { 3801#ifndef USEQPE
3802#ifndef USEQPE 3802 QDir d = QDir::home(); // "/"
3803 QDir d = QDir::home(); // "/" 3803 d.cd(APPDIR);
3804 d.cd(APPDIR); 3804 QFileInfo fi(d, reader->m_string);
3805 QFileInfo fi(d, reader->m_string); 3805 BkmkFile bf((const char *)fi.absFilePath(), true, true);
3806 BkmkFile bf((const char *)fi.absFilePath(), true, true); 3806#else /* USEQPE */
3807#else /* USEQPE */ 3807 BkmkFile bf((const char *)Global::applicationFileName(APPDIR,reader->m_string), true, true);
3808 BkmkFile bf((const char *)Global::applicationFileName(APPDIR,reader->m_string), true, true); 3808#endif /* USEQPE */
3809#endif /* USEQPE */ 3809 bf.write(*pBkmklist);
3810 bf.write(*pBkmklist); 3810 }
3811 } 3811 m_fBkmksChanged = false;
3812 m_fBkmksChanged = false; 3812}
3813} 3813
3814 3814void QTReaderApp::readfilelist()
3815void QTReaderApp::readfilelist() 3815{
3816{ 3816#ifndef USEQPE
3817#ifndef USEQPE 3817 QDir d = QDir::home(); // "/"
3818 QDir d = QDir::home(); // "/" 3818 d.cd(APPDIR);
3819 d.cd(APPDIR); 3819 QFileInfo fi(d, ".openfiles");
3820 QFileInfo fi(d, ".openfiles"); 3820 BkmkFile bf((const char *)fi.absFilePath(), false, false);
3821 BkmkFile bf((const char *)fi.absFilePath(), false, false); 3821#else /* USEQPE */
3822#else /* USEQPE */ 3822 BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"), false, false);
3823 BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"), false, false); 3823#endif /* USEQPE */
3824#endif /* USEQPE */ 3824// qDebug("Reading open files");
3825// qDebug("Reading open files"); 3825 pOpenlist = bf.readall();
3826 pOpenlist = bf.readall(); 3826// if (pOpenlist != NULL) qDebug("...with success");
3827// if (pOpenlist != NULL) qDebug("...with success"); 3827// else qDebug("...without success!");
3828// else qDebug("...without success!"); 3828}
3829} 3829
3830 3830void QTReaderApp::savefilelist()
3831void QTReaderApp::savefilelist() 3831{
3832{ 3832 if (pOpenlist != NULL)
3833 if (pOpenlist != NULL) 3833 {
3834 { 3834#ifndef USEQPE
3835#ifndef USEQPE 3835 QDir d = QDir::home(); // "/"
3836 QDir d = QDir::home(); // "/" 3836 d.cd(APPDIR);
3837 d.cd(APPDIR); 3837 QFileInfo fi(d, ".openfiles");
3838 QFileInfo fi(d, ".openfiles"); 3838 BkmkFile bf((const char *)fi.absFilePath(), true, false);
3839 BkmkFile bf((const char *)fi.absFilePath(), true, false); 3839#else /* USEQPE */
3840#else /* USEQPE */ 3840 BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"), true, false);
3841 BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"), true, false); 3841#endif /* USEQPE */
3842#endif /* USEQPE */ 3842 //qDebug("Writing open files");
3843 //qDebug("Writing open files"); 3843 bf.write(*pOpenlist);
3844 bf.write(*pOpenlist); 3844 }
3845 } 3845}
3846} 3846
3847 3847void QTReaderApp::readbkmks()
3848void QTReaderApp::readbkmks() 3848{
3849{ 3849 if (pBkmklist != NULL)
3850 if (pBkmklist != NULL) 3850 {
3851 { 3851 delete pBkmklist;
3852 delete pBkmklist; 3852 }
3853 } 3853 struct stat fnstat;
3854 struct stat fnstat; 3854 struct stat bkstat;
3855 struct stat bkstat; 3855#ifndef USEQPE
3856#ifndef USEQPE 3856 QDir d = QDir::home(); // "/"
3857 QDir d = QDir::home(); // "/" 3857 d.cd(APPDIR);
3858 d.cd(APPDIR); 3858 QFileInfo fi(d, reader->m_string);
3859 QFileInfo fi(d, reader->m_string); 3859#endif /* ! USEQPE */
3860#endif /* ! USEQPE */ 3860 if (
3861 if ( 3861 stat((const char *)reader->m_lastfile, &fnstat) == 0
3862 stat((const char *)reader->m_lastfile, &fnstat) == 0 3862 &&
3863 && 3863#ifndef USEQPE
3864#ifndef USEQPE 3864 stat((const char *)fi.absFilePath(), &bkstat) == 0
3865 stat((const char *)fi.absFilePath(), &bkstat) == 0 3865#else /* USEQPE */
3866#else /* USEQPE */ 3866 stat((const char *)Global::applicationFileName(APPDIR,reader->m_string), &bkstat) == 0
3867 stat((const char *)Global::applicationFileName(APPDIR,reader->m_string), &bkstat) == 0 3867#endif /* USEQPE */
3868#endif /* USEQPE */ 3868 )
3869 ) 3869 {
3870 { 3870 if (bkstat.st_mtime < fnstat.st_mtime)
3871 if (bkstat.st_mtime < fnstat.st_mtime) 3871 {
3872 { 3872#ifndef USEQPE
3873#ifndef USEQPE 3873 unlink((const char *)fi.absFilePath());
3874 unlink((const char *)fi.absFilePath()); 3874#else /* USEQPE */
3875#else /* USEQPE */ 3875 unlink((const char *)Global::applicationFileName(APPDIR,reader->m_string));
3876 unlink((const char *)Global::applicationFileName(APPDIR,reader->m_string)); 3876#endif /* USEQPE */
3877#endif /* USEQPE */ 3877 }
3878 } 3878 }
3879 } 3879
3880 3880#ifndef USEQPE
3881#ifndef USEQPE 3881 BkmkFile bf((const char *)fi.absFilePath(), false, true);
3882 BkmkFile bf((const char *)fi.absFilePath(), false, true); 3882#else /* USEQPE */
3883#else /* USEQPE */ 3883 BkmkFile bf((const char *)Global::applicationFileName(APPDIR,reader->m_string), false, true);
3884 BkmkFile bf((const char *)Global::applicationFileName(APPDIR,reader->m_string), false, true); 3884#endif /* USEQPE */
3885#endif /* USEQPE */ 3885
3886 3886 reader->pBkmklist = pBkmklist = bf.readall();
3887 reader->pBkmklist = pBkmklist = bf.readall(); 3887 m_fBkmksChanged = bf.upgraded();
3888 m_fBkmksChanged = bf.upgraded(); 3888 if (pBkmklist == NULL)
3889 if (pBkmklist == NULL) 3889 {
3890 { 3890 reader->pBkmklist = pBkmklist = reader->getbkmklist();
3891 reader->pBkmklist = pBkmklist = reader->getbkmklist(); 3891 }
3892 } 3892 if (pBkmklist != NULL)
3893 if (pBkmklist != NULL) 3893 pBkmklist->sort();
3894 pBkmklist->sort(); 3894}
3895} 3895
3896 3896void QTReaderApp::addbkmk()
3897void QTReaderApp::addbkmk() 3897{
3898{ 3898 m_nRegAction = cAddBkmk;
3899 m_nRegAction = cAddBkmk; 3899 regEdit->setText(reader->firstword());
3900 regEdit->setText(reader->firstword()); 3900 do_regedit();
3901 do_regedit(); 3901}
3902} 3902
3903 3903void QTReaderApp::do_addbkmk(const QString& text)
3904void QTReaderApp::do_addbkmk(const QString& text) 3904{
3905{ 3905 if (text.isEmpty())
3906 if (text.isEmpty()) 3906 {
3907 { 3907 QMessageBox::information(this, PROGNAME, "Need a name for the bookmark\nSelect add again", 1);
3908 QMessageBox::information(this, PROGNAME, "Need a name for the bookmark\nSelect add again", 1); 3908 }
3909 } 3909 else
3910 else 3910 {
3911 { 3911 if (pBkmklist == NULL) reader->pBkmklist = pBkmklist = new CList<Bkmk>;
3912 if (pBkmklist == NULL) reader->pBkmklist = pBkmklist = new CList<Bkmk>; 3912#ifdef _UNICODE
3913#ifdef _UNICODE 3913 CBuffer buff;
3914 CBuffer buff; 3914 int i = 0;
3915 int i = 0; 3915 for (i = 0; i < text.length(); i++)
3916 for (i = 0; i < text.length(); i++) 3916 {
3917 { 3917 buff[i] = text[i].unicode();
3918 buff[i] = text[i].unicode(); 3918 }
3919 } 3919 buff[i] = 0;
3920 buff[i] = 0; 3920 pBkmklist->push_front(Bkmk(buff.data(), NULL, reader->pagelocate()));
3921 pBkmklist->push_front(Bkmk(buff.data(), NULL, reader->pagelocate())); 3921#else
3922#else 3922 pBkmklist->push_front(Bkmk((const tchar*)text, reader->pagelocate()));
3923 pBkmklist->push_front(Bkmk((const tchar*)text, reader->pagelocate())); 3923#endif
3924#endif 3924 m_fBkmksChanged = true;
3925 m_fBkmksChanged = true; 3925 pBkmklist->sort();
3926 pBkmklist->sort(); 3926 reader->refresh(true);
3927 reader->refresh(true); 3927 }
3928 } 3928}
3929} 3929
3930 3930void QTReaderApp::UpdateStatus()
3931void QTReaderApp::UpdateStatus() 3931{
3932{ 3932 QString status;
3933 QString status; 3933 for (int i = 0; i < m_statusstring.length(); i++)
3934 for (int i = 0; i < m_statusstring.length(); i++) 3934 {
3935 { 3935 if (m_statusstring[i].unicode() == '%')
3936 if (m_statusstring[i].unicode() == '%') 3936 {
3937 { 3937 i++;
3938 i++; 3938 if (i < m_statusstring.length())
3939 if (i < m_statusstring.length()) 3939 {
3940 { 3940 switch (m_statusstring[i].unicode())
3941 switch (m_statusstring[i].unicode()) 3941 {
3942 { 3942 case 'F':
3943 case 'F': 3943 {
3944 { 3944 unsigned long fs,ts;
3945 unsigned long fs,ts; 3945 reader->sizes(fs,ts);
3946 reader->sizes(fs,ts); 3946 status += filesize(ts);
3947 status += filesize(ts); 3947 }
3948 } 3948 break;
3949 break; 3949 case 'f':
3950 case 'f': 3950 {
3951 { 3951 status += filesize(reader->pagelocate());
3952 status += filesize(reader->pagelocate()); 3952 }
3953 } 3953 break;
3954 break; 3954 case 'D':
3955 case 'D': 3955 {
3956 { 3956 status += filesize(reader->buffdoc.endSection()-reader->buffdoc.startSection());
3957 status += filesize(reader->buffdoc.endSection()-reader->buffdoc.startSection()); 3957 }
3958 } 3958 break;
3959 break; 3959 case 'd':
3960 case 'd': 3960 {
3961 { 3961 status += filesize(reader->pagelocate()-reader->buffdoc.startSection());
3962 status += filesize(reader->pagelocate()-reader->buffdoc.startSection()); 3962 }
3963 } 3963 break;
3964 break; 3964 case 'P':
3965 case 'P': 3965 {
3966 { 3966 unsigned long fs,ts;
3967 unsigned long fs,ts; 3967 reader->sizes(fs,ts);
3968 reader->sizes(fs,ts); 3968 status += percent(reader->pagelocate(),ts);
3969 status += percent(reader->pagelocate(),ts); 3969 }
3970 } 3970 break;
3971 break; 3971 case 'p':
3972 case 'p': 3972 {
3973 { 3973 status += percent(reader->pagelocate()-reader->buffdoc.startSection(),reader->buffdoc.endSection()-reader->buffdoc.startSection());
3974 status += percent(reader->pagelocate()-reader->buffdoc.startSection(),reader->buffdoc.endSection()-reader->buffdoc.startSection()); 3974 }
3975 } 3975 break;
3976 break; 3976 case 'z':
3977 case 'z': 3977 {
3978 { 3978 // qDebug("case d");
3979 // qDebug("case d"); 3979 status += QString().setNum(reader->m_fontControl.currentsize()*10);
3980 status += QString().setNum(reader->m_fontControl.currentsize()*10); 3980 }
3981 } 3981 break;
3982 break; 3982 default:
3983 default: 3983 status += m_statusstring[i];
3984 status += m_statusstring[i]; 3984 }
3985 } 3985 }
3986 } 3986 }
3987 } 3987 else
3988 else 3988 {
3989 { 3989 status += m_statusstring[i];
3990 status += m_statusstring[i]; 3990 }
3991 } 3991 }
3992 } 3992 m_prog->setText(status);
3993 m_prog->setText(status); 3993}
3994} 3994
3995 3995void QTReaderApp::OnRedraw()
3996void QTReaderApp::OnRedraw() 3996{
3997{ 3997 if ((pBkmklist != NULL) && (m_bkmkAvail != NULL))
3998 if ((pBkmklist != NULL) && (m_bkmkAvail != NULL)) 3998 {
3999 { 3999 bool found = findNextBookmark(reader->pagelocate());
4000 bool found = findNextBookmark(reader->pagelocate()); 4000 m_bkmkAvail->setEnabled(found);
4001 m_bkmkAvail->setEnabled(found); 4001 }
4002 } 4002 if (m_scrollbar != NULL)
4003 if (m_scrollbar != NULL) 4003 {
4004 { 4004 //qDebug("OnRedraw:[%u, %u]", reader->buffdoc.startSection(), reader->buffdoc.endSection());
4005 //qDebug("OnRedraw:[%u, %u]", reader->buffdoc.startSection(), reader->buffdoc.endSection()); 4005 scrollbar->setRange(reader->buffdoc.startSection(), reader->buffdoc.endSection()-1);
4006 scrollbar->setRange(reader->buffdoc.startSection(), reader->buffdoc.endSection()-1); 4006 scrollbar->setPageStep(reader->locate()-reader->pagelocate());
4007 scrollbar->setPageStep(reader->locate()-reader->pagelocate()); 4007 scrollbar->setValue((reader->m_rotated) ?
4008 scrollbar->setValue((reader->m_rotated) ? 4008 (reader->buffdoc.endSection() - reader->locate()+reader->buffdoc.startSection()) :
4009 (reader->buffdoc.endSection() - reader->locate()+reader->buffdoc.startSection()) : 4009 reader->pagelocate());
4010 reader->pagelocate()); 4010 }
4011 } 4011 if (m_prog->isVisible())
4012 if (m_prog->isVisible()) 4012 {
4013 { 4013 // qDebug("updating status");
4014 // qDebug("updating status"); 4014 UpdateStatus();
4015 UpdateStatus(); 4015 // qDebug("updated status");
4016 // qDebug("updated status"); 4016 }
4017 } 4017}
4018} 4018
4019 4019void QTReaderApp::showAnnotation()
4020void QTReaderApp::showAnnotation() 4020{
4021{ 4021 m_annoWin->setName(toQString(m_anno->name()));
4022 m_annoWin->setName(toQString(m_anno->name())); 4022 m_annoWin->setAnno(toQString(m_anno->anno()));
4023 m_annoWin->setAnno(toQString(m_anno->anno())); 4023 m_annoWin->setColor(QColor(m_anno->red(), m_anno->green(), m_anno->blue()));
4024 m_annoWin->setColor(QColor(m_anno->red(), m_anno->green(), m_anno->blue())); 4024 m_annoIsEditing = false;
4025 m_annoIsEditing = false; 4025#ifdef USEQPE
4026#ifdef USEQPE 4026 Global::showInputMethod();
4027 Global::showInputMethod(); 4027#endif
4028#endif 4028 editorStack->raiseWidget( m_annoWin );
4029 editorStack->raiseWidget( m_annoWin ); 4029 hidetoolbars();
4030 hidetoolbars(); 4030 m_annoWin->setFocus();
4031 m_annoWin->setFocus(); 4031}
4032} 4032
4033 4033void QTReaderApp::OnWordSelected(const QString& wrd, size_t posn, size_t posn2, const QString& line)
4034void QTReaderApp::OnWordSelected(const QString& wrd, size_t posn, size_t posn2, const QString& line) 4034{
4035{ 4035//// qDebug("OnWordSelected(%u):%s", posn, (const char*)wrd);
4036//// qDebug("OnWordSelected(%u):%s", posn, (const char*)wrd); 4036
4037 4037 if (m_doClipboard)
4038 if (m_doClipboard) 4038 {
4039 { 4039 QClipboard* cb = QApplication::clipboard();
4040 QClipboard* cb = QApplication::clipboard(); 4040 cb->setText(wrd);
4041 cb->setText(wrd); 4041#ifdef USEQPE
4042#ifdef USEQPE 4042 if (wrd.length() > 10)
4043 if (wrd.length() > 10) 4043 {
4044 { 4044 Global::statusMessage(wrd.left(8) + "..");
4045 Global::statusMessage(wrd.left(8) + ".."); 4045 }
4046 } 4046 else
4047 else 4047 {
4048 { 4048 Global::statusMessage(wrd);
4049 Global::statusMessage(wrd); 4049 }
4050 } 4050#endif
4051#endif 4051 }
4052 } 4052 if (m_doAnnotation)
4053 if (m_doAnnotation) 4053 {
4054 { 4054 //addAnno(wrd, "Need to be able to edit this", posn);
4055 //addAnno(wrd, "Need to be able to edit this", posn); 4055 m_annoWin->setName(line);
4056 m_annoWin->setName(line); 4056 m_annoWin->setAnno("");
4057 m_annoWin->setAnno(""); 4057 m_annoWin->setPosn(posn);
4058 m_annoWin->setPosn(posn); 4058 m_annoWin->setPosn2(posn2);
4059 m_annoWin->setPosn2(posn2); 4059 m_annoIsEditing = true;
4060 m_annoIsEditing = true; 4060#ifdef USEQPE
4061#ifdef USEQPE 4061 Global::showInputMethod();
4062 Global::showInputMethod(); 4062#endif
4063#endif 4063 editorStack->raiseWidget( m_annoWin );
4064 editorStack->raiseWidget( m_annoWin ); 4064 hidetoolbars();
4065 hidetoolbars(); 4065 }
4066 } 4066#ifdef USEQPE
4067#ifdef USEQPE 4067 if (m_doDictionary)
4068 if (m_doDictionary) 4068 {
4069 { 4069 if (!m_targetapp.isEmpty() && !m_targetmsg.isEmpty())
4070 if (!m_targetapp.isEmpty() && !m_targetmsg.isEmpty()) 4070 {
4071 { 4071 QCopEnvelope e(("QPE/Application/"+m_targetapp).utf8(), (m_targetmsg+"(QString)").utf8());
4072 QCopEnvelope e(("QPE/Application/"+m_targetapp).utf8(), (m_targetmsg+"(QString)").utf8()); 4072 e << wrd;
4073 e << wrd; 4073 }
4074 } 4074 }
4075 } 4075#endif
4076#endif 4076}
4077} 4077
4078 4078void QTReaderApp::doAction(QKeyEvent* e)
4079void QTReaderApp::doAction(QKeyEvent* e) 4079{
4080{ 4080 QMap<orKey,int>::Iterator f = kmap.end();
4081 QMap<orKey,int>::Iterator f = kmap.end(); 4081
4082 4082 if (reader->m_autoScroll)
4083 if (reader->m_autoScroll) 4083 {
4084 { 4084 f = kmap.find(orKey(e->state(), e->key(), true));
4085 f = kmap.find(orKey(e->state(), e->key(), true)); 4085 }
4086 } 4086 if (f == kmap.end())
4087 if (f == kmap.end()) 4087 {
4088 { 4088 f = kmap.find(orKey(e->state(), e->key(), false));
4089 f = kmap.find(orKey(e->state(), e->key(), false)); 4089 }
4090 } 4090
4091 4091 if (f == kmap.end())
4092 if (f == kmap.end()) 4092 {
4093 { 4093 qDebug("doaction (no action) : %d %d %d", e->key(), e->state(), f.data());
4094 qDebug("doaction (no action) : %d %d %d", e->key(), e->state(), f.data()); 4094 e->ignore();
4095 e->ignore(); 4095 }
4096 } 4096 else
4097 else 4097 {
4098 { 4098 qDebug("doaction (some action) : %d %d %d", e->key(), e->state(), f.data());
4099 qDebug("doaction (some action) : %d %d %d", e->key(), e->state(), f.data()); 4099 ActionTypes a = (ActionTypes)f.data();
4100 ActionTypes a = (ActionTypes)f.data(); 4100 e->accept();
4101 e->accept(); 4101 //qDebug("Accepted");
4102 //qDebug("Accepted"); 4102 switch (a)
4103 switch (a) 4103 {
4104 { 4104 case cesGotoLink:
4105 case cesGotoLink: 4105 {
4106 { 4106 reader->gotoLink();
4107 reader->gotoLink(); 4107 }
4108 } 4108 break;
4109 break; 4109 case cesNextLink:
4110 case cesNextLink: 4110 {
4111 { 4111 reader->getNextLink();
4112 reader->getNextLink(); 4112 }
4113 } 4113 break;
4114 break; 4114 case cesInvertColours:
4115 case cesInvertColours: 4115 m_inverse_action->setOn(!reader->bInverse);
4116 m_inverse_action->setOn(!reader->bInverse); 4116 break;
4117 break; 4117 case cesToggleBars:
4118 case cesToggleBars: 4118 m_hidebars = !m_hidebars;
4119 m_hidebars = !m_hidebars; 4119 if (m_hidebars)
4120 if (m_hidebars) 4120 {
4121 { 4121#ifdef USEQPE
4122#ifdef USEQPE 4122 menubar->hide();
4123 menubar->hide(); 4123#endif
4124#endif 4124 if (fileBar != NULL) fileBar->hide();
4125 if (fileBar != NULL) fileBar->hide(); 4125 if (viewBar != NULL) viewBar->hide();
4126 if (viewBar != NULL) viewBar->hide(); 4126 if (navBar != NULL) navBar->hide();
4127 if (navBar != NULL) navBar->hide(); 4127 if (markBar != NULL) markBar->hide();
4128 if (markBar != NULL) markBar->hide(); 4128 mb->hide();
4129 mb->hide(); 4129 }
4130 } 4130 else
4131 else 4131 {
4132 { 4132#ifdef USEQPE
4133#ifdef USEQPE 4133 menubar->show();
4134 menubar->show(); 4134#endif
4135#endif 4135 if (fileBar != NULL) fileBar->show();
4136 if (fileBar != NULL) fileBar->show(); 4136 if (viewBar != NULL) viewBar->show();
4137 if (viewBar != NULL) viewBar->show(); 4137 if (navBar != NULL) navBar->show();
4138 if (navBar != NULL) navBar->show(); 4138 if (markBar != NULL) markBar->show();
4139 if (markBar != NULL) markBar->show(); 4139 mb->show();
4140 mb->show(); 4140 }
4141 } 4141 break;
4142 break; 4142 case cesToggleScrollBar:
4143 case cesToggleScrollBar: 4143 if (m_scrollbar != NULL)
4144 if (m_scrollbar != NULL) 4144 {
4145 { 4145 if (m_scrollbar->isHidden())
4146 if (m_scrollbar->isHidden()) 4146 {
4147 { 4147 m_scrollishidden = false;
4148 m_scrollishidden = false; 4148 m_scrollbar->show();
4149 m_scrollbar->show(); 4149 reader->m_scrollpos = (m_qtscroll == 0) ? m_localscroll : 0;
4150 reader->m_scrollpos = (m_qtscroll == 0) ? m_localscroll : 0; 4150 }
4151 } 4151 else
4152 else 4152 {
4153 { 4153 m_scrollishidden = true;
4154 m_scrollishidden = true; 4154 m_scrollbar->hide();
4155 m_scrollbar->hide(); 4155 reader->m_scrollpos = m_localscroll;
4156 reader->m_scrollpos = m_localscroll; 4156 }
4157 } 4157 }
4158 } 4158 break;
4159 break; 4159 case cesToggleStatusBar:
4160 case cesToggleStatusBar: 4160 if (m_prog != NULL)
4161 if (m_prog != NULL) 4161 {
4162 { 4162 if (m_prog->isHidden())
4163 if (m_prog->isHidden()) 4163 {
4164 { 4164 m_statusishidden = false;
4165 m_statusishidden = false; 4165 m_prog->show();
4166 m_prog->show(); 4166 }
4167 } 4167 else
4168 else 4168 {
4169 { 4169 m_statusishidden = true;
4170 m_statusishidden = true; 4170 m_prog->hide();
4171 m_prog->hide(); 4171 }
4172 } 4172 }
4173 } 4173 break;
4174 break; 4174 case cesOpenFile:
4175 case cesOpenFile: 4175 {
4176 { 4176 qDebug("Open file");
4177 qDebug("Open file"); 4177 fileOpen();
4178 fileOpen(); 4178 }
4179 } 4179 break;
4180 break; 4180 case cesAutoScroll:
4181 case cesAutoScroll: 4181 {
4182 { 4182 reader->setautoscroll(!reader->m_autoScroll);
4183 reader->setautoscroll(!reader->m_autoScroll); 4183 setScrollState(reader->m_autoScroll);
4184 setScrollState(reader->m_autoScroll); 4184 }
4185 } 4185 break;
4186 break; 4186 case cesActionMark:
4187 case cesActionMark: 4187 {
4188 { 4188 addbkmk();
4189 addbkmk(); 4189 }
4190 } 4190 break;
4191 break; 4191 case cesFullScreen:
4192 case cesFullScreen: 4192 {
4193 { 4193 m_actFullscreen->setOn(!m_fullscreen);
4194 m_actFullscreen->setOn(!m_fullscreen); 4194 }
4195 } 4195 break;
4196 break; 4196 case cesRotate:
4197 case cesRotate: 4197 {
4198 { 4198 m_rotate_action->setOn(!reader->m_rotated);
4199 m_rotate_action->setOn(!reader->m_rotated); 4199 }
4200 } 4200 break;
4201 break; 4201 case cesActionAnno:
4202 case cesActionAnno: 4202 {
4203 { 4203 addanno();
4204 addanno(); 4204 }
4205 } 4205 break;
4206 break; 4206 case cesZoomIn:
4207 case cesZoomIn: 4207 zoomin();
4208 zoomin(); 4208 break;
4209 break; 4209 case cesZoomOut:
4210 case cesZoomOut: 4210 zoomout();
4211 zoomout(); 4211 break;
4212 break; 4212 case cesBack:
4213 case cesBack: 4213 reader->goBack();
4214 reader->goBack(); 4214 break;
4215 break; 4215 case cesForward:
4216 case cesForward: 4216 reader->goForward();
4217 reader->goForward(); 4217 break;
4218 break; 4218 case cesHome:
4219 case cesHome: 4219 reader->goHome();
4220 reader->goHome(); 4220 break;
4221 break; 4221 case cesPageUp:
4222 case cesPageUp: 4222 reader->dopageup();
4223 reader->dopageup(); 4223 /*
4224 /* 4224 ftime(&m_lastkeytime);
4225 ftime(&m_lastkeytime); 4225 m_fndelay = m_debounce;
4226 m_fndelay = m_debounce; 4226 //
4227 // 4227 {
4228 { 4228 timeb now;
4229 timeb now; 4229 ftime(&now);
4230 ftime(&now); 4230 m_fndelay = (1000*(now.time - m_lastkeytime.time) + now.millitm)-m_lastkeytime.millitm+100;
4231 m_fndelay = (1000*(now.time - m_lastkeytime.time) + now.millitm)-m_lastkeytime.millitm+100; 4231 }
4232 } 4232 */
4233 */ 4233 break;
4234 break; 4234 case cesPageDown:
4235 case cesPageDown: 4235 reader->dopagedn();
4236 reader->dopagedn(); 4236 /*
4237 /* 4237 ftime(&m_lastkeytime);
4238 ftime(&m_lastkeytime); 4238 m_fndelay = m_debounce;
4239 m_fndelay = m_debounce; 4239 //
4240 // 4240 if (m_debounce != 0)
4241 if (m_debounce != 0) 4241 {
4242 { 4242 timeb now;
4243 timeb now; 4243 ftime(&now);
4244 ftime(&now); 4244 m_fndelay = (1000*(now.time - m_lastkeytime.time) + now.millitm)-m_lastkeytime.millitm+10;
4245 m_fndelay = (1000*(now.time - m_lastkeytime.time) + now.millitm)-m_lastkeytime.millitm+10; 4245 }
4246 } 4246 */
4247 */ 4247 break;
4248 break; 4248 case cesLineUp:
4249 case cesLineUp: 4249 reader->lineUp();
4250 reader->lineUp(); 4250 break;
4251 break; 4251 case cesLineDown:
4252 case cesLineDown: 4252 reader->lineDown();
4253 reader->lineDown(); 4253 break;
4254 break; 4254 case cesStartDoc:
4255 case cesStartDoc: 4255 gotoStart();
4256 gotoStart(); 4256 break;
4257 break; 4257 case cesEndDoc:
4258 case cesEndDoc: 4258 gotoEnd();
4259 gotoEnd(); 4259 break;
4260 break; 4260 case cesScrollMore:
4261 case cesScrollMore: 4261 reader->increaseScroll();
4262 reader->increaseScroll(); 4262 break;
4263 break; 4263 case cesScrollLess:
4264 case cesScrollLess: 4264 reader->reduceScroll();
4265 reader->reduceScroll(); 4265 break;
4266 break; 4266 default:
4267 default: 4267 qDebug("Unknown ActionType:%u", a);
4268 qDebug("Unknown ActionType:%u", a); 4268 break;
4269 break; 4269 }
4270 } 4270 }
4271 } 4271}
4272} 4272
4273 4273void QTReaderApp::setTwoTouch(bool _b) { reader->setTwoTouch(_b); }
4274void QTReaderApp::setTwoTouch(bool _b) { reader->setTwoTouch(_b); } 4274void QTReaderApp::restoreFocus() { reader->setFocus(); }
4275void QTReaderApp::restoreFocus() { reader->setFocus(); } 4275
4276 4276void QTReaderApp::SaveConfig()
4277void QTReaderApp::SaveConfig() 4277{
4278{ 4278 m_nRegAction = cSetConfigName;
4279 m_nRegAction = cSetConfigName; 4279 regEdit->setText(reader->m_string);
4280 regEdit->setText(reader->m_string); 4280 do_regedit();
4281 do_regedit(); 4281}
4282} 4282
4283 4283void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
4284void QTReaderApp::do_saveconfig(const QString& _txt, bool full) 4284{
4285{ 4285// qDebug("do_saveconfig:%s", (const char*)_txt);
4286// qDebug("do_saveconfig:%s", (const char*)_txt); 4286#ifdef USEQPE
4287#ifdef USEQPE 4287 QString configname;
4288 QString configname; 4288 Config::Domain dom;
4289 Config::Domain dom; 4289
4290 4290 if (full)
4291 if (full) 4291 {
4292 { 4292 configname = _txt;
4293 configname = _txt; 4293 dom = Config::User;
4294 dom = Config::User; 4294 }
4295 } 4295 else
4296 else 4296 {
4297 { 4297 configname = Global::applicationFileName(APPDIR "/configs", _txt);
4298 configname = Global::applicationFileName(APPDIR "/configs", _txt); 4298 dom = Config::File;
4299 dom = Config::File; 4299 }
4300 } 4300
4301 4301 Config config(configname, dom);
4302 Config config(configname, dom); 4302 config.setGroup( "View" );
4303 config.setGroup( "View" ); 4303
4304 4304#else
4305#else 4305 QFileInfo fi;
4306 QFileInfo fi; 4306 if (full)
4307 if (full) 4307 {
4308 { 4308 // qDebug("full:%s", (const char*)_txt);
4309 // qDebug("full:%s", (const char*)_txt); 4309 QDir d = QDir::home(); // "/"
4310 QDir d = QDir::home(); // "/" 4310 if ( !d.cd(_txt) )
4311 if ( !d.cd(_txt) ) 4311 { // "/tmp"
4312 { // "/tmp" 4312 qWarning( "Cannot find the \"~/%s\" directory", (const char*)_txt );
4313 qWarning( "Cannot find the \"~/%s\" directory", (const char*)_txt ); 4313 d = QDir::home();
4314 d = QDir::home(); 4314 d.mkdir(_txt);
4315 d.mkdir(_txt); 4315 d.cd(_txt);
4316 d.cd(_txt); 4316 }
4317 } 4317 fi.setFile(d, INIFILE);
4318 fi.setFile(d, INIFILE); 4318 }
4319 } 4319 else
4320 else 4320 {
4321 { 4321 QDir d = QDir::home(); // "/"
4322 QDir d = QDir::home(); // "/" 4322 if ( !d.cd(APPDIR) )
4323 if ( !d.cd(APPDIR) ) 4323 { // "/tmp"
4324 { // "/tmp" 4324 qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
4325 qWarning( "Cannot find the \"~/" APPDIR "\" directory" ); 4325 d = QDir::home();
4326 d = QDir::home(); 4326 d.mkdir(APPDIR);
4327 d.mkdir(APPDIR); 4327 d.cd(APPDIR);
4328 d.cd(APPDIR); 4328 }
4329 } 4329 if ( !d.cd("configs") )
4330 if ( !d.cd("configs") ) 4330 { // "/tmp"
4331 { // "/tmp" 4331 qWarning( "Cannot find the \"~/" APPDIR "/configs\" directory" );
4332 qWarning( "Cannot find the \"~/" APPDIR "/configs\" directory" ); 4332 d = QDir::home();
4333 d = QDir::home(); 4333 d.cd(APPDIR);
4334 d.cd(APPDIR); 4334 d.mkdir("configs");
4335 d.mkdir("configs"); 4335 d.cd("configs");
4336 d.cd("configs"); 4336 }
4337 } 4337 fi.setFile(d, _txt);
4338 fi.setFile(d, _txt); 4338 }
4339 } 4339 //qDebug("Path:%s", (const char*)fi.absFilePath());
4340 //qDebug("Path:%s", (const char*)fi.absFilePath()); 4340 Config config(fi.absFilePath());
4341 Config config(fi.absFilePath()); 4341#endif
4342#endif 4342
4343 4343
4344 4344 config.writeEntry( "StripCr", reader->bstripcr );
4345 config.writeEntry( "StripCr", reader->bstripcr ); 4345 config.writeEntry( "AutoFmt", reader->bautofmt );
4346 config.writeEntry( "AutoFmt", reader->bautofmt ); 4346 config.writeEntry( "TextFmt", reader->btextfmt );
4347 config.writeEntry( "TextFmt", reader->btextfmt ); 4347 config.writeEntry( "StripHtml", reader->bstriphtml );
4348 config.writeEntry( "StripHtml", reader->bstriphtml ); 4348 config.writeEntry( "Dehyphen", reader->bdehyphen );
4349 config.writeEntry( "Dehyphen", reader->bdehyphen ); 4349 config.writeEntry( "Depluck", reader->bdepluck );
4350 config.writeEntry( "Depluck", reader->bdepluck ); 4350 config.writeEntry( "Dejpluck", reader->bdejpluck );
4351 config.writeEntry( "Dejpluck", reader->bdejpluck ); 4351 config.writeEntry( "OneSpace", reader->bonespace );
4352 config.writeEntry( "OneSpace", reader->bonespace ); 4352 config.writeEntry( "Unindent", reader->bunindent );
4353 config.writeEntry( "Unindent", reader->bunindent ); 4353 config.writeEntry( "Repara", reader->brepara );
4354 config.writeEntry( "Repara", reader->brepara ); 4354 config.writeEntry( "ReparaString", reader->m_reparastring);
4355 config.writeEntry( "ReparaString", reader->m_reparastring); 4355 config.writeEntry( "BackgroundType" , (int)m_bgtype );
4356 config.writeEntry( "BackgroundType" , (int)m_bgtype ); 4356 config.writeEntry( "Theme", m_themename );
4357 config.writeEntry( "Theme", m_themename ); 4357 config.writeEntry( "DoubleSpace", reader->bdblspce );
4358 config.writeEntry( "DoubleSpace", reader->bdblspce ); 4358 config.writeEntry( "Indent", reader->bindenter );
4359 config.writeEntry( "Indent", reader->bindenter ); 4359 config.writeEntry( "FontSize", (int)(reader->m_fontControl.currentsize()) );
4360 config.writeEntry( "FontSize", (int)(reader->m_fontControl.currentsize()) ); 4360 config.writeEntry( "ScrollDelay", reader->m_delay);
4361 config.writeEntry( "ScrollDelay", reader->m_delay); 4361 config.writeEntry( "ScrollStep", reader->m_scrollstep);
4362 config.writeEntry( "ScrollStep", reader->m_scrollstep); 4362 config.writeEntry( "ScrollType", reader->m_scrolltype );
4363 config.writeEntry( "ScrollType", reader->m_scrolltype ); 4363 if (full)
4364 if (full) 4364 {
4365 { 4365 config.writeEntry("Debounce", m_debounce);
4366 config.writeEntry("Debounce", m_debounce); 4366 config.writeEntry("FloatDialogs", m_bFloatingDialog);
4367 config.writeEntry("FloatDialogs", m_bFloatingDialog); 4367 reader->m_lastposn = reader->pagelocate();
4368 reader->m_lastposn = reader->pagelocate(); 4368 config.writeEntry( "LastFile", reader->m_lastfile );
4369 config.writeEntry( "LastFile", reader->m_lastfile ); 4369 config.writeEntry( "LastPosn", (int)(reader->pagelocate()) );
4370 config.writeEntry( "LastPosn", (int)(reader->pagelocate()) ); 4370 }
4371 } 4371 config.writeEntry( "PageMode", reader->m_bpagemode );
4372 config.writeEntry( "PageMode", reader->m_bpagemode ); 4372 config.writeEntry( "MonoSpaced", reader->m_bMonoSpaced );
4373 config.writeEntry( "MonoSpaced", reader->m_bMonoSpaced ); 4373 config.writeEntry( "SwapMouse", reader->m_swapmouse);
4374 config.writeEntry( "SwapMouse", reader->m_swapmouse); 4374 config.writeEntry( "IsRotated", reader->m_rotated );
4375 config.writeEntry( "IsRotated", reader->m_rotated ); 4375 config.writeEntry("StatusContent", m_statusstring);
4376 config.writeEntry("StatusContent", m_statusstring); 4376 config.writeEntry("StatusHidden", m_statusishidden);
4377 config.writeEntry("StatusHidden", m_statusishidden); 4377 config.writeEntry( "Background", m_background );
4378 config.writeEntry( "Background", m_background ); 4378 config.writeEntry( "Foreground", m_foreground );
4379 config.writeEntry( "Foreground", m_foreground ); 4379 config.writeEntry( "ScrollColour", m_scrollcolor );
4380 config.writeEntry( "ScrollColour", m_scrollcolor ); 4380 config.writeEntry( "ScrollBarColour", m_scrollbarcolor );
4381 config.writeEntry( "ScrollBarColour", m_scrollbarcolor ); 4381 config.writeEntry( "Hyphenate", reader->hyphenate );
4382 config.writeEntry( "Hyphenate", reader->hyphenate ); 4382 // config.writeEntry( "CustomHyphen", reader->buffdoc.getCustomHyphen() );
4383 // config.writeEntry( "CustomHyphen", reader->buffdoc.getCustomHyphen() ); 4383 config.writeEntry( "Fontname", reader->m_fontname );
4384 config.writeEntry( "Fontname", reader->m_fontname ); 4384 config.writeEntry( "Encoding", reader->m_encd );
4385 config.writeEntry( "Encoding", reader->m_encd ); 4385 config.writeEntry( "CharSpacing", reader->m_charpc );
4386 config.writeEntry( "CharSpacing", reader->m_charpc ); 4386 config.writeEntry( "Overlap", (int)(reader->m_overlap) );
4387 config.writeEntry( "Overlap", (int)(reader->m_overlap) ); 4387 config.writeEntry( "Top Margin", (int)reader->m_abstopmargin );
4388 config.writeEntry( "Top Margin", (int)reader->m_abstopmargin ); 4388 config.writeEntry( "Bottom Margin", (int)reader->m_absbottommargin );
4389 config.writeEntry( "Bottom Margin", (int)reader->m_absbottommargin ); 4389 config.writeEntry( "Left Margin", (int)reader->m_absleft_border );
4390 config.writeEntry( "Left Margin", (int)reader->m_absleft_border ); 4390 config.writeEntry( "Right Margin", (int)reader->m_absright_border );
4391 config.writeEntry( "Right Margin", (int)reader->m_absright_border ); 4391 config.writeEntry( "TargetApp", m_targetapp );
4392 config.writeEntry( "TargetApp", m_targetapp ); 4392 config.writeEntry( "TargetMsg", m_targetmsg );
4393 config.writeEntry( "TargetMsg", m_targetmsg ); 4393#ifdef _SCROLLPIPE
4394#ifdef _SCROLLPIPE 4394 config.writeEntry( "PipeTarget", reader->m_pipetarget );
4395 config.writeEntry( "PipeTarget", reader->m_pipetarget ); 4395 config.writeEntry( "PauseAfterPara", reader->m_pauseAfterEachPara );
4396 config.writeEntry( "PauseAfterPara", reader->m_pauseAfterEachPara ); 4396#endif
4397#endif 4397 config.writeEntry( "TwoTouch", m_twoTouch );
4398 config.writeEntry( "TwoTouch", m_twoTouch ); 4398 config.writeEntry( "Annotation", m_doAnnotation);
4399 config.writeEntry( "Annotation", m_doAnnotation); 4399 config.writeEntry( "Dictionary", m_doDictionary);
4400 config.writeEntry( "Dictionary", m_doDictionary); 4400 config.writeEntry( "Clipboard", m_doClipboard);
4401 config.writeEntry( "Clipboard", m_doClipboard); 4401 /*
4402 /* 4402 config.writeEntry( "SpaceTarget", m_spaceTarget);
4403 config.writeEntry( "SpaceTarget", m_spaceTarget); 4403 config.writeEntry( "EscapeTarget", m_escapeTarget);
4404 config.writeEntry( "EscapeTarget", m_escapeTarget); 4404 config.writeEntry( "ReturnTarget", m_returnTarget);
4405 config.writeEntry( "ReturnTarget", m_returnTarget); 4405 config.writeEntry( "LeftTarget", m_leftTarget);
4406 config.writeEntry( "LeftTarget", m_leftTarget); 4406 config.writeEntry( "RightTarget", m_rightTarget);
4407 config.writeEntry( "RightTarget", m_rightTarget); 4407 config.writeEntry( "UpTarget", m_upTarget);
4408 config.writeEntry( "UpTarget", m_upTarget); 4408 config.writeEntry( "DownTarget", m_downTarget);
4409 config.writeEntry( "DownTarget", m_downTarget); 4409 config.writeEntry("LeftScroll", m_leftScroll);
4410 config.writeEntry("LeftScroll", m_leftScroll); 4410 config.writeEntry("RightScroll", m_rightScroll);
4411 config.writeEntry("RightScroll", m_rightScroll); 4411 config.writeEntry("UpScroll", m_upScroll);
4412 config.writeEntry("UpScroll", m_upScroll); 4412 config.writeEntry("DownScroll", m_downScroll);
4413 config.writeEntry("DownScroll", m_downScroll); 4413 */
4414 */ 4414 config.writeEntry( "Repalm", reader->brepalm );
4415 config.writeEntry( "Repalm", reader->brepalm ); 4415 config.writeEntry( "HideScrollBar", m_scrollishidden );
4416 config.writeEntry( "HideScrollBar", m_scrollishidden ); 4416 config.writeEntry( "Kern", reader->bkern );
4417 config.writeEntry( "Kern", reader->bkern ); 4417 config.writeEntry( "Remap", reader->bremap );
4418 config.writeEntry( "Remap", reader->bremap ); 4418 config.writeEntry( "Peanut", reader->bpeanut );
4419 config.writeEntry( "Peanut", reader->bpeanut ); 4419 config.writeEntry( "MakeBold", reader->bmakebold );
4420 config.writeEntry( "MakeBold", reader->bmakebold ); 4420 config.writeEntry( "Continuous", reader->m_continuousDocument );
4421 config.writeEntry( "Continuous", reader->m_continuousDocument ); 4421 config.writeEntry( "FullJust", reader->bfulljust );
4422 config.writeEntry( "FullJust", reader->bfulljust ); 4422 // config.writeEntry( "Negative", reader->bNegative );
4423 // config.writeEntry( "Negative", reader->bNegative ); 4423 config.writeEntry( "Inverse", reader->bInverse );
4424 config.writeEntry( "Inverse", reader->bInverse ); 4424 config.writeEntry( "FixGraphics", reader->m_fontControl.FixGraphics());
4425 config.writeEntry( "FixGraphics", reader->m_fontControl.FixGraphics()); 4425 config.writeEntry( "ExtraSpace", reader->getextraspace() );
4426 config.writeEntry( "ExtraSpace", reader->getextraspace() ); 4426 config.writeEntry( "ExtraLead", reader->getlead() );
4427 config.writeEntry( "ExtraLead", reader->getlead() ); 4427 config.writeEntry( "Basesize", (int)reader->getBaseSize());
4428 config.writeEntry( "Basesize", (int)reader->getBaseSize()); 4428 config.writeEntry( "RequestorFontChange", m_propogatefontchange);
4429 config.writeEntry( "RequestorFontChange", m_propogatefontchange); 4429#ifdef USEQPE
4430#ifdef USEQPE 4430 config.writeEntry( "GrabKeyboard", m_grabkeyboard );
4431 config.writeEntry( "GrabKeyboard", m_grabkeyboard ); 4431#endif
4432#endif 4432 if (full)
4433 if (full) 4433 {
4434 { 4434 config.setGroup( "Toolbar" );
4435 config.setGroup( "Toolbar" ); 4435 config.writeEntry("QTScrollBar", m_qtscroll);
4436 config.writeEntry("QTScrollBar", m_qtscroll); 4436 config.writeEntry("LocalScrollBar", m_localscroll);
4437 config.writeEntry("LocalScrollBar", m_localscroll); 4437 config.writeEntry("Movable", m_tbmovesave);
4438 config.writeEntry("Movable", m_tbmovesave); 4438 config.writeEntry("Policy", m_tbpolsave);
4439 config.writeEntry("Policy", m_tbpolsave); 4439 config.writeEntry("Position", m_tbposition);
4440 config.writeEntry("Position", m_tbposition); 4440#ifndef USEQPE
4441#ifndef USEQPE 4441 if (!isMaximized() && !isMinimized())
4442 if (!isMaximized() && !isMinimized()) 4442 {
4443 { 4443 config.setGroup( "Geometry" );
4444 config.setGroup( "Geometry" ); 4444 config.writeEntry( "x", x() );
4445 config.writeEntry( "x", x() ); 4445 config.writeEntry( "y", y() );
4446 config.writeEntry( "y", y() ); 4446 config.writeEntry( "width", width() );
4447 config.writeEntry( "width", width() ); 4447 config.writeEntry( "height", height() );
4448 config.writeEntry( "height", height() ); 4448 }
4449 } 4449#endif
4450#endif 4450 }
4451 } 4451}
4452} 4452
4453 4453#ifdef _SCROLLPIPE
4454#ifdef _SCROLLPIPE 4454void QTReaderApp::setpipetarget()
4455void QTReaderApp::setpipetarget() 4455{
4456{ 4456 m_nRegAction = cSetPipeTarget;
4457 m_nRegAction = cSetPipeTarget; 4457 QString text = (reader->m_pipetarget.isEmpty()) ? QString("") : reader->m_pipetarget;
4458 QString text = (reader->m_pipetarget.isEmpty()) ? QString("") : reader->m_pipetarget; 4458 regEdit->setText(text);
4459 regEdit->setText(text); 4459 do_regedit();
4460 do_regedit(); 4460}
4461} 4461
4462 4462void QTReaderApp::do_setpipetarget(const QString& _txt)
4463void QTReaderApp::do_setpipetarget(const QString& _txt) 4463{
4464{ 4464 reader->m_pipetarget = _txt;
4465 reader->m_pipetarget = _txt; 4465}
4466} 4466
4467 4467void QTReaderApp::setpause(bool sfs)
4468void QTReaderApp::setpause(bool sfs) 4468{
4469{ 4469 reader->m_pauseAfterEachPara = sfs;
4470 reader->m_pauseAfterEachPara = sfs; 4470}
4471} 4471#endif
4472#endif 4472
4473 4473void QTReaderApp::monospace(bool _b)
4474void QTReaderApp::monospace(bool _b) 4474{
4475{ 4475 reader->setmono(_b);
4476 reader->setmono(_b); 4476}
4477} 4477
4478 4478bool QTReaderApp::readconfig(const QString& dirname, const QString& _txt, bool full=false)
4479bool QTReaderApp::readconfig(const QString& dirname, const QString& _txt, bool full=false) 4479{
4480{ 4480#ifdef USEQPE
4481#ifdef USEQPE 4481 QString configname;
4482 QString configname; 4482 Config::Domain dom;
4483 Config::Domain dom; 4483
4484 4484 if (full)
4485 if (full) 4485 {
4486 { 4486 configname = _txt;
4487 configname = _txt; 4487 dom = Config::User;
4488 dom = Config::User; 4488 }
4489 } 4489 else
4490 else 4490 {
4491 { 4491 configname = Global::applicationFileName(dirname, _txt);
4492 configname = Global::applicationFileName(dirname, _txt); 4492 QFileInfo fm(configname);
4493 QFileInfo fm(configname); 4493 if ( !fm.exists() ) return false;
4494 if ( !fm.exists() ) return false; 4494 dom = Config::File;
4495 dom = Config::File; 4495 }
4496 } 4496
4497 4497 Config config(configname, dom);
4498 Config config(configname, dom); 4498 config.setGroup( "View" );
4499 config.setGroup( "View" ); 4499
4500 4500#else
4501#else 4501 QString fullname;
4502 QString fullname; 4502 if (full)
4503 if (full) 4503 {
4504 { 4504 fullname = QDir::homeDirPath() + "/" + _txt + "/" + INIFILE;
4505 fullname = QDir::homeDirPath() + "/" + _txt + "/" + INIFILE; 4505 }
4506 } 4506 else
4507 else 4507 {
4508 { 4508 fullname = QDir::homeDirPath() + "/" + dirname + "/" + _txt;
4509 fullname = QDir::homeDirPath() + "/" + dirname + "/" + _txt; 4509 }
4510 } 4510 if (!QFile::exists(fullname)) return false;
4511 if (!QFile::exists(fullname)) return false; 4511
4512 4512 Config config(fullname);
4513 Config config(fullname); 4513#endif
4514#endif 4514 if (full)
4515 if (full) 4515 {
4516 { 4516 config.setGroup("Toolbar");
4517 config.setGroup("Toolbar"); 4517 m_tbmovesave = m_tbmove = config.readBoolEntry("Movable", m_tbmovesave);
4518 m_tbmovesave = m_tbmove = config.readBoolEntry("Movable", m_tbmovesave); 4518 m_tbpolsave = m_tbpol = (ToolbarPolicy)config.readNumEntry("Policy", m_tbpolsave);
4519 m_tbpolsave = m_tbpol = (ToolbarPolicy)config.readNumEntry("Policy", m_tbpolsave); 4519 m_tbposition = (ToolBarDock)config.readNumEntry("Position", m_tbposition);
4520 m_tbposition = (ToolBarDock)config.readNumEntry("Position", m_tbposition); 4520 }
4521 } 4521 config.setGroup( "View" );
4522 config.setGroup( "View" ); 4522 m_bFloatingDialog = config.readBoolEntry("FloatDialogs", m_bFloatingDialog);
4523 m_bFloatingDialog = config.readBoolEntry("FloatDialogs", m_bFloatingDialog); 4523 reader->bstripcr = config.readBoolEntry( "StripCr", reader->bstripcr );
4524 reader->bstripcr = config.readBoolEntry( "StripCr", reader->bstripcr ); 4524 reader->bfulljust = config.readBoolEntry( "FullJust", reader->bfulljust );
4525 reader->bfulljust = config.readBoolEntry( "FullJust", reader->bfulljust ); 4525 reader->bInverse = config.readBoolEntry( "Inverse", reader->bInverse );
4526 reader->bInverse = config.readBoolEntry( "Inverse", reader->bInverse ); 4526 // reader->bNegative = config.readBoolEntry( "Negative", false );
4527 // reader->bNegative = config.readBoolEntry( "Negative", false ); 4527 reader->m_fontControl.FixGraphics(config.readBoolEntry( "FixGraphics", reader->m_fontControl.FixGraphics() ));
4528 reader->m_fontControl.FixGraphics(config.readBoolEntry( "FixGraphics", reader->m_fontControl.FixGraphics() )); 4528 reader->setextraspace(config.readNumEntry( "ExtraSpace", reader->getextraspace() ));
4529 reader->setextraspace(config.readNumEntry( "ExtraSpace", reader->getextraspace() )); 4529 reader->setlead(config.readNumEntry( "ExtraLead", reader->getlead() ));
4530 reader->setlead(config.readNumEntry( "ExtraLead", reader->getlead() )); 4530 reader->btextfmt = config.readBoolEntry( "TextFmt", reader->btextfmt );
4531 reader->btextfmt = config.readBoolEntry( "TextFmt", reader->btextfmt ); 4531 reader->bautofmt = config.readBoolEntry( "AutoFmt", reader->bautofmt );
4532 reader->bautofmt = config.readBoolEntry( "AutoFmt", reader->bautofmt ); 4532 reader->bstriphtml = config.readBoolEntry( "StripHtml", reader->bstriphtml );
4533 reader->bstriphtml = config.readBoolEntry( "StripHtml", reader->bstriphtml ); 4533 reader->bpeanut = config.readBoolEntry( "Peanut", reader->bpeanut );
4534 reader->bpeanut = config.readBoolEntry( "Peanut", reader->bpeanut ); 4534 reader->bdehyphen = config.readBoolEntry( "Dehyphen", reader->bdehyphen );
4535 reader->bdehyphen = config.readBoolEntry( "Dehyphen", reader->bdehyphen ); 4535 reader->bdepluck = config.readBoolEntry( "Depluck", reader->bdepluck );
4536 reader->bdepluck = config.readBoolEntry( "Depluck", reader->bdepluck ); 4536 reader->bdejpluck = config.readBoolEntry( "Dejpluck", reader->bdejpluck );
4537 reader->bdejpluck = config.readBoolEntry( "Dejpluck", reader->bdejpluck ); 4537 reader->bonespace = config.readBoolEntry( "OneSpace", reader->bonespace );
4538 reader->bonespace = config.readBoolEntry( "OneSpace", reader->bonespace ); 4538 reader->bunindent = config.readBoolEntry( "Unindent", reader->bunindent );
4539 reader->bunindent = config.readBoolEntry( "Unindent", reader->bunindent ); 4539 reader->brepara = config.readBoolEntry( "Repara", reader->brepara );
4540 reader->brepara = config.readBoolEntry( "Repara", reader->brepara ); 4540 reader->m_reparastring = config.readEntry( "ReparaString", reader->m_reparastring);
4541 reader->m_reparastring = config.readEntry( "ReparaString", reader->m_reparastring); 4541 m_bgtype = (bground)config.readNumEntry( "BackgroundType" , m_bgtype );
4542 m_bgtype = (bground)config.readNumEntry( "BackgroundType" , m_bgtype ); 4542 m_themename = config.readEntry("Theme", m_themename );
4543 m_themename = config.readEntry("Theme", m_themename ); 4543 reader->bdblspce = config.readBoolEntry( "DoubleSpace", reader->bdblspce );
4544 reader->bdblspce = config.readBoolEntry( "DoubleSpace", reader->bdblspce ); 4544 reader->bindenter = config.readNumEntry( "Indent", reader->bindenter );
4545 reader->bindenter = config.readNumEntry( "Indent", reader->bindenter ); 4545 reader->m_textsize = config.readNumEntry( "FontSize", reader->m_textsize );
4546 reader->m_textsize = config.readNumEntry( "FontSize", reader->m_textsize ); 4546 reader->m_delay = config.readNumEntry( "ScrollDelay", reader->m_delay);
4547 reader->m_delay = config.readNumEntry( "ScrollDelay", reader->m_delay); 4547 reader->m_scrollstep = config.readNumEntry( "ScrollStep", reader->m_scrollstep);
4548 reader->m_scrollstep = config.readNumEntry( "ScrollStep", reader->m_scrollstep); 4548 reader->m_scrolltype = config.readNumEntry( "ScrollType", reader->m_scrolltype);
4549 reader->m_scrolltype = config.readNumEntry( "ScrollType", reader->m_scrolltype); 4549 if (full)
4550 if (full) 4550 {
4551 { 4551 reader->m_lastfile = config.readEntry( "LastFile", reader->m_lastfile );
4552 reader->m_lastfile = config.readEntry( "LastFile", reader->m_lastfile ); 4552 reader->m_lastposn = config.readNumEntry( "LastPosn", reader->m_lastposn );
4553 reader->m_lastposn = config.readNumEntry( "LastPosn", reader->m_lastposn ); 4553 }
4554 } 4554 reader->m_bpagemode = config.readBoolEntry( "PageMode", reader->m_bpagemode );
4555 reader->m_bpagemode = config.readBoolEntry( "PageMode", reader->m_bpagemode ); 4555 reader->m_bMonoSpaced = config.readBoolEntry( "MonoSpaced", reader->m_bMonoSpaced);
4556 reader->m_bMonoSpaced = config.readBoolEntry( "MonoSpaced", reader->m_bMonoSpaced); 4556 reader->m_rotated = config.readBoolEntry( "IsRotated", reader->m_rotated );
4557 reader->m_rotated = config.readBoolEntry( "IsRotated", reader->m_rotated ); 4557 m_statusstring = config.readEntry("StatusContent", m_statusstring);
4558 m_statusstring = config.readEntry("StatusContent", m_statusstring); 4558 m_statusishidden = config.readBoolEntry("StatusHidden", m_statusishidden);
4559 m_statusishidden = config.readBoolEntry("StatusHidden", m_statusishidden); 4559 m_background = config.readNumEntry( "Background", m_background );
4560 m_background = config.readNumEntry( "Background", m_background ); 4560 reader->setBackground(getcolour(m_background));
4561 reader->setBackground(getcolour(m_background)); 4561 m_foreground = config.readNumEntry( "Foreground", m_foreground );
4562 m_foreground = config.readNumEntry( "Foreground", m_foreground ); 4562 reader->setForeground(getcolour(m_foreground));
4563 reader->setForeground(getcolour(m_foreground)); 4563 m_scrollcolor = config.readNumEntry( "ScrollColour", m_scrollcolor);
4564 m_scrollcolor = config.readNumEntry( "ScrollColour", m_scrollcolor); 4564 setscrollcolour();
4565 setscrollcolour(); 4565 m_scrollbarcolor = config.readNumEntry( "ScrollBarColour", m_scrollbarcolor);
4566 m_scrollbarcolor = config.readNumEntry( "ScrollBarColour", m_scrollbarcolor); 4566 setscrollbarcolour();
4567 setscrollbarcolour(); 4567 reader->hyphenate = config.readBoolEntry( "Hyphenate", reader->hyphenate );
4568 reader->hyphenate = config.readBoolEntry( "Hyphenate", reader->hyphenate ); 4568 // reader->buffdoc.setCustomHyphen(config.readBoolEntry( "CustomHyphen", false ));
4569 // reader->buffdoc.setCustomHyphen(config.readBoolEntry( "CustomHyphen", false )); 4569 reader->m_swapmouse = config.readBoolEntry( "SwapMouse", reader->m_swapmouse);
4570 reader->m_swapmouse = config.readBoolEntry( "SwapMouse", reader->m_swapmouse); 4570 reader->m_fontname = config.readEntry( "Fontname", reader->m_fontname );
4571 reader->m_fontname = config.readEntry( "Fontname", reader->m_fontname ); 4571 reader->m_encd = config.readNumEntry( "Encoding", reader->m_encd );
4572 reader->m_encd = config.readNumEntry( "Encoding", reader->m_encd ); 4572 reader->m_charpc = config.readNumEntry( "CharSpacing", reader->m_charpc );
4573 reader->m_charpc = config.readNumEntry( "CharSpacing", reader->m_charpc ); 4573 reader->m_overlap = config.readNumEntry( "Overlap", reader->m_overlap );
4574 reader->m_overlap = config.readNumEntry( "Overlap", reader->m_overlap ); 4574 reader->m_abstopmargin = config.readNumEntry( "Top Margin", reader->m_abstopmargin );
4575 reader->m_abstopmargin = config.readNumEntry( "Top Margin", reader->m_abstopmargin ); 4575 reader->m_absbottommargin = config.readNumEntry( "Bottom Margin", reader->m_absbottommargin );
4576 reader->m_absbottommargin = config.readNumEntry( "Bottom Margin", reader->m_absbottommargin ); 4576 reader->m_absleft_border = config.readNumEntry( "Left Margin", reader->m_absleft_border );
4577 reader->m_absleft_border = config.readNumEntry( "Left Margin", reader->m_absleft_border ); 4577 reader->m_absright_border = config.readNumEntry( "Right Margin", reader->m_absright_border );
4578 reader->m_absright_border = config.readNumEntry( "Right Margin", reader->m_absright_border ); 4578 m_scrollishidden = config.readBoolEntry( "HideScrollBar", m_scrollishidden );
4579 m_scrollishidden = config.readBoolEntry( "HideScrollBar", m_scrollishidden ); 4579 reader->brepalm = config.readBoolEntry( "Repalm", reader->brepalm );
4580 reader->brepalm = config.readBoolEntry( "Repalm", reader->brepalm ); 4580 reader->bkern = config.readBoolEntry( "Kern", reader->bkern );
4581 reader->bkern = config.readBoolEntry( "Kern", reader->bkern ); 4581 reader->bremap = config.readBoolEntry( "Remap", reader->bremap );
4582 reader->bremap = config.readBoolEntry( "Remap", reader->bremap ); 4582 reader->bmakebold = config.readBoolEntry( "MakeBold", reader->bmakebold );
4583 reader->bmakebold = config.readBoolEntry( "MakeBold", reader->bmakebold ); 4583 reader->setContinuous(config.readBoolEntry( "Continuous", reader->m_continuousDocument ));
4584 reader->setContinuous(config.readBoolEntry( "Continuous", reader->m_continuousDocument )); 4584 m_targetapp = config.readEntry( "TargetApp", m_targetapp );
4585 m_targetapp = config.readEntry( "TargetApp", m_targetapp ); 4585 m_targetmsg = config.readEntry( "TargetMsg", m_targetmsg );
4586 m_targetmsg = config.readEntry( "TargetMsg", m_targetmsg ); 4586#ifdef _SCROLLPIPE
4587#ifdef _SCROLLPIPE 4587 reader->m_pipetarget = config.readEntry( "PipeTarget", reader->m_pipetarget );
4588 reader->m_pipetarget = config.readEntry( "PipeTarget", reader->m_pipetarget ); 4588 reader->m_pauseAfterEachPara = config.readBoolEntry( "PauseAfterPara", reader->m_pauseAfterEachPara );
4589 reader->m_pauseAfterEachPara = config.readBoolEntry( "PauseAfterPara", reader->m_pauseAfterEachPara ); 4589#endif
4590#endif 4590 m_twoTouch = config.readBoolEntry( "TwoTouch", m_twoTouch);
4591 m_twoTouch = config.readBoolEntry( "TwoTouch", m_twoTouch); 4591 m_doAnnotation = config.readBoolEntry( "Annotation", m_doAnnotation);
4592 m_doAnnotation = config.readBoolEntry( "Annotation", m_doAnnotation); 4592 m_doDictionary = config.readBoolEntry( "Dictionary", m_doDictionary);
4593 m_doDictionary = config.readBoolEntry( "Dictionary", m_doDictionary); 4593 m_doClipboard = config.readBoolEntry( "Clipboard", m_doClipboard);
4594 m_doClipboard = config.readBoolEntry( "Clipboard", m_doClipboard); 4594#ifdef USEQPE
4595#ifdef USEQPE 4595 m_grabkeyboard = config.readBoolEntry( "GrabKeyboard", m_grabkeyboard);
4596 m_grabkeyboard = config.readBoolEntry( "GrabKeyboard", m_grabkeyboard); 4596#endif
4597#endif 4597 m_propogatefontchange = config.readBoolEntry( "RequestorFontChange", m_propogatefontchange);
4598 m_propogatefontchange = config.readBoolEntry( "RequestorFontChange", m_propogatefontchange); 4598 reader->setBaseSize(config.readNumEntry( "Basesize", reader->getBaseSize() ));
4599 reader->setBaseSize(config.readNumEntry( "Basesize", reader->getBaseSize() )); 4599 reader->setTwoTouch(m_twoTouch);
4600 reader->setTwoTouch(m_twoTouch); 4600
4601 4601 m_touch_action->setOn(m_twoTouch);
4602 m_touch_action->setOn(m_twoTouch); 4602 m_setmono_action->setOn(reader->m_bMonoSpaced);
4603 m_setmono_action->setOn(reader->m_bMonoSpaced); 4603 setfontHelper(reader->m_fontname);
4604 setfontHelper(reader->m_fontname); 4604 if (full)
4605 if (full) 4605 {
4606 { 4606 addtoolbars(&config);
4607 addtoolbars(&config); 4607 }
4608 } 4608 reader->setfilter(reader->getfilter());
4609 reader->setfilter(reader->getfilter()); 4609 reader->refresh();
4610 reader->refresh(); 4610 return true;
4611 return true; 4611}
4612} 4612
4613 4613bool QTReaderApp::PopulateConfig(const char* tgtdir, bool usedirs)
4614bool QTReaderApp::PopulateConfig(const char* tgtdir, bool usedirs) 4614{
4615{ 4615 bkmkselector->clear();
4616 bkmkselector->clear(); 4616 bkmkselector->setText("Cancel");
4617 bkmkselector->setText("Cancel"); 4617#ifndef USEQPE
4618#ifndef USEQPE 4618 int cnt = 0;
4619 int cnt = 0; 4619
4620 4620 QDir d = QDir::home(); // "/"
4621 QDir d = QDir::home(); // "/" 4621 if ( !d.cd(APPDIR) ) { // "/tmp"
4622 if ( !d.cd(APPDIR) ) { // "/tmp" 4622 qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
4623 qWarning( "Cannot find the \"~/" APPDIR "\" directory" ); 4623 d = QDir::home();
4624 d = QDir::home(); 4624 d.mkdir(APPDIR);
4625 d.mkdir(APPDIR); 4625 d.cd(APPDIR);
4626 d.cd(APPDIR); 4626 }
4627 } 4627 if ( !d.cd(tgtdir) ) { // "/tmp"
4628 if ( !d.cd(tgtdir) ) { // "/tmp" 4628 qWarning( "Cannot find the \"~/" APPDIR "/%s\" directory", tgtdir );
4629 qWarning( "Cannot find the \"~/" APPDIR "/%s\" directory", tgtdir ); 4629 d = QDir::home();
4630 d = QDir::home(); 4630 d.mkdir(tgtdir);
4631 d.mkdir(tgtdir); 4631 d.cd(tgtdir);
4632 d.cd(tgtdir); 4632 }
4633 } 4633 d.setFilter( ((usedirs) ? QDir::Dirs : QDir::Files) | QDir::NoSymLinks );
4634 d.setFilter( ((usedirs) ? QDir::Dirs : QDir::Files) | QDir::NoSymLinks ); 4634// d.setSorting( QDir::Size | QDir::Reversed );
4635// d.setSorting( QDir::Size | QDir::Reversed ); 4635
4636 4636 const QFileInfoList *list = d.entryInfoList();
4637 const QFileInfoList *list = d.entryInfoList(); 4637 QFileInfoListIterator it( *list ); // create list iterator
4638 QFileInfoListIterator it( *list ); // create list iterator 4638 QFileInfo *fi; // pointer for traversing
4639 QFileInfo *fi; // pointer for traversing 4639
4640 4640 while ( (fi=it.current()) ) { // for each file...
4641 while ( (fi=it.current()) ) { // for each file... 4641
4642 4642 bkmkselector->insertItem(fi->fileName());
4643 bkmkselector->insertItem(fi->fileName()); 4643 cnt++;
4644 cnt++; 4644
4645 4645 //qDebug( "%10li %s", fi->size(), fi->fileName().data() );
4646 //qDebug( "%10li %s", fi->size(), fi->fileName().data() ); 4646 ++it; // goto next list element
4647 ++it; // goto next list element 4647 }
4648 } 4648
4649 4649#else /* USEQPE */
4650#else /* USEQPE */ 4650 int cnt = 0;
4651 int cnt = 0; 4651 DIR *d;
4652 DIR *d; 4652 char* finaldir;
4653 char* finaldir; 4653 finaldir = new char[strlen(APPDIR)+1+strlen(tgtdir)+1];
4654 finaldir = new char[strlen(APPDIR)+1+strlen(tgtdir)+1]; 4654 strcpy(finaldir, APPDIR);
4655 strcpy(finaldir, APPDIR); 4655 strcat(finaldir, "/");
4656 strcat(finaldir, "/"); 4656 strcat(finaldir, tgtdir);
4657 strcat(finaldir, tgtdir); 4657 d = opendir((const char *)Global::applicationFileName(finaldir,""));
4658 d = opendir((const char *)Global::applicationFileName(finaldir,"")); 4658
4659 4659 while(1)
4660 while(1) 4660 {
4661 { 4661 struct dirent* de;
4662 struct dirent* de; 4662 struct stat buf;
4663 struct stat buf; 4663 de = readdir(d);
4664 de = readdir(d); 4664 if (de == NULL) break;
4665 if (de == NULL) break; 4665
4666 4666 if (lstat((const char *)Global::applicationFileName(finaldir,de->d_name),&buf) == 0 && ((usedirs && S_ISDIR(buf.st_mode)) || (!usedirs && S_ISREG(buf.st_mode))))
4667 if (lstat((const char *)Global::applicationFileName(finaldir,de->d_name),&buf) == 0 && ((usedirs && S_ISDIR(buf.st_mode)) || (!usedirs && S_ISREG(buf.st_mode)))) 4667 {
4668 { 4668 bkmkselector->insertItem(de->d_name);
4669 bkmkselector->insertItem(de->d_name); 4669 cnt++;
4670 cnt++; 4670 }
4671 } 4671 }
4672 } 4672 delete [] finaldir;
4673 delete [] finaldir; 4673 closedir(d);
4674 closedir(d); 4674#endif
4675#endif 4675 return (cnt > 0);
4676 return (cnt > 0); 4676}
4677} 4677
4678 4678void QTReaderApp::LoadTheme()
4679void QTReaderApp::LoadTheme() 4679{
4680{ 4680 if (PopulateConfig("Themes", true))
4681 if (PopulateConfig("Themes", true)) 4681 {
4682 { 4682 editorStack->raiseWidget( bkmkselector );
4683 editorStack->raiseWidget( bkmkselector ); 4683 hidetoolbars();
4684 hidetoolbars(); 4684 m_nBkmkAction = cLdTheme;
4685 m_nBkmkAction = cLdTheme; 4685 }
4686 } 4686 else
4687 else 4687 QMessageBox::information(this, PROGNAME, "No config files");
4688 QMessageBox::information(this, PROGNAME, "No config files"); 4688}
4689} 4689
4690 4690void QTReaderApp::LoadConfig()
4691void QTReaderApp::LoadConfig() 4691{
4692{ 4692 if (PopulateConfig("configs"))
4693 if (PopulateConfig("configs")) 4693 {
4694 { 4694 editorStack->raiseWidget( bkmkselector );
4695 editorStack->raiseWidget( bkmkselector ); 4695 hidetoolbars();
4696 hidetoolbars(); 4696 m_nBkmkAction = cLdConfig;
4697 m_nBkmkAction = cLdConfig; 4697 }
4698 } 4698 else
4699 else 4699 QMessageBox::information(this, PROGNAME, "No config files");
4700 QMessageBox::information(this, PROGNAME, "No config files"); 4700}
4701} 4701
4702 4702void QTReaderApp::TidyConfig()
4703void QTReaderApp::TidyConfig() 4703{
4704{ 4704 if (PopulateConfig("configs"))
4705 if (PopulateConfig("configs")) 4705 {
4706 { 4706 editorStack->raiseWidget( bkmkselector );
4707 editorStack->raiseWidget( bkmkselector ); 4707 hidetoolbars();
4708 hidetoolbars(); 4708 m_nBkmkAction = cRmConfig;
4709 m_nBkmkAction = cRmConfig; 4709 }
4710 } 4710 else
4711 else 4711 QMessageBox::information(this, PROGNAME, "No config files");
4712 QMessageBox::information(this, PROGNAME, "No config files"); 4712}
4713} 4713
4714 4714void QTReaderApp::ExportLinks()
4715void QTReaderApp::ExportLinks() 4715{
4716{ 4716 if (PopulateConfig("urls"))
4717 if (PopulateConfig("urls")) 4717 {
4718 { 4718 editorStack->raiseWidget( bkmkselector );
4719 editorStack->raiseWidget( bkmkselector ); 4719 hidetoolbars();
4720 hidetoolbars(); 4720 m_nBkmkAction = cExportLinks;
4721 m_nBkmkAction = cExportLinks; 4721 }
4722 } 4722 else
4723 else 4723 QMessageBox::information(this, PROGNAME, "No url files");
4724 QMessageBox::information(this, PROGNAME, "No url files"); 4724}
4725} 4725
4726 4726void QTReaderApp::OnURLSelected(const QString& href, const size_t tgt)
4727void QTReaderApp::OnURLSelected(const QString& href, const size_t tgt) 4727{
4728{ 4728#ifndef USEQPE
4729#ifndef USEQPE 4729 qDebug("URL:%s", (const char*)href);
4730 qDebug("URL:%s", (const char*)href); 4730 int col = href.find(':');
4731 int col = href.find(':'); 4731 if (col > 0)
4732 if (col > 0) 4732 {
4733 { 4733 QString type = href.left(col);
4734 QString type = href.left(col); 4734 qDebug("Type:%s", (const char*)type);
4735 qDebug("Type:%s", (const char*)type); 4735 }
4736 } 4736 else
4737 else 4737 {
4738 { 4738 qDebug("No type");
4739 qDebug("No type"); 4739 }
4740 } 4740#else
4741#else 4741 if (href.isEmpty())
4742 if (href.isEmpty()) 4742 {
4743 { 4743 QMessageBox::information(this, PROGNAME, "No URL information supplied");
4744 QMessageBox::information(this, PROGNAME, "No URL information supplied"); 4744 }
4745 } 4745 else
4746 else 4746 {
4747 { 4747 CURLDialog* urld = new CURLDialog(href, false, this);
4748 CURLDialog* urld = new CURLDialog(href, false, this); 4748 urld->clipboard(m_url_clipboard);
4749 urld->clipboard(m_url_clipboard); 4749 urld->localfile(m_url_localfile);
4750 urld->localfile(m_url_localfile); 4750 urld->globalfile(m_url_globalfile);
4751 urld->globalfile(m_url_globalfile); 4751 if (urld->exec())
4752 if (urld->exec()) 4752 {
4753 { 4753 m_url_clipboard = urld->clipboard();
4754 m_url_clipboard = urld->clipboard(); 4754 m_url_localfile = urld->localfile();
4755 m_url_localfile = urld->localfile(); 4755 m_url_globalfile = urld->globalfile();
4756 m_url_globalfile = urld->globalfile(); 4756 if (m_url_clipboard)
4757 if (m_url_clipboard) 4757 {
4758 { 4758 QClipboard* cb = QApplication::clipboard();
4759 QClipboard* cb = QApplication::clipboard(); 4759 cb->setText(href);
4760 cb->setText(href); 4760 qDebug("<a href=\"%s\">%s</a>", (const char*)href, (const char*)href);
4761 qDebug("<a href=\"%s\">%s</a>", (const char*)href, (const char*)href); 4761 }
4762 } 4762 if (m_url_localfile)
4763 if (m_url_localfile) 4763 {
4764 { 4764 writeUrl(reader->m_string, href);
4765 writeUrl(reader->m_string, href); 4765 }
4766 } 4766 if (m_url_globalfile)
4767 if (m_url_globalfile) 4767 {
4768 { 4768 writeUrl("GlobalURLFile", href);
4769 writeUrl("GlobalURLFile", href); 4769 }
4770 } 4770 }
4771 } 4771 delete urld;
4772 delete urld; 4772 }
4773 } 4773#endif
4774#endif 4774}
4775} 4775
4776 4776void QTReaderApp::writeUrl(const QString& file, const QString& href)
4777void QTReaderApp::writeUrl(const QString& file, const QString& href) 4777{
4778{ 4778 QString filename;
4779 QString filename; 4779#ifdef USEQPE
4780#ifdef USEQPE 4780 filename = Global::applicationFileName(APPDIR "/urls", file);
4781 filename = Global::applicationFileName(APPDIR "/urls", file); 4781#else
4782#else 4782 QFileInfo fi;
4783 QFileInfo fi; 4783 QDir d = QDir::home(); // "/"
4784 QDir d = QDir::home(); // "/" 4784 if ( !d.cd(APPDIR) )
4785 if ( !d.cd(APPDIR) ) 4785 { // "/tmp"
4786 { // "/tmp" 4786 qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
4787 qWarning( "Cannot find the \"~/" APPDIR "\" directory" ); 4787 d = QDir::home();
4788 d = QDir::home(); 4788 d.mkdir(APPDIR);
4789 d.mkdir(APPDIR); 4789 d.cd(APPDIR);
4790 d.cd(APPDIR); 4790 }
4791 } 4791 if ( !d.cd("urls") )
4792 if ( !d.cd("urls") ) 4792 { // "/tmp"
4793 { // "/tmp" 4793 qWarning( "Cannot find the \"~/" APPDIR "/urls\" directory" );
4794 qWarning( "Cannot find the \"~/" APPDIR "/urls\" directory" ); 4794 d = QDir::home();
4795 d = QDir::home(); 4795 d.cd(APPDIR);
4796 d.cd(APPDIR); 4796 d.mkdir("urls");
4797 d.mkdir("urls"); 4797 d.cd("urls");
4798 d.cd("urls"); 4798 }
4799 } 4799 fi.setFile(d, file);
4800 fi.setFile(d, file); 4800 filename = fi.absFilePath();
4801 filename = fi.absFilePath(); 4801#endif
4802#endif 4802 FILE* fout = fopen(filename, "a");
4803 FILE* fout = fopen(filename, "a"); 4803 if (fout != NULL)
4804 if (fout != NULL) 4804 {
4805 { 4805 fprintf(fout, "<p><a href=\"%s\">%s</a>\n", (const char*)href, (const char*)href);
4806 fprintf(fout, "<p><a href=\"%s\">%s</a>\n", (const char*)href, (const char*)href); 4806 fclose(fout);
4807 fclose(fout); 4807 }
4808 } 4808 else
4809 else 4809 {
4810 { 4810 QMessageBox::warning(this, PROGNAME, "Problem with writing URL");
4811 QMessageBox::warning(this, PROGNAME, "Problem with writing URL"); 4811 }
4812 } 4812}
4813} 4813
4814 4814QColor QTReaderApp::getcolour(int _c)
4815QColor QTReaderApp::getcolour(int _c) 4815{
4816{ 4816 QColor c = white;
4817 QColor c = white; 4817 switch (_c)
4818 switch (_c) 4818 {
4819 { 4819 case 0:
4820 case 0: 4820 c = white;
4821 c = white; 4821 break;
4822 break; 4822 case 1:
4823 case 1: 4823 c = black;
4824 c = black; 4824 break;
4825 break; 4825 case 2:
4826 case 2: 4826 c = darkGray;
4827 c = darkGray; 4827 break;
4828 break; 4828 case 3:
4829 case 3: 4829 c = gray;
4830 c = gray; 4830 break;
4831 break; 4831 case 4:
4832 case 4: 4832 c = lightGray;
4833 c = lightGray; 4833 break;
4834 break; 4834 case 5:
4835 case 5: 4835 c = red;
4836 c = red; 4836 break;
4837 break; 4837 case 6:
4838 case 6: 4838 c = green;
4839 c = green; 4839 break;
4840 break; 4840 case 7:
4841 case 7: 4841 c = blue;
4842 c = blue; 4842 break;
4843 break; 4843 case 8:
4844 case 8: 4844 c = cyan;
4845 c = cyan; 4845 break;
4846 break; 4846 case 9:
4847 case 9: 4847 c = magenta;
4848 c = magenta; 4848 break;
4849 break; 4849 case 10:
4850 case 10: 4850 c = yellow;
4851 c = yellow; 4851 break;
4852 break; 4852 case 11:
4853 case 11: 4853 c = darkRed;
4854 c = darkRed; 4854 break;
4855 break; 4855 case 12:
4856 case 12: 4856 c = darkGreen;
4857 c = darkGreen; 4857 break;
4858 break; 4858 case 13:
4859 case 13: 4859 c = darkBlue;
4860 c = darkBlue; 4860 break;
4861 break; 4861 case 14:
4862 case 14: 4862 c = darkCyan;
4863 c = darkCyan; 4863 break;
4864 break; 4864 case 15:
4865 case 15: 4865 c = darkMagenta;
4866 c = darkMagenta; 4866 break;
4867 break; 4867 case 16:
4868 case 16: 4868 c = darkYellow;
4869 c = darkYellow; 4869 break;
4870 break; 4870 default:
4871 default: 4871 c = lightGray;
4872 c = lightGray; 4872 break;
4873 break; 4873 }
4874 } 4874 return c;
4875 return c; 4875}
4876} 4876
4877 4877void QTReaderApp::setscrollcolour()
4878void QTReaderApp::setscrollcolour() 4878{
4879{ 4879 /*
4880 /* 4880 QColor xc = getcolour(m_scrollcolor);
4881 QColor xc = getcolour(m_scrollcolor); 4881 int r,g,b;
4882 int r,g,b; 4882 xc.rgb(&r,&g,&b);
4883 xc.rgb(&r,&g,&b); 4883 reader->m_scrollcolor.setRgb(255^r, 255^g, 255^b);
4884 reader->m_scrollcolor.setRgb(255^r, 255^g, 255^b); 4884 */
4885 */ 4885 reader->m_scrollcolor = getcolour(m_scrollcolor);
4886 reader->m_scrollcolor = getcolour(m_scrollcolor); 4886}
4887} 4887
4888 4888void QTReaderApp::setscrollbarcolour()
4889void QTReaderApp::setscrollbarcolour() 4889{
4890{ 4890 /*
4891 /* 4891 QColor xc = getcolour(m_scrollcolor);
4892 QColor xc = getcolour(m_scrollcolor); 4892 int r,g,b;
4893 int r,g,b; 4893 xc.rgb(&r,&g,&b);
4894 xc.rgb(&r,&g,&b); 4894 reader->m_scrollcolor.setRgb(255^r, 255^g, 255^b);
4895 reader->m_scrollcolor.setRgb(255^r, 255^g, 255^b); 4895 */
4896 */ 4896 reader->m_scrollbarcolor = getcolour(m_scrollbarcolor);
4897 reader->m_scrollbarcolor = getcolour(m_scrollbarcolor); 4897}
4898} 4898
4899 4899void QTReaderApp::forceopen(const QString& filename)
4900void QTReaderApp::forceopen(const QString& filename) 4900{
4901{ 4901 /*
4902 /* 4902 QFileInfo fi(reader->m_lastfile);
4903 QFileInfo fi(reader->m_lastfile); 4903 fi = QFileInfo(filename);
4904 fi = QFileInfo(filename); 4904 QString flnm = fi.absFilePath();
4905 QString flnm = fi.absFilePath(); 4905 */
4906 */ 4906 if (!filename.isEmpty())
4907 if (!filename.isEmpty()) 4907 {
4908 { 4908 updatefileinfo();
4909 updatefileinfo(); 4909 if (pBkmklist != NULL)
4910 if (pBkmklist != NULL) 4910 {
4911 { 4911 if (m_fBkmksChanged)
4912 if (m_fBkmksChanged) 4912 {
4913 { 4913 savebkmks();
4914 savebkmks(); 4914 }
4915 } 4915 delete pBkmklist;
4916 delete pBkmklist; 4916 pBkmklist = NULL;
4917 pBkmklist = NULL; 4917 m_fBkmksChanged = false;
4918 m_fBkmksChanged = false; 4918 }
4919 } 4919 reader->disableAutoscroll();
4920 reader->disableAutoscroll(); 4920 openFile(filename);
4921 openFile(filename); 4921 reader->setFocus();
4922 reader->setFocus(); 4922 }
4923 } 4923}
4924} 4924
4925 4925void QTReaderApp::actionscroll(int v)
4926void QTReaderApp::actionscroll(int v) 4926{
4927{ 4927 if (reader->m_rotated)
4928 if (reader->m_rotated) 4928 {
4929 { 4929 reader->dopageup(reader->buffdoc.startSection()+reader->buffdoc.endSection()-v);
4930 reader->dopageup(reader->buffdoc.startSection()+reader->buffdoc.endSection()-v); 4930 }
4931 } 4931 else
4932 else 4932 {
4933 { 4933 /*
4934 /* 4934 if (reader->pagelocate() < v)
4935 if (reader->pagelocate() < v) 4935 {
4936 { 4936 while (reader->pagelocate() < v) reader->lineDown();
4937 while (reader->pagelocate() < v) reader->lineDown(); 4937 }
4938 } 4938 else
4939 else 4939 */
4940 */ 4940 reader->locate(v);
4941 reader->locate(v); 4941 }
4942 } 4942}
4943} 4943
4944 4944void QTReaderApp::setBackgroundBitmap()
4945void QTReaderApp::setBackgroundBitmap() 4945{
4946{ 4946#ifdef USEQPE
4947#ifdef USEQPE 4947 QString file = APPDIR "/Themes/";
4948 QString file = APPDIR "/Themes/"; 4948 file += m_themename;
4949 file += m_themename; 4949 QString tgt = Global::applicationFileName(file,"background");
4950 QString tgt = Global::applicationFileName(file,"background"); 4950#else
4951#else 4951 QString tgt(QDir::homeDirPath());
4952 QString tgt(QDir::homeDirPath()); 4952 tgt += QString("/" APPDIR "/Themes/") + m_themename + "/background";
4953 tgt += QString("/" APPDIR "/Themes/") + m_themename + "/background"; 4953#endif
4954#endif 4954 qDebug("Trying to load %s", (const char *)tgt);
4955 qDebug("Trying to load %s", (const char *)tgt); 4955 QPixmap pm(tgt);
4956 QPixmap pm(tgt); 4956 reader->setBackgroundBitmap(pm, m_bgtype);
4957 reader->setBackgroundBitmap(pm, m_bgtype); 4957}
4958} 4958
4959 4959/*
4960/* 4960
4961 4961 myChannel = new QCopChannel( "QPE/FooBar", this );
4962 myChannel = new QCopChannel( "QPE/FooBar", this ); 4962 connect( myChannel, SIGNAL(received(const QCString &, const QByteArray &)),
4963 connect( myChannel, SIGNAL(received(const QCString &, const QByteArray &)), 4963 this, SLOT(fooBarMessage( const QCString &, const QByteArray &)) );
4964 this, SLOT(fooBarMessage( const QCString &, const QByteArray &)) ); 4964
4965 4965*/
4966*/
diff --git a/noncore/apps/opie-reader/WeaselCodec.mak b/noncore/apps/opie-reader/WeaselCodec.mak
deleted file mode 100644
index 3bac5b9..0000000
--- a/noncore/apps/opie-reader/WeaselCodec.mak
+++ b/dev/null
@@ -1,166 +0,0 @@
1#############################################################################
2# Makefile for building: libWeasel.so.1.0.0
3# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:43:37 2004
4# Project: WeaselCodec.pro
5# Template: lib
6# Command: $(QMAKE) -o WeaselCodec.mak WeaselCodec.pro
7#############################################################################
8
9####### Compiler, tools and options
10
11CC = gcc
12CXX = g++
13LEX = flex
14YACC = yacc
15CFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
16CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
17LEXFLAGS =
18YACCFLAGS= -d
19INCPATH = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
20LINK = g++
21LFLAGS = -shared -Wl,-soname,libWeasel.so.1
22LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_pdb -lreader_codec -lqt-mt -lXext -lX11 -lm -lpthread
23AR = ar cqs
24RANLIB =
25MOC = $(QTDIR)/bin/moc
26UIC = $(QTDIR)/bin/uic
27QMAKE = qmake
28TAR = tar -cf
29GZIP = gzip -9f
30COPY = cp -f
31COPY_FILE= $(COPY)
32COPY_DIR = $(COPY) -r
33DEL_FILE = rm -f
34SYMLINK = ln -sf
35DEL_DIR = rmdir
36MOVE = mv -f
37CHK_DIR_EXISTS= test -d
38MKDIR = mkdir -p
39
40####### Output directory
41
42OBJECTS_DIR = QREADEROBJS/
43
44####### Files
45
46HEADERS = ztxt.h
47SOURCES = ztxt.cpp
48OBJECTS = QREADEROBJS/ztxt.o
49FORMS =
50UICDECLS =
51UICIMPLS =
52SRCMOC =
53OBJMOC =
54 DIST = WeaselCodec.pro
55QMAKE_TARGET = Weasel
56DESTDIR = $(READERDIR)/codecs/
57TARGET = libWeasel.so.1.0.0
58 TARGETA= $(READERDIR)/codecs/libWeasel.a
59 TARGETD= libWeasel.so.1.0.0
60 TARGET0= libWeasel.so
61 TARGET1= libWeasel.so.1
62 TARGET2= libWeasel.so.1.0
63
64first: all
65####### Implicit rules
66
67.SUFFIXES: .c .o .cpp .cc .cxx .C
68
69.cpp.o:
70 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
71
72.cc.o:
73 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
74
75.cxx.o:
76 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
77
78.C.o:
79 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
80
81.c.o:
82 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
83
84####### Build rules
85
86all: WeaselCodec.mak $(READERDIR)/codecs/$(TARGET)
87
88$(READERDIR)/codecs/$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)
89 test -d $(READERDIR)/codecs/ || mkdir -p $(READERDIR)/codecs/
90 -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
91 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
92 -ln -s $(TARGET) $(TARGET0)
93 -ln -s $(TARGET) $(TARGET1)
94 -ln -s $(TARGET) $(TARGET2)
95 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET)
96 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0)
97 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET1)
98 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET2)
99 -$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/codecs/
100
101
102
103staticlib: $(TARGETA)
104
105$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
106 -$(DEL_FILE) $(TARGETA)
107 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
108
109mocables: $(SRCMOC)
110uicables: $(UICDECLS) $(UICIMPLS)
111
112$(MOC):
113 ( cd $(QTDIR)/src/moc ; $(MAKE) )
114
115WeaselCodec.mak: WeaselCodec.pro /usr/lib/qt3/mkspecs/default/qmake.conf
116 $(QMAKE) -o WeaselCodec.mak WeaselCodec.pro
117qmake:
118 @$(QMAKE) -o WeaselCodec.mak WeaselCodec.pro
119
120dist:
121 @mkdir -p QREADEROBJS/Weasel && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/Weasel/ && ( cd `dirname QREADEROBJS/Weasel` && $(TAR) Weasel.tar Weasel && $(GZIP) Weasel.tar ) && $(MOVE) `dirname QREADEROBJS/Weasel`/Weasel.tar.gz . && $(DEL_FILE) -r QREADEROBJS/Weasel
122
123mocclean:
124
125uiclean:
126
127yaccclean:
128lexclean:
129clean:
130 -$(DEL_FILE) $(OBJECTS)
131 -$(DEL_FILE) *~ core *.core
132
133
134####### Sub-libraries
135
136distclean: clean
137 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET) $(TARGET)
138 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0) $(READERDIR)/codecs/$(TARGET1) $(READERDIR)/codecs/$(TARGET2) $(TARGETA)
139
140
141FORCE:
142
143####### Compile
144
145QREADEROBJS/ztxt.o: ztxt.cpp ztxt.h \
146 my_list.h \
147 Bkmks.h \
148 QREADERINC/static.h \
149 CExpander.h \
150 pdb.h \
151 QREADERINC/useqpe.h \
152 config.h \
153 StyleConsts.h \
154 Markups.h \
155 names.h \
156 linktype.h \
157 ustring.h \
158 Filedata.h
159 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/ztxt.o ztxt.cpp
160
161####### Install
162
163install: all
164
165uninstall:
166
diff --git a/noncore/apps/opie-reader/WeaselCodec.omak b/noncore/apps/opie-reader/WeaselCodec.omak
deleted file mode 100644
index c3976c7..0000000
--- a/noncore/apps/opie-reader/WeaselCodec.omak
+++ b/dev/null
@@ -1,127 +0,0 @@
1#############################################################################
2# Makefile for building libWeasel.so.1.0.0
3# Generated by tmake at 15:14, 2004/05/08
4# Project: WeaselCodec.opro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
14 INCPATH =-IOREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =-shared -Wl,-soname,libWeasel.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
18 AR =arm-linux-ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =ztxt.h
29 SOURCES =ztxt.cpp
30 OBJECTS =OREADEROBJS/ztxt.o
31 INTERFACES =
32 UICDECLS =
33 UICIMPLS =
34 SRCMOC =
35 OBJMOC =
36 DIST =
37 TARGET =libWeasel.so.1.0.0
38 TARGETA =$(QTDIR)/plugins/reader/codecs/libWeasel.a
39 TARGETD =libWeasel.so.1.0.0
40 TARGET0 =libWeasel.so
41 TARGET1 =libWeasel.so.1
42 TARGET2 =libWeasel.so.1.0
43INTERFACE_DECL_PATH = .
44
45####### Implicit rules
46
47.SUFFIXES: .cpp .cxx .cc .C .c
48
49.cpp.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51
52.cxx.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54
55.cc.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57
58.C.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60
61.c.o:
62 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
63
64####### Build rules
65
66
67all: $(QTDIR)/plugins/reader/codecs/libWeasel.so.1.0.0
68
69$(QTDIR)/plugins/reader/codecs/libWeasel.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
70 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
71 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
72 -ln -s $(TARGET) $(TARGET0)
73 -ln -s $(TARGET) $(TARGET1)
74 -ln -s $(TARGET) $(TARGET2)
75 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
76 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
77 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
78 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
79 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
80
81staticlib: $(TARGETA)
82
83$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
84 -rm -f $(TARGETA)
85 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
86
87moc: $(SRCMOC)
88
89tmake: WeaselCodec.omak
90
91WeaselCodec.omak: WeaselCodec.opro
92 tmake WeaselCodec.opro -o WeaselCodec.omak
93
94dist:
95 $(TAR) WeaselCodec.opro.tar WeaselCodec.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
96 $(GZIP) WeaselCodec.opro.tar
97
98clean:
99 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
100 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
101 -rm -f *~ core
102
103####### Sub-libraries
104
105
106###### Combined headers
107
108
109####### Compile
110
111OREADEROBJS/ztxt.o: ztxt.cpp \
112 ztxt.h \
113 CExpander.h \
114 OREADERINC/useqpe.h \
115 config.h \
116 ustring.h \
117 StyleConsts.h \
118 Markups.h \
119 names.h \
120 linktype.h \
121 pdb.h \
122 my_list.h \
123 Bkmks.h \
124 Filedata.h \
125 OREADERINC/static.h
126 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/ztxt.o ztxt.cpp
127
diff --git a/noncore/apps/opie-reader/WeaselCodec.wmak b/noncore/apps/opie-reader/WeaselCodec.wmak
deleted file mode 100644
index fd41b8a..0000000
--- a/noncore/apps/opie-reader/WeaselCodec.wmak
+++ b/dev/null
@@ -1,127 +0,0 @@
1#############################################################################
2# Makefile for building libWeasel.so.1.0.0
3# Generated by tmake at 23:23, 2004/03/09
4# Project: WeaselCodec.wpro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =gcc-2.96
11 CXX =g++-2.96
12 CFLAGS =-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
14 INCPATH =-IWSREADERINC -I$(QTDIR)/include
15 LINK =g++-2.96
16 LFLAGS =-shared -Wl,-soname,libWeasel.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
18 AR =ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =ztxt.h
29 SOURCES =ztxt.cpp
30 OBJECTS =WSREADEROBJS/ztxt.o
31 INTERFACES =
32 UICDECLS =
33 UICIMPLS =
34 SRCMOC =
35 OBJMOC =
36 DIST =
37 TARGET =libWeasel.so.1.0.0
38 TARGETA =$(QTDIR)/plugins/reader/codecs/libWeasel.a
39 TARGETD =libWeasel.so.1.0.0
40 TARGET0 =libWeasel.so
41 TARGET1 =libWeasel.so.1
42 TARGET2 =libWeasel.so.1.0
43INTERFACE_DECL_PATH = .
44
45####### Implicit rules
46
47.SUFFIXES: .cpp .cxx .cc .C .c
48
49.cpp.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51
52.cxx.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54
55.cc.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57
58.C.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60
61.c.o:
62 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
63
64####### Build rules
65
66
67all: $(QTDIR)/plugins/reader/codecs/libWeasel.so.1.0.0
68
69$(QTDIR)/plugins/reader/codecs/libWeasel.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
70 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
71 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
72 -ln -s $(TARGET) $(TARGET0)
73 -ln -s $(TARGET) $(TARGET1)
74 -ln -s $(TARGET) $(TARGET2)
75 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
76 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
77 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
78 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
79 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
80
81staticlib: $(TARGETA)
82
83$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
84 -rm -f $(TARGETA)
85 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
86
87moc: $(SRCMOC)
88
89tmake: WeaselCodec.wmak
90
91WeaselCodec.wmak: WeaselCodec.wpro
92 tmake WeaselCodec.wpro -o WeaselCodec.wmak
93
94dist:
95 $(TAR) WeaselCodec.wpro.tar WeaselCodec.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
96 $(GZIP) WeaselCodec.wpro.tar
97
98clean:
99 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
100 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
101 -rm -f *~ core
102
103####### Sub-libraries
104
105
106###### Combined headers
107
108
109####### Compile
110
111WSREADEROBJS/ztxt.o: ztxt.cpp \
112 ztxt.h \
113 CExpander.h \
114 WSREADERINC/useqpe.h \
115 config.h \
116 ustring.h \
117 StyleConsts.h \
118 Markups.h \
119 names.h \
120 linktype.h \
121 pdb.h \
122 my_list.h \
123 Bkmks.h \
124 Filedata.h \
125 WSREADERINC/static.h
126 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/ztxt.o ztxt.cpp
127
diff --git a/noncore/apps/opie-reader/WeaselCodec.wpro b/noncore/apps/opie-reader/WeaselCodec.wpro
deleted file mode 100644
index b71eefb..0000000
--- a/noncore/apps/opie-reader/WeaselCodec.wpro
+++ b/dev/null
@@ -1,15 +0,0 @@
1 TEMPLATE= lib
2 CONFIG = qt warn_on release dll
3 HEADERS = ztxt.h
4
5 SOURCES = ztxt.cpp
6
7 INTERFACES=
8 DESTDIR = $(QTDIR)/plugins/reader/codecs
9 TARGET = Weasel
10LIBS += -lreader_pdb -lreader_codec
11
12OBJECTS_DIR = WSREADEROBJS
13MOC_DIR = WSREADERMOCS
14 INCLUDEPATH+= WSREADERINC
15 DEPENDPATH+= WSREADERINC
diff --git a/noncore/apps/opie-reader/WeaselCodec.zmak b/noncore/apps/opie-reader/WeaselCodec.zmak
deleted file mode 100644
index 50a54f7..0000000
--- a/noncore/apps/opie-reader/WeaselCodec.zmak
+++ b/dev/null
@@ -1,127 +0,0 @@
1#############################################################################
2# Makefile for building libWeasel.so.1.0.0
3# Generated by tmake at 15:17, 2004/05/08
4# Project: WeaselCodec.zpro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
14 INCPATH =-IZREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =-shared -Wl,-soname,libWeasel.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
18 AR =arm-linux-ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =ztxt.h
29 SOURCES =ztxt.cpp
30 OBJECTS =ZREADEROBJS/ztxt.o
31 INTERFACES =
32 UICDECLS =
33 UICIMPLS =
34 SRCMOC =
35 OBJMOC =
36 DIST =
37 TARGET =libWeasel.so.1.0.0
38 TARGETA =$(QTDIR)/plugins/reader/codecs/libWeasel.a
39 TARGETD =libWeasel.so.1.0.0
40 TARGET0 =libWeasel.so
41 TARGET1 =libWeasel.so.1
42 TARGET2 =libWeasel.so.1.0
43INTERFACE_DECL_PATH = .
44
45####### Implicit rules
46
47.SUFFIXES: .cpp .cxx .cc .C .c
48
49.cpp.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51
52.cxx.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54
55.cc.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57
58.C.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60
61.c.o:
62 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
63
64####### Build rules
65
66
67all: $(QTDIR)/plugins/reader/codecs/libWeasel.so.1.0.0
68
69$(QTDIR)/plugins/reader/codecs/libWeasel.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
70 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
71 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
72 -ln -s $(TARGET) $(TARGET0)
73 -ln -s $(TARGET) $(TARGET1)
74 -ln -s $(TARGET) $(TARGET2)
75 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
76 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
77 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
78 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
79 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
80
81staticlib: $(TARGETA)
82
83$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
84 -rm -f $(TARGETA)
85 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
86
87moc: $(SRCMOC)
88
89tmake: WeaselCodec.zmak
90
91WeaselCodec.zmak: WeaselCodec.zpro
92 tmake WeaselCodec.zpro -o WeaselCodec.zmak
93
94dist:
95 $(TAR) WeaselCodec.zpro.tar WeaselCodec.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
96 $(GZIP) WeaselCodec.zpro.tar
97
98clean:
99 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
100 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
101 -rm -f *~ core
102
103####### Sub-libraries
104
105
106###### Combined headers
107
108
109####### Compile
110
111ZREADEROBJS/ztxt.o: ztxt.cpp \
112 ztxt.h \
113 CExpander.h \
114 ZREADERINC/useqpe.h \
115 config.h \
116 ustring.h \
117 StyleConsts.h \
118 Markups.h \
119 names.h \
120 linktype.h \
121 pdb.h \
122 my_list.h \
123 Bkmks.h \
124 Filedata.h \
125 ZREADERINC/static.h
126 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/ztxt.o ztxt.cpp
127
diff --git a/noncore/apps/opie-reader/WeaselCodec.zpro b/noncore/apps/opie-reader/WeaselCodec.zpro
deleted file mode 100644
index 1ab1553..0000000
--- a/noncore/apps/opie-reader/WeaselCodec.zpro
+++ b/dev/null
@@ -1,15 +0,0 @@
1 TEMPLATE= lib
2 CONFIG = qt warn_on release dll
3 HEADERS = ztxt.h
4
5 SOURCES = ztxt.cpp
6
7 INTERFACES=
8 DESTDIR = $(QTDIR)/plugins/reader/codecs
9 TARGET = Weasel
10LIBS += -lreader_pdb -lreader_codec
11
12OBJECTS_DIR = ZREADEROBJS
13MOC_DIR = ZREADERMOCS
14 INCLUDEPATH+= ZREADERINC
15 DEPENDPATH+= ZREADERINC
diff --git a/noncore/apps/opie-reader/codeclib.mak b/noncore/apps/opie-reader/codeclib.mak
deleted file mode 100644
index bfdd7bb..0000000
--- a/noncore/apps/opie-reader/codeclib.mak
+++ b/dev/null
@@ -1,195 +0,0 @@
1#############################################################################
2# Makefile for building: libreader_codec.so.1.0.0
3# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:37:45 2004
4# Project: codeclib.pro
5# Template: lib
6# Command: $(QMAKE) -o codeclib.mak codeclib.pro
7#############################################################################
8
9####### Compiler, tools and options
10
11CC = gcc
12CXX = g++
13LEX = flex
14YACC = yacc
15CFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
16CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
17LEXFLAGS =
18YACCFLAGS= -d
19INCPATH = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
20LINK = g++
21LFLAGS = -shared -Wl,-soname,libreader_codec.so.1
22LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm -lpthread
23AR = ar cqs
24RANLIB =
25MOC = $(QTDIR)/bin/moc
26UIC = $(QTDIR)/bin/uic
27QMAKE = qmake
28TAR = tar -cf
29GZIP = gzip -9f
30COPY = cp -f
31COPY_FILE= $(COPY)
32COPY_DIR = $(COPY) -r
33DEL_FILE = rm -f
34SYMLINK = ln -sf
35DEL_DIR = rmdir
36MOVE = mv -f
37CHK_DIR_EXISTS= test -d
38MKDIR = mkdir -p
39
40####### Output directory
41
42OBJECTS_DIR = QREADEROBJS/
43
44####### Files
45
46HEADERS = pdb.h
47SOURCES = CExpander.cpp \
48 CBuffer.cpp \
49 StyleConsts.cpp \
50 hrule.cpp \
51 Navigation.cpp \
52 Bkmks.cpp
53OBJECTS = QREADEROBJS/CExpander.o \
54 QREADEROBJS/CBuffer.o \
55 QREADEROBJS/StyleConsts.o \
56 QREADEROBJS/hrule.o \
57 QREADEROBJS/Navigation.o \
58 QREADEROBJS/Bkmks.o
59FORMS =
60UICDECLS =
61UICIMPLS =
62SRCMOC =
63OBJMOC =
64 DIST = codeclib.pro
65QMAKE_TARGET = reader_codec
66DESTDIR = $(READERDIR)/lib/
67TARGET = libreader_codec.so.1.0.0
68 TARGETA= $(READERDIR)/lib/libreader_codec.a
69 TARGETD= libreader_codec.so.1.0.0
70 TARGET0= libreader_codec.so
71 TARGET1= libreader_codec.so.1
72 TARGET2= libreader_codec.so.1.0
73
74first: all
75####### Implicit rules
76
77.SUFFIXES: .c .o .cpp .cc .cxx .C
78
79.cpp.o:
80 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
81
82.cc.o:
83 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
84
85.cxx.o:
86 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
87
88.C.o:
89 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
90
91.c.o:
92 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
93
94####### Build rules
95
96all: codeclib.mak $(READERDIR)/lib/$(TARGET)
97
98$(READERDIR)/lib/$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)
99 test -d $(READERDIR)/lib/ || mkdir -p $(READERDIR)/lib/
100 -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
101 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
102 -ln -s $(TARGET) $(TARGET0)
103 -ln -s $(TARGET) $(TARGET1)
104 -ln -s $(TARGET) $(TARGET2)
105 -$(DEL_FILE) $(READERDIR)/lib/$(TARGET)
106 -$(DEL_FILE) $(READERDIR)/lib/$(TARGET0)
107 -$(DEL_FILE) $(READERDIR)/lib/$(TARGET1)
108 -$(DEL_FILE) $(READERDIR)/lib/$(TARGET2)
109 -$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/lib/
110
111
112
113staticlib: $(TARGETA)
114
115$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
116 -$(DEL_FILE) $(TARGETA)
117 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
118
119mocables: $(SRCMOC)
120uicables: $(UICDECLS) $(UICIMPLS)
121
122$(MOC):
123 ( cd $(QTDIR)/src/moc ; $(MAKE) )
124
125codeclib.mak: codeclib.pro /usr/lib/qt3/mkspecs/default/qmake.conf
126 $(QMAKE) -o codeclib.mak codeclib.pro
127qmake:
128 @$(QMAKE) -o codeclib.mak codeclib.pro
129
130dist:
131 @mkdir -p QREADEROBJS/reader_codec && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/reader_codec/ && ( cd `dirname QREADEROBJS/reader_codec` && $(TAR) reader_codec.tar reader_codec && $(GZIP) reader_codec.tar ) && $(MOVE) `dirname QREADEROBJS/reader_codec`/reader_codec.tar.gz . && $(DEL_FILE) -r QREADEROBJS/reader_codec
132
133mocclean:
134
135uiclean:
136
137yaccclean:
138lexclean:
139clean:
140 -$(DEL_FILE) $(OBJECTS)
141 -$(DEL_FILE) *~ core *.core
142
143
144####### Sub-libraries
145
146distclean: clean
147 -$(DEL_FILE) $(READERDIR)/lib/$(TARGET) $(TARGET)
148 -$(DEL_FILE) $(READERDIR)/lib/$(TARGET0) $(READERDIR)/lib/$(TARGET1) $(READERDIR)/lib/$(TARGET2) $(TARGETA)
149
150
151FORCE:
152
153####### Compile
154
155QREADEROBJS/CExpander.o: CExpander.cpp CExpander.h \
156 QREADERINC/useqpe.h \
157 config.h \
158 StyleConsts.h \
159 Markups.h \
160 names.h \
161 linktype.h \
162 ustring.h
163 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CExpander.o CExpander.cpp
164
165QREADEROBJS/CBuffer.o: CBuffer.cpp CBuffer.h \
166 config.h \
167 ustring.h
168 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CBuffer.o CBuffer.cpp
169
170QREADEROBJS/StyleConsts.o: StyleConsts.cpp StyleConsts.h
171 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/StyleConsts.o StyleConsts.cpp
172
173QREADEROBJS/hrule.o: hrule.cpp
174 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/hrule.o hrule.cpp
175
176QREADEROBJS/Navigation.o: Navigation.cpp Navigation.h
177 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/Navigation.o Navigation.cpp
178
179QREADEROBJS/Bkmks.o: Bkmks.cpp Bkmks.h \
180 StyleConsts.h \
181 Markups.h \
182 my_list.h \
183 version.h \
184 names.h \
185 config.h \
186 Filedata.h \
187 ustring.h
188 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/Bkmks.o Bkmks.cpp
189
190####### Install
191
192install: all
193
194uninstall:
195
diff --git a/noncore/apps/opie-reader/codeclib.omak b/noncore/apps/opie-reader/codeclib.omak
deleted file mode 100644
index 1ea5fbc..0000000
--- a/noncore/apps/opie-reader/codeclib.omak
+++ b/dev/null
@@ -1,160 +0,0 @@
1#############################################################################
2# Makefile for building libreader_codec.so.1.0.0
3# Generated by tmake at 15:14, 2004/05/08
4# Project: codeclib.opro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
14 INCPATH =-IOREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =-shared -Wl,-soname,libreader_codec.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lqte
18 AR =arm-linux-ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =pdb.h
29 SOURCES =CExpander.cpp \
30 CBuffer.cpp \
31 StyleConsts.cpp \
32 hrule.cpp \
33 Navigation.cpp \
34 Bkmks.cpp
35 OBJECTS =OREADEROBJS/CExpander.o \
36 OREADEROBJS/CBuffer.o \
37 OREADEROBJS/StyleConsts.o \
38 OREADEROBJS/hrule.o \
39 OREADEROBJS/Navigation.o \
40 OREADEROBJS/Bkmks.o
41 INTERFACES =
42 UICDECLS =
43 UICIMPLS =
44 SRCMOC =
45 OBJMOC =
46 DIST =
47 TARGET =libreader_codec.so.1.0.0
48 TARGETA =$(QTDIR)/lib/libreader_codec.a
49 TARGETD =libreader_codec.so.1.0.0
50 TARGET0 =libreader_codec.so
51 TARGET1 =libreader_codec.so.1
52 TARGET2 =libreader_codec.so.1.0
53INTERFACE_DECL_PATH = .
54
55####### Implicit rules
56
57.SUFFIXES: .cpp .cxx .cc .C .c
58
59.cpp.o:
60 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
61
62.cxx.o:
63 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
64
65.cc.o:
66 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
67
68.C.o:
69 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
70
71.c.o:
72 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
73
74####### Build rules
75
76
77all: $(QTDIR)/lib/libreader_codec.so.1.0.0
78
79$(QTDIR)/lib/libreader_codec.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
80 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
81 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
82 -ln -s $(TARGET) $(TARGET0)
83 -ln -s $(TARGET) $(TARGET1)
84 -ln -s $(TARGET) $(TARGET2)
85 -rm -f $(QTDIR)/lib/$(TARGET)
86 -rm -f $(QTDIR)/lib/$(TARGET0)
87 -rm -f $(QTDIR)/lib/$(TARGET1)
88 -rm -f $(QTDIR)/lib/$(TARGET2)
89 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
90
91staticlib: $(TARGETA)
92
93$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
94 -rm -f $(TARGETA)
95 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
96
97moc: $(SRCMOC)
98
99tmake: codeclib.omak
100
101codeclib.omak: codeclib.opro
102 tmake codeclib.opro -o codeclib.omak
103
104dist:
105 $(TAR) codeclib.opro.tar codeclib.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
106 $(GZIP) codeclib.opro.tar
107
108clean:
109 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
110 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
111 -rm -f *~ core
112
113####### Sub-libraries
114
115
116###### Combined headers
117
118
119####### Compile
120
121OREADEROBJS/CExpander.o: CExpander.cpp \
122 CExpander.h \
123 OREADERINC/useqpe.h \
124 config.h \
125 ustring.h \
126 StyleConsts.h \
127 Markups.h \
128 names.h \
129 linktype.h
130 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CExpander.o CExpander.cpp
131
132OREADEROBJS/CBuffer.o: CBuffer.cpp \
133 CBuffer.h \
134 config.h \
135 ustring.h
136 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CBuffer.o CBuffer.cpp
137
138OREADEROBJS/StyleConsts.o: StyleConsts.cpp \
139 StyleConsts.h
140 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/StyleConsts.o StyleConsts.cpp
141
142OREADEROBJS/hrule.o: hrule.cpp
143 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/hrule.o hrule.cpp
144
145OREADEROBJS/Navigation.o: Navigation.cpp \
146 Navigation.h
147 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/Navigation.o Navigation.cpp
148
149OREADEROBJS/Bkmks.o: Bkmks.cpp \
150 Bkmks.h \
151 config.h \
152 ustring.h \
153 Filedata.h \
154 StyleConsts.h \
155 Markups.h \
156 my_list.h \
157 version.h \
158 names.h
159 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/Bkmks.o Bkmks.cpp
160
diff --git a/noncore/apps/opie-reader/codeclib.wmak b/noncore/apps/opie-reader/codeclib.wmak
deleted file mode 100644
index ea09e49..0000000
--- a/noncore/apps/opie-reader/codeclib.wmak
+++ b/dev/null
@@ -1,160 +0,0 @@
1#############################################################################
2# Makefile for building libreader_codec.so.1.0.0
3# Generated by tmake at 23:23, 2004/03/09
4# Project: codeclib.wpro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =gcc-2.96
11 CXX =g++-2.96
12 CFLAGS =-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
14 INCPATH =-IWSREADERINC -I$(QTDIR)/include
15 LINK =g++-2.96
16 LFLAGS =-shared -Wl,-soname,libreader_codec.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lqte
18 AR =ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =pdb.h
29 SOURCES =CExpander.cpp \
30 CBuffer.cpp \
31 StyleConsts.cpp \
32 hrule.cpp \
33 Navigation.cpp \
34 Bkmks.cpp
35 OBJECTS =WSREADEROBJS/CExpander.o \
36 WSREADEROBJS/CBuffer.o \
37 WSREADEROBJS/StyleConsts.o \
38 WSREADEROBJS/hrule.o \
39 WSREADEROBJS/Navigation.o \
40 WSREADEROBJS/Bkmks.o
41 INTERFACES =
42 UICDECLS =
43 UICIMPLS =
44 SRCMOC =
45 OBJMOC =
46 DIST =
47 TARGET =libreader_codec.so.1.0.0
48 TARGETA =$(QTDIR)/lib/libreader_codec.a
49 TARGETD =libreader_codec.so.1.0.0
50 TARGET0 =libreader_codec.so
51 TARGET1 =libreader_codec.so.1
52 TARGET2 =libreader_codec.so.1.0
53INTERFACE_DECL_PATH = .
54
55####### Implicit rules
56
57.SUFFIXES: .cpp .cxx .cc .C .c
58
59.cpp.o:
60 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
61
62.cxx.o:
63 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
64
65.cc.o:
66 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
67
68.C.o:
69 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
70
71.c.o:
72 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
73
74####### Build rules
75
76
77all: $(QTDIR)/lib/libreader_codec.so.1.0.0
78
79$(QTDIR)/lib/libreader_codec.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
80 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
81 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
82 -ln -s $(TARGET) $(TARGET0)
83 -ln -s $(TARGET) $(TARGET1)
84 -ln -s $(TARGET) $(TARGET2)
85 -rm -f $(QTDIR)/lib/$(TARGET)
86 -rm -f $(QTDIR)/lib/$(TARGET0)
87 -rm -f $(QTDIR)/lib/$(TARGET1)
88 -rm -f $(QTDIR)/lib/$(TARGET2)
89 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
90
91staticlib: $(TARGETA)
92
93$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
94 -rm -f $(TARGETA)
95 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
96
97moc: $(SRCMOC)
98
99tmake: codeclib.wmak
100
101codeclib.wmak: codeclib.wpro
102 tmake codeclib.wpro -o codeclib.wmak
103
104dist:
105 $(TAR) codeclib.wpro.tar codeclib.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
106 $(GZIP) codeclib.wpro.tar
107
108clean:
109 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
110 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
111 -rm -f *~ core
112
113####### Sub-libraries
114
115
116###### Combined headers
117
118
119####### Compile
120
121WSREADEROBJS/CExpander.o: CExpander.cpp \
122 CExpander.h \
123 WSREADERINC/useqpe.h \
124 config.h \
125 ustring.h \
126 StyleConsts.h \
127 Markups.h \
128 names.h \
129 linktype.h
130 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CExpander.o CExpander.cpp
131
132WSREADEROBJS/CBuffer.o: CBuffer.cpp \
133 CBuffer.h \
134 config.h \
135 ustring.h
136 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CBuffer.o CBuffer.cpp
137
138WSREADEROBJS/StyleConsts.o: StyleConsts.cpp \
139 StyleConsts.h
140 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/StyleConsts.o StyleConsts.cpp
141
142WSREADEROBJS/hrule.o: hrule.cpp
143 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/hrule.o hrule.cpp
144
145WSREADEROBJS/Navigation.o: Navigation.cpp \
146 Navigation.h
147 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/Navigation.o Navigation.cpp
148
149WSREADEROBJS/Bkmks.o: Bkmks.cpp \
150 Bkmks.h \
151 config.h \
152 ustring.h \
153 Filedata.h \
154 StyleConsts.h \
155 Markups.h \
156 my_list.h \
157 version.h \
158 names.h
159 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/Bkmks.o Bkmks.cpp
160
diff --git a/noncore/apps/opie-reader/codeclib.wpro b/noncore/apps/opie-reader/codeclib.wpro
deleted file mode 100644
index f4a467a..0000000
--- a/noncore/apps/opie-reader/codeclib.wpro
+++ b/dev/null
@@ -1,15 +0,0 @@
1 TEMPLATE= lib
2 CONFIG = qt warn_on release dll
3 HEADERS = pdb.h
4
5 SOURCES = CExpander.cpp CBuffer.cpp StyleConsts.cpp \
6 hrule.cpp Navigation.cpp Bkmks.cpp
7
8 INTERFACES=
9 DESTDIR = $(QTDIR)/lib
10 TARGET = reader_codec
11
12OBJECTS_DIR = WSREADEROBJS
13MOC_DIR = WSREADERMOCS
14 INCLUDEPATH+= WSREADERINC
15 DEPENDPATH+= WSREADERINC
diff --git a/noncore/apps/opie-reader/codeclib.zmak b/noncore/apps/opie-reader/codeclib.zmak
deleted file mode 100644
index d81d347..0000000
--- a/noncore/apps/opie-reader/codeclib.zmak
+++ b/dev/null
@@ -1,160 +0,0 @@
1#############################################################################
2# Makefile for building libreader_codec.so.1.0.0
3# Generated by tmake at 15:17, 2004/05/08
4# Project: codeclib.zpro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
14 INCPATH =-IZREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =-shared -Wl,-soname,libreader_codec.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lqte
18 AR =arm-linux-ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =pdb.h
29 SOURCES =CExpander.cpp \
30 CBuffer.cpp \
31 StyleConsts.cpp \
32 hrule.cpp \
33 Navigation.cpp \
34 Bkmks.cpp
35 OBJECTS =ZREADEROBJS/CExpander.o \
36 ZREADEROBJS/CBuffer.o \
37 ZREADEROBJS/StyleConsts.o \
38 ZREADEROBJS/hrule.o \
39 ZREADEROBJS/Navigation.o \
40 ZREADEROBJS/Bkmks.o
41 INTERFACES =
42 UICDECLS =
43 UICIMPLS =
44 SRCMOC =
45 OBJMOC =
46 DIST =
47 TARGET =libreader_codec.so.1.0.0
48 TARGETA =$(QTDIR)/lib/libreader_codec.a
49 TARGETD =libreader_codec.so.1.0.0
50 TARGET0 =libreader_codec.so
51 TARGET1 =libreader_codec.so.1
52 TARGET2 =libreader_codec.so.1.0
53INTERFACE_DECL_PATH = .
54
55####### Implicit rules
56
57.SUFFIXES: .cpp .cxx .cc .C .c
58
59.cpp.o:
60 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
61
62.cxx.o:
63 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
64
65.cc.o:
66 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
67
68.C.o:
69 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
70
71.c.o:
72 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
73
74####### Build rules
75
76
77all: $(QTDIR)/lib/libreader_codec.so.1.0.0
78
79$(QTDIR)/lib/libreader_codec.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
80 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
81 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
82 -ln -s $(TARGET) $(TARGET0)
83 -ln -s $(TARGET) $(TARGET1)
84 -ln -s $(TARGET) $(TARGET2)
85 -rm -f $(QTDIR)/lib/$(TARGET)
86 -rm -f $(QTDIR)/lib/$(TARGET0)
87 -rm -f $(QTDIR)/lib/$(TARGET1)
88 -rm -f $(QTDIR)/lib/$(TARGET2)
89 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
90
91staticlib: $(TARGETA)
92
93$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
94 -rm -f $(TARGETA)
95 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
96
97moc: $(SRCMOC)
98
99tmake: codeclib.zmak
100
101codeclib.zmak: codeclib.zpro
102 tmake codeclib.zpro -o codeclib.zmak
103
104dist:
105 $(TAR) codeclib.zpro.tar codeclib.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
106 $(GZIP) codeclib.zpro.tar
107
108clean:
109 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
110 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
111 -rm -f *~ core
112
113####### Sub-libraries
114
115
116###### Combined headers
117
118
119####### Compile
120
121ZREADEROBJS/CExpander.o: CExpander.cpp \
122 CExpander.h \
123 ZREADERINC/useqpe.h \
124 config.h \
125 ustring.h \
126 StyleConsts.h \
127 Markups.h \
128 names.h \
129 linktype.h
130 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CExpander.o CExpander.cpp
131
132ZREADEROBJS/CBuffer.o: CBuffer.cpp \
133 CBuffer.h \
134 config.h \
135 ustring.h
136 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CBuffer.o CBuffer.cpp
137
138ZREADEROBJS/StyleConsts.o: StyleConsts.cpp \
139 StyleConsts.h
140 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/StyleConsts.o StyleConsts.cpp
141
142ZREADEROBJS/hrule.o: hrule.cpp
143 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/hrule.o hrule.cpp
144
145ZREADEROBJS/Navigation.o: Navigation.cpp \
146 Navigation.h
147 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/Navigation.o Navigation.cpp
148
149ZREADEROBJS/Bkmks.o: Bkmks.cpp \
150 Bkmks.h \
151 config.h \
152 ustring.h \
153 Filedata.h \
154 StyleConsts.h \
155 Markups.h \
156 my_list.h \
157 version.h \
158 names.h
159 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/Bkmks.o Bkmks.cpp
160
diff --git a/noncore/apps/opie-reader/codeclib.zpro b/noncore/apps/opie-reader/codeclib.zpro
deleted file mode 100644
index 93908c6..0000000
--- a/noncore/apps/opie-reader/codeclib.zpro
+++ b/dev/null
@@ -1,15 +0,0 @@
1 TEMPLATE= lib
2 CONFIG = qt warn_on release dll
3 HEADERS = pdb.h
4
5 SOURCES = CExpander.cpp CBuffer.cpp StyleConsts.cpp \
6 hrule.cpp Navigation.cpp Bkmks.cpp
7
8 INTERFACES=
9 DESTDIR = $(QTDIR)/lib
10 TARGET = reader_codec
11
12OBJECTS_DIR = ZREADEROBJS
13MOC_DIR = ZREADERMOCS
14 INCLUDEPATH+= ZREADERINC
15 DEPENDPATH+= ZREADERINC
diff --git a/noncore/apps/opie-reader/iSiloCodec.mak b/noncore/apps/opie-reader/iSiloCodec.mak
deleted file mode 100644
index d0ef46e..0000000
--- a/noncore/apps/opie-reader/iSiloCodec.mak
+++ b/dev/null
@@ -1,162 +0,0 @@
1#############################################################################
2# Makefile for building: libiSilo.so.1.0.0
3# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:39:31 2004
4# Project: iSiloCodec.pro
5# Template: lib
6# Command: $(QMAKE) -o iSiloCodec.mak iSiloCodec.pro
7#############################################################################
8
9####### Compiler, tools and options
10
11CC = gcc
12CXX = g++
13LEX = flex
14YACC = yacc
15CFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
16CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
17LEXFLAGS =
18YACCFLAGS= -d
19INCPATH = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
20LINK = g++
21LFLAGS = -shared -Wl,-soname,libiSilo.so.1
22LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_pdb -lreader_codec -lqt-mt -lXext -lX11 -lm -lpthread
23AR = ar cqs
24RANLIB =
25MOC = $(QTDIR)/bin/moc
26UIC = $(QTDIR)/bin/uic
27QMAKE = qmake
28TAR = tar -cf
29GZIP = gzip -9f
30COPY = cp -f
31COPY_FILE= $(COPY)
32COPY_DIR = $(COPY) -r
33DEL_FILE = rm -f
34SYMLINK = ln -sf
35DEL_DIR = rmdir
36MOVE = mv -f
37CHK_DIR_EXISTS= test -d
38MKDIR = mkdir -p
39
40####### Output directory
41
42OBJECTS_DIR = QREADEROBJS/
43
44####### Files
45
46HEADERS =
47SOURCES = iSilo.cpp
48OBJECTS = QREADEROBJS/iSilo.o
49FORMS =
50UICDECLS =
51UICIMPLS =
52SRCMOC =
53OBJMOC =
54 DIST = iSiloCodec.pro
55QMAKE_TARGET = iSilo
56DESTDIR = $(READERDIR)/codecs/
57TARGET = libiSilo.so.1.0.0
58 TARGETA= $(READERDIR)/codecs/libiSilo.a
59 TARGETD= libiSilo.so.1.0.0
60 TARGET0= libiSilo.so
61 TARGET1= libiSilo.so.1
62 TARGET2= libiSilo.so.1.0
63
64first: all
65####### Implicit rules
66
67.SUFFIXES: .c .o .cpp .cc .cxx .C
68
69.cpp.o:
70 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
71
72.cc.o:
73 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
74
75.cxx.o:
76 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
77
78.C.o:
79 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
80
81.c.o:
82 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
83
84####### Build rules
85
86all: iSiloCodec.mak $(READERDIR)/codecs/$(TARGET)
87
88$(READERDIR)/codecs/$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)
89 test -d $(READERDIR)/codecs/ || mkdir -p $(READERDIR)/codecs/
90 -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
91 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
92 -ln -s $(TARGET) $(TARGET0)
93 -ln -s $(TARGET) $(TARGET1)
94 -ln -s $(TARGET) $(TARGET2)
95 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET)
96 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0)
97 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET1)
98 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET2)
99 -$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/codecs/
100
101
102
103staticlib: $(TARGETA)
104
105$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
106 -$(DEL_FILE) $(TARGETA)
107 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
108
109mocables: $(SRCMOC)
110uicables: $(UICDECLS) $(UICIMPLS)
111
112$(MOC):
113 ( cd $(QTDIR)/src/moc ; $(MAKE) )
114
115iSiloCodec.mak: iSiloCodec.pro /usr/lib/qt3/mkspecs/default/qmake.conf
116 $(QMAKE) -o iSiloCodec.mak iSiloCodec.pro
117qmake:
118 @$(QMAKE) -o iSiloCodec.mak iSiloCodec.pro
119
120dist:
121 @mkdir -p QREADEROBJS/iSilo && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/iSilo/ && ( cd `dirname QREADEROBJS/iSilo` && $(TAR) iSilo.tar iSilo && $(GZIP) iSilo.tar ) && $(MOVE) `dirname QREADEROBJS/iSilo`/iSilo.tar.gz . && $(DEL_FILE) -r QREADEROBJS/iSilo
122
123mocclean:
124
125uiclean:
126
127yaccclean:
128lexclean:
129clean:
130 -$(DEL_FILE) $(OBJECTS)
131 -$(DEL_FILE) *~ core *.core
132
133
134####### Sub-libraries
135
136distclean: clean
137 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET) $(TARGET)
138 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0) $(READERDIR)/codecs/$(TARGET1) $(READERDIR)/codecs/$(TARGET2) $(TARGETA)
139
140
141FORCE:
142
143####### Compile
144
145QREADEROBJS/iSilo.o: iSilo.cpp iSilo.h \
146 pdb.h \
147 QREADERINC/useqpe.h \
148 CExpander.h \
149 config.h \
150 StyleConsts.h \
151 Markups.h \
152 names.h \
153 linktype.h \
154 ustring.h
155 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/iSilo.o iSilo.cpp
156
157####### Install
158
159install: all
160
161uninstall:
162
diff --git a/noncore/apps/opie-reader/iSiloCodec.omak b/noncore/apps/opie-reader/iSiloCodec.omak
deleted file mode 100644
index a3f1d90..0000000
--- a/noncore/apps/opie-reader/iSiloCodec.omak
+++ b/dev/null
@@ -1,123 +0,0 @@
1#############################################################################
2# Makefile for building libiSilo.so.1.0.0
3# Generated by tmake at 15:14, 2004/05/08
4# Project: iSiloCodec.opro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
14 INCPATH =-IOREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =-shared -Wl,-soname,libiSilo.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
18 AR =arm-linux-ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =
29 SOURCES =iSilo.cpp
30 OBJECTS =OREADEROBJS/iSilo.o
31 INTERFACES =
32 UICDECLS =
33 UICIMPLS =
34 SRCMOC =
35 OBJMOC =
36 DIST =
37 TARGET =libiSilo.so.1.0.0
38 TARGETA =$(QTDIR)/plugins/reader/codecs/libiSilo.a
39 TARGETD =libiSilo.so.1.0.0
40 TARGET0 =libiSilo.so
41 TARGET1 =libiSilo.so.1
42 TARGET2 =libiSilo.so.1.0
43INTERFACE_DECL_PATH = .
44
45####### Implicit rules
46
47.SUFFIXES: .cpp .cxx .cc .C .c
48
49.cpp.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51
52.cxx.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54
55.cc.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57
58.C.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60
61.c.o:
62 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
63
64####### Build rules
65
66
67all: $(QTDIR)/plugins/reader/codecs/libiSilo.so.1.0.0
68
69$(QTDIR)/plugins/reader/codecs/libiSilo.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
70 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
71 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
72 -ln -s $(TARGET) $(TARGET0)
73 -ln -s $(TARGET) $(TARGET1)
74 -ln -s $(TARGET) $(TARGET2)
75 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
76 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
77 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
78 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
79 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
80
81staticlib: $(TARGETA)
82
83$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
84 -rm -f $(TARGETA)
85 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
86
87moc: $(SRCMOC)
88
89tmake: iSiloCodec.omak
90
91iSiloCodec.omak: iSiloCodec.opro
92 tmake iSiloCodec.opro -o iSiloCodec.omak
93
94dist:
95 $(TAR) iSiloCodec.opro.tar iSiloCodec.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
96 $(GZIP) iSiloCodec.opro.tar
97
98clean:
99 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
100 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
101 -rm -f *~ core
102
103####### Sub-libraries
104
105
106###### Combined headers
107
108
109####### Compile
110
111OREADEROBJS/iSilo.o: iSilo.cpp \
112 iSilo.h \
113 pdb.h \
114 OREADERINC/useqpe.h \
115 CExpander.h \
116 config.h \
117 ustring.h \
118 StyleConsts.h \
119 Markups.h \
120 names.h \
121 linktype.h
122 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/iSilo.o iSilo.cpp
123
diff --git a/noncore/apps/opie-reader/iSiloCodec.wmak b/noncore/apps/opie-reader/iSiloCodec.wmak
deleted file mode 100644
index 452b220..0000000
--- a/noncore/apps/opie-reader/iSiloCodec.wmak
+++ b/dev/null
@@ -1,123 +0,0 @@
1#############################################################################
2# Makefile for building libiSilo.so.1.0.0
3# Generated by tmake at 23:23, 2004/03/09
4# Project: iSiloCodec.wpro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =gcc-2.96
11 CXX =g++-2.96
12 CFLAGS =-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
14 INCPATH =-IWSREADERINC -I$(QTDIR)/include
15 LINK =g++-2.96
16 LFLAGS =-shared -Wl,-soname,libiSilo.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
18 AR =ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =
29 SOURCES =iSilo.cpp
30 OBJECTS =WSREADEROBJS/iSilo.o
31 INTERFACES =
32 UICDECLS =
33 UICIMPLS =
34 SRCMOC =
35 OBJMOC =
36 DIST =
37 TARGET =libiSilo.so.1.0.0
38 TARGETA =$(QTDIR)/plugins/reader/codecs/libiSilo.a
39 TARGETD =libiSilo.so.1.0.0
40 TARGET0 =libiSilo.so
41 TARGET1 =libiSilo.so.1
42 TARGET2 =libiSilo.so.1.0
43INTERFACE_DECL_PATH = .
44
45####### Implicit rules
46
47.SUFFIXES: .cpp .cxx .cc .C .c
48
49.cpp.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51
52.cxx.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54
55.cc.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57
58.C.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60
61.c.o:
62 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
63
64####### Build rules
65
66
67all: $(QTDIR)/plugins/reader/codecs/libiSilo.so.1.0.0
68
69$(QTDIR)/plugins/reader/codecs/libiSilo.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
70 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
71 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
72 -ln -s $(TARGET) $(TARGET0)
73 -ln -s $(TARGET) $(TARGET1)
74 -ln -s $(TARGET) $(TARGET2)
75 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
76 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
77 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
78 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
79 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
80
81staticlib: $(TARGETA)
82
83$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
84 -rm -f $(TARGETA)
85 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
86
87moc: $(SRCMOC)
88
89tmake: iSiloCodec.wmak
90
91iSiloCodec.wmak: iSiloCodec.wpro
92 tmake iSiloCodec.wpro -o iSiloCodec.wmak
93
94dist:
95 $(TAR) iSiloCodec.wpro.tar iSiloCodec.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
96 $(GZIP) iSiloCodec.wpro.tar
97
98clean:
99 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
100 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
101 -rm -f *~ core
102
103####### Sub-libraries
104
105
106###### Combined headers
107
108
109####### Compile
110
111WSREADEROBJS/iSilo.o: iSilo.cpp \
112 iSilo.h \
113 pdb.h \
114 WSREADERINC/useqpe.h \
115 CExpander.h \
116 config.h \
117 ustring.h \
118 StyleConsts.h \
119 Markups.h \
120 names.h \
121 linktype.h
122 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/iSilo.o iSilo.cpp
123
diff --git a/noncore/apps/opie-reader/iSiloCodec.wpro b/noncore/apps/opie-reader/iSiloCodec.wpro
deleted file mode 100644
index 4967689..0000000
--- a/noncore/apps/opie-reader/iSiloCodec.wpro
+++ b/dev/null
@@ -1,17 +0,0 @@
1 TEMPLATE= lib
2 CONFIG = qt warn_on release dll
3 #HEADERS = Aportis.h
4
5 SOURCES = iSilo.cpp
6
7
8 INTERFACES=
9 DESTDIR = $(QTDIR)/plugins/reader/codecs
10 TARGET = iSilo
11LIBS += -lreader_pdb -lreader_codec
12
13
14OBJECTS_DIR = WSREADEROBJS
15MOC_DIR = WSREADERMOCS
16 INCLUDEPATH+= WSREADERINC
17 DEPENDPATH+= WSREADERINC
diff --git a/noncore/apps/opie-reader/iSiloCodec.zmak b/noncore/apps/opie-reader/iSiloCodec.zmak
deleted file mode 100644
index c6c9ed6..0000000
--- a/noncore/apps/opie-reader/iSiloCodec.zmak
+++ b/dev/null
@@ -1,123 +0,0 @@
1#############################################################################
2# Makefile for building libiSilo.so.1.0.0
3# Generated by tmake at 15:17, 2004/05/08
4# Project: iSiloCodec.zpro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
14 INCPATH =-IZREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =-shared -Wl,-soname,libiSilo.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
18 AR =arm-linux-ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =
29 SOURCES =iSilo.cpp
30 OBJECTS =ZREADEROBJS/iSilo.o
31 INTERFACES =
32 UICDECLS =
33 UICIMPLS =
34 SRCMOC =
35 OBJMOC =
36 DIST =
37 TARGET =libiSilo.so.1.0.0
38 TARGETA =$(QTDIR)/plugins/reader/codecs/libiSilo.a
39 TARGETD =libiSilo.so.1.0.0
40 TARGET0 =libiSilo.so
41 TARGET1 =libiSilo.so.1
42 TARGET2 =libiSilo.so.1.0
43INTERFACE_DECL_PATH = .
44
45####### Implicit rules
46
47.SUFFIXES: .cpp .cxx .cc .C .c
48
49.cpp.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51
52.cxx.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54
55.cc.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57
58.C.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60
61.c.o:
62 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
63
64####### Build rules
65
66
67all: $(QTDIR)/plugins/reader/codecs/libiSilo.so.1.0.0
68
69$(QTDIR)/plugins/reader/codecs/libiSilo.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
70 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
71 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
72 -ln -s $(TARGET) $(TARGET0)
73 -ln -s $(TARGET) $(TARGET1)
74 -ln -s $(TARGET) $(TARGET2)
75 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
76 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
77 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
78 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
79 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
80
81staticlib: $(TARGETA)
82
83$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
84 -rm -f $(TARGETA)
85 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
86
87moc: $(SRCMOC)
88
89tmake: iSiloCodec.zmak
90
91iSiloCodec.zmak: iSiloCodec.zpro
92 tmake iSiloCodec.zpro -o iSiloCodec.zmak
93
94dist:
95 $(TAR) iSiloCodec.zpro.tar iSiloCodec.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
96 $(GZIP) iSiloCodec.zpro.tar
97
98clean:
99 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
100 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
101 -rm -f *~ core
102
103####### Sub-libraries
104
105
106###### Combined headers
107
108
109####### Compile
110
111ZREADEROBJS/iSilo.o: iSilo.cpp \
112 iSilo.h \
113 pdb.h \
114 ZREADERINC/useqpe.h \
115 CExpander.h \
116 config.h \
117 ustring.h \
118 StyleConsts.h \
119 Markups.h \
120 names.h \
121 linktype.h
122 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/iSilo.o iSilo.cpp
123
diff --git a/noncore/apps/opie-reader/iSiloCodec.zpro b/noncore/apps/opie-reader/iSiloCodec.zpro
deleted file mode 100644
index 525b044..0000000
--- a/noncore/apps/opie-reader/iSiloCodec.zpro
+++ b/dev/null
@@ -1,17 +0,0 @@
1 TEMPLATE= lib
2 CONFIG = qt warn_on release dll
3 #HEADERS = Aportis.h
4
5 SOURCES = iSilo.cpp
6
7
8 INTERFACES=
9 DESTDIR = $(QTDIR)/plugins/reader/codecs
10 TARGET = iSilo
11LIBS += -lreader_pdb -lreader_codec
12
13
14OBJECTS_DIR = ZREADEROBJS
15MOC_DIR = ZREADERMOCS
16 INCLUDEPATH+= ZREADERINC
17 DEPENDPATH+= ZREADERINC
diff --git a/noncore/apps/opie-reader/opie-reader.pro b/noncore/apps/opie-reader/opie-reader.pro
index bf8e8f2..fc1d721 100644
--- a/noncore/apps/opie-reader/opie-reader.pro
+++ b/noncore/apps/opie-reader/opie-reader.pro
@@ -1,16 +1,16 @@
1TEMPLATE = subdirs 1TEMPLATE = subdirs
2SUBDIRS = pluckerbaselib \ 2SUBDIRS = pluckerbaselib \
3 codeclib \ 3 codeclib \
4 pdblib \
4 PluckerCodec \ 5 PluckerCodec \
5 AportisCodec \ 6 AportisCodec \
6 CHM \ 7 CHM \
7 HTMLFilter \ 8 HTMLFilter \
8 WeaselCodec \ 9 WeaselCodec \
9 iSiloCodec \ 10 iSiloCodec \
10 pdblib \
11 ppmsCodec \ 11 ppmsCodec \
12 reader 12 reader
13 13
14include ( $(OPIEDIR)/include.pro ) 14include ( $(OPIEDIR)/include.pro )
15 15
16 16
diff --git a/noncore/apps/opie-reader/pdblib.mak b/noncore/apps/opie-reader/pdblib.mak
deleted file mode 100644
index 8174309..0000000
--- a/noncore/apps/opie-reader/pdblib.mak
+++ b/dev/null
@@ -1,161 +0,0 @@
1#############################################################################
2# Makefile for building: libreader_pdb.so.1.0.0
3# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:39:56 2004
4# Project: pdblib.pro
5# Template: lib
6# Command: $(QMAKE) -o pdblib.mak pdblib.pro
7#############################################################################
8
9####### Compiler, tools and options
10
11CC = gcc
12CXX = g++
13LEX = flex
14YACC = yacc
15CFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
16CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
17LEXFLAGS =
18YACCFLAGS= -d
19INCPATH = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
20LINK = g++
21LFLAGS = -shared -Wl,-soname,libreader_pdb.so.1
22LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm -lpthread
23AR = ar cqs
24RANLIB =
25MOC = $(QTDIR)/bin/moc
26UIC = $(QTDIR)/bin/uic
27QMAKE = qmake
28TAR = tar -cf
29GZIP = gzip -9f
30COPY = cp -f
31COPY_FILE= $(COPY)
32COPY_DIR = $(COPY) -r
33DEL_FILE = rm -f
34SYMLINK = ln -sf
35DEL_DIR = rmdir
36MOVE = mv -f
37CHK_DIR_EXISTS= test -d
38MKDIR = mkdir -p
39
40####### Output directory
41
42OBJECTS_DIR = QREADEROBJS/
43
44####### Files
45
46HEADERS = pdb.h
47SOURCES = pdb.cpp
48OBJECTS = QREADEROBJS/pdb.o
49FORMS =
50UICDECLS =
51UICIMPLS =
52SRCMOC =
53OBJMOC =
54 DIST = pdblib.pro
55QMAKE_TARGET = reader_pdb
56DESTDIR = $(READERDIR)/lib/
57TARGET = libreader_pdb.so.1.0.0
58 TARGETA= $(READERDIR)/lib/libreader_pdb.a
59 TARGETD= libreader_pdb.so.1.0.0
60 TARGET0= libreader_pdb.so
61 TARGET1= libreader_pdb.so.1
62 TARGET2= libreader_pdb.so.1.0
63
64first: all
65####### Implicit rules
66
67.SUFFIXES: .c .o .cpp .cc .cxx .C
68
69.cpp.o:
70 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
71
72.cc.o:
73 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
74
75.cxx.o:
76 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
77
78.C.o:
79 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
80
81.c.o:
82 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
83
84####### Build rules
85
86all: pdblib.mak $(READERDIR)/lib/$(TARGET)
87
88$(READERDIR)/lib/$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)
89 test -d $(READERDIR)/lib/ || mkdir -p $(READERDIR)/lib/
90 -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
91 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
92 -ln -s $(TARGET) $(TARGET0)
93 -ln -s $(TARGET) $(TARGET1)
94 -ln -s $(TARGET) $(TARGET2)
95 -$(DEL_FILE) $(READERDIR)/lib/$(TARGET)
96 -$(DEL_FILE) $(READERDIR)/lib/$(TARGET0)
97 -$(DEL_FILE) $(READERDIR)/lib/$(TARGET1)
98 -$(DEL_FILE) $(READERDIR)/lib/$(TARGET2)
99 -$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/lib/
100
101
102
103staticlib: $(TARGETA)
104
105$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
106 -$(DEL_FILE) $(TARGETA)
107 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
108
109mocables: $(SRCMOC)
110uicables: $(UICDECLS) $(UICIMPLS)
111
112$(MOC):
113 ( cd $(QTDIR)/src/moc ; $(MAKE) )
114
115pdblib.mak: pdblib.pro /usr/lib/qt3/mkspecs/default/qmake.conf
116 $(QMAKE) -o pdblib.mak pdblib.pro
117qmake:
118 @$(QMAKE) -o pdblib.mak pdblib.pro
119
120dist:
121 @mkdir -p QREADEROBJS/reader_pdb && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/reader_pdb/ && ( cd `dirname QREADEROBJS/reader_pdb` && $(TAR) reader_pdb.tar reader_pdb && $(GZIP) reader_pdb.tar ) && $(MOVE) `dirname QREADEROBJS/reader_pdb`/reader_pdb.tar.gz . && $(DEL_FILE) -r QREADEROBJS/reader_pdb
122
123mocclean:
124
125uiclean:
126
127yaccclean:
128lexclean:
129clean:
130 -$(DEL_FILE) $(OBJECTS)
131 -$(DEL_FILE) *~ core *.core
132
133
134####### Sub-libraries
135
136distclean: clean
137 -$(DEL_FILE) $(READERDIR)/lib/$(TARGET) $(TARGET)
138 -$(DEL_FILE) $(READERDIR)/lib/$(TARGET0) $(READERDIR)/lib/$(TARGET1) $(READERDIR)/lib/$(TARGET2) $(TARGETA)
139
140
141FORCE:
142
143####### Compile
144
145QREADEROBJS/pdb.o: pdb.cpp pdb.h \
146 QREADERINC/useqpe.h \
147 CExpander.h \
148 config.h \
149 StyleConsts.h \
150 Markups.h \
151 names.h \
152 linktype.h \
153 ustring.h
154 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/pdb.o pdb.cpp
155
156####### Install
157
158install: all
159
160uninstall:
161
diff --git a/noncore/apps/opie-reader/pdblib.omak b/noncore/apps/opie-reader/pdblib.omak
deleted file mode 100644
index b3a67c7..0000000
--- a/noncore/apps/opie-reader/pdblib.omak
+++ b/dev/null
@@ -1,122 +0,0 @@
1#############################################################################
2# Makefile for building libreader_pdb.so.1.0.0
3# Generated by tmake at 15:14, 2004/05/08
4# Project: pdblib.opro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
14 INCPATH =-IOREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =-shared -Wl,-soname,libreader_pdb.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lqte
18 AR =arm-linux-ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =pdb.h
29 SOURCES =pdb.cpp
30 OBJECTS =OREADEROBJS/pdb.o
31 INTERFACES =
32 UICDECLS =
33 UICIMPLS =
34 SRCMOC =
35 OBJMOC =
36 DIST =
37 TARGET =libreader_pdb.so.1.0.0
38 TARGETA =$(QTDIR)/lib/libreader_pdb.a
39 TARGETD =libreader_pdb.so.1.0.0
40 TARGET0 =libreader_pdb.so
41 TARGET1 =libreader_pdb.so.1
42 TARGET2 =libreader_pdb.so.1.0
43INTERFACE_DECL_PATH = .
44
45####### Implicit rules
46
47.SUFFIXES: .cpp .cxx .cc .C .c
48
49.cpp.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51
52.cxx.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54
55.cc.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57
58.C.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60
61.c.o:
62 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
63
64####### Build rules
65
66
67all: $(QTDIR)/lib/libreader_pdb.so.1.0.0
68
69$(QTDIR)/lib/libreader_pdb.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
70 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
71 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
72 -ln -s $(TARGET) $(TARGET0)
73 -ln -s $(TARGET) $(TARGET1)
74 -ln -s $(TARGET) $(TARGET2)
75 -rm -f $(QTDIR)/lib/$(TARGET)
76 -rm -f $(QTDIR)/lib/$(TARGET0)
77 -rm -f $(QTDIR)/lib/$(TARGET1)
78 -rm -f $(QTDIR)/lib/$(TARGET2)
79 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
80
81staticlib: $(TARGETA)
82
83$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
84 -rm -f $(TARGETA)
85 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
86
87moc: $(SRCMOC)
88
89tmake: pdblib.omak
90
91pdblib.omak: pdblib.opro
92 tmake pdblib.opro -o pdblib.omak
93
94dist:
95 $(TAR) pdblib.opro.tar pdblib.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
96 $(GZIP) pdblib.opro.tar
97
98clean:
99 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
100 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
101 -rm -f *~ core
102
103####### Sub-libraries
104
105
106###### Combined headers
107
108
109####### Compile
110
111OREADEROBJS/pdb.o: pdb.cpp \
112 pdb.h \
113 OREADERINC/useqpe.h \
114 CExpander.h \
115 config.h \
116 ustring.h \
117 StyleConsts.h \
118 Markups.h \
119 names.h \
120 linktype.h
121 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/pdb.o pdb.cpp
122
diff --git a/noncore/apps/opie-reader/pdblib.wmak b/noncore/apps/opie-reader/pdblib.wmak
deleted file mode 100644
index f06f05ad..0000000
--- a/noncore/apps/opie-reader/pdblib.wmak
+++ b/dev/null
@@ -1,122 +0,0 @@
1#############################################################################
2# Makefile for building libreader_pdb.so.1.0.0
3# Generated by tmake at 23:23, 2004/03/09
4# Project: pdblib.wpro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =gcc-2.96
11 CXX =g++-2.96
12 CFLAGS =-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
14 INCPATH =-IWSREADERINC -I$(QTDIR)/include
15 LINK =g++-2.96
16 LFLAGS =-shared -Wl,-soname,libreader_pdb.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lqte
18 AR =ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =pdb.h
29 SOURCES =pdb.cpp
30 OBJECTS =WSREADEROBJS/pdb.o
31 INTERFACES =
32 UICDECLS =
33 UICIMPLS =
34 SRCMOC =
35 OBJMOC =
36 DIST =
37 TARGET =libreader_pdb.so.1.0.0
38 TARGETA =$(QTDIR)/lib/libreader_pdb.a
39 TARGETD =libreader_pdb.so.1.0.0
40 TARGET0 =libreader_pdb.so
41 TARGET1 =libreader_pdb.so.1
42 TARGET2 =libreader_pdb.so.1.0
43INTERFACE_DECL_PATH = .
44
45####### Implicit rules
46
47.SUFFIXES: .cpp .cxx .cc .C .c
48
49.cpp.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51
52.cxx.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54
55.cc.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57
58.C.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60
61.c.o:
62 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
63
64####### Build rules
65
66
67all: $(QTDIR)/lib/libreader_pdb.so.1.0.0
68
69$(QTDIR)/lib/libreader_pdb.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
70 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
71 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
72 -ln -s $(TARGET) $(TARGET0)
73 -ln -s $(TARGET) $(TARGET1)
74 -ln -s $(TARGET) $(TARGET2)
75 -rm -f $(QTDIR)/lib/$(TARGET)
76 -rm -f $(QTDIR)/lib/$(TARGET0)
77 -rm -f $(QTDIR)/lib/$(TARGET1)
78 -rm -f $(QTDIR)/lib/$(TARGET2)
79 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
80
81staticlib: $(TARGETA)
82
83$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
84 -rm -f $(TARGETA)
85 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
86
87moc: $(SRCMOC)
88
89tmake: pdblib.wmak
90
91pdblib.wmak: pdblib.wpro
92 tmake pdblib.wpro -o pdblib.wmak
93
94dist:
95 $(TAR) pdblib.wpro.tar pdblib.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
96 $(GZIP) pdblib.wpro.tar
97
98clean:
99 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
100 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
101 -rm -f *~ core
102
103####### Sub-libraries
104
105
106###### Combined headers
107
108
109####### Compile
110
111WSREADEROBJS/pdb.o: pdb.cpp \
112 pdb.h \
113 WSREADERINC/useqpe.h \
114 CExpander.h \
115 config.h \
116 ustring.h \
117 StyleConsts.h \
118 Markups.h \
119 names.h \
120 linktype.h
121 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/pdb.o pdb.cpp
122
diff --git a/noncore/apps/opie-reader/pdblib.wpro b/noncore/apps/opie-reader/pdblib.wpro
deleted file mode 100644
index d78cc29..0000000
--- a/noncore/apps/opie-reader/pdblib.wpro
+++ b/dev/null
@@ -1,14 +0,0 @@
1 TEMPLATE= lib
2 CONFIG = qt warn_on release dll
3 HEADERS = pdb.h
4
5 SOURCES = pdb.cpp
6
7 INTERFACES=
8 DESTDIR = $(QTDIR)/lib
9 TARGET = reader_pdb
10
11OBJECTS_DIR = WSREADEROBJS
12MOC_DIR = WSREADERMOCS
13 INCLUDEPATH+= WSREADERINC
14 DEPENDPATH+= WSREADERINC
diff --git a/noncore/apps/opie-reader/pdblib.zmak b/noncore/apps/opie-reader/pdblib.zmak
deleted file mode 100644
index 2ee26d4..0000000
--- a/noncore/apps/opie-reader/pdblib.zmak
+++ b/dev/null
@@ -1,122 +0,0 @@
1#############################################################################
2# Makefile for building libreader_pdb.so.1.0.0
3# Generated by tmake at 15:17, 2004/05/08
4# Project: pdblib.zpro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
14 INCPATH =-IZREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =-shared -Wl,-soname,libreader_pdb.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lqte
18 AR =arm-linux-ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =pdb.h
29 SOURCES =pdb.cpp
30 OBJECTS =ZREADEROBJS/pdb.o
31 INTERFACES =
32 UICDECLS =
33 UICIMPLS =
34 SRCMOC =
35 OBJMOC =
36 DIST =
37 TARGET =libreader_pdb.so.1.0.0
38 TARGETA =$(QTDIR)/lib/libreader_pdb.a
39 TARGETD =libreader_pdb.so.1.0.0
40 TARGET0 =libreader_pdb.so
41 TARGET1 =libreader_pdb.so.1
42 TARGET2 =libreader_pdb.so.1.0
43INTERFACE_DECL_PATH = .
44
45####### Implicit rules
46
47.SUFFIXES: .cpp .cxx .cc .C .c
48
49.cpp.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51
52.cxx.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54
55.cc.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57
58.C.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60
61.c.o:
62 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
63
64####### Build rules
65
66
67all: $(QTDIR)/lib/libreader_pdb.so.1.0.0
68
69$(QTDIR)/lib/libreader_pdb.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
70 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
71 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
72 -ln -s $(TARGET) $(TARGET0)
73 -ln -s $(TARGET) $(TARGET1)
74 -ln -s $(TARGET) $(TARGET2)
75 -rm -f $(QTDIR)/lib/$(TARGET)
76 -rm -f $(QTDIR)/lib/$(TARGET0)
77 -rm -f $(QTDIR)/lib/$(TARGET1)
78 -rm -f $(QTDIR)/lib/$(TARGET2)
79 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
80
81staticlib: $(TARGETA)
82
83$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
84 -rm -f $(TARGETA)
85 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
86
87moc: $(SRCMOC)
88
89tmake: pdblib.zmak
90
91pdblib.zmak: pdblib.zpro
92 tmake pdblib.zpro -o pdblib.zmak
93
94dist:
95 $(TAR) pdblib.zpro.tar pdblib.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
96 $(GZIP) pdblib.zpro.tar
97
98clean:
99 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
100 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
101 -rm -f *~ core
102
103####### Sub-libraries
104
105
106###### Combined headers
107
108
109####### Compile
110
111ZREADEROBJS/pdb.o: pdb.cpp \
112 pdb.h \
113 ZREADERINC/useqpe.h \
114 CExpander.h \
115 config.h \
116 ustring.h \
117 StyleConsts.h \
118 Markups.h \
119 names.h \
120 linktype.h
121 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/pdb.o pdb.cpp
122
diff --git a/noncore/apps/opie-reader/pdblib.zpro b/noncore/apps/opie-reader/pdblib.zpro
deleted file mode 100644
index 94d3910..0000000
--- a/noncore/apps/opie-reader/pdblib.zpro
+++ b/dev/null
@@ -1,14 +0,0 @@
1 TEMPLATE= lib
2 CONFIG = qt warn_on release dll
3 HEADERS = pdb.h
4
5 SOURCES = pdb.cpp
6
7 INTERFACES=
8 DESTDIR = $(QTDIR)/lib
9 TARGET = reader_pdb
10
11OBJECTS_DIR = ZREADEROBJS
12MOC_DIR = ZREADERMOCS
13 INCLUDEPATH+= ZREADERINC
14 DEPENDPATH+= ZREADERINC
diff --git a/noncore/apps/opie-reader/pluckerbaselib.mak b/noncore/apps/opie-reader/pluckerbaselib.mak
deleted file mode 100644
index 325f3c3..0000000
--- a/noncore/apps/opie-reader/pluckerbaselib.mak
+++ b/dev/null
@@ -1,169 +0,0 @@
1#############################################################################
2# Makefile for building: libreader_pluckerbase.so.1.0.0
3# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:40:18 2004
4# Project: pluckerbaselib.pro
5# Template: lib
6# Command: $(QMAKE) -o pluckerbaselib.mak pluckerbaselib.pro
7#############################################################################
8
9####### Compiler, tools and options
10
11CC = gcc
12CXX = g++
13LEX = flex
14YACC = yacc
15CFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
16CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
17LEXFLAGS =
18YACCFLAGS= -d
19INCPATH = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
20LINK = g++
21LFLAGS = -shared -Wl,-soname,libreader_pluckerbase.so.1
22LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm -lpthread
23AR = ar cqs
24RANLIB =
25MOC = $(QTDIR)/bin/moc
26UIC = $(QTDIR)/bin/uic
27QMAKE = qmake
28TAR = tar -cf
29GZIP = gzip -9f
30COPY = cp -f
31COPY_FILE= $(COPY)
32COPY_DIR = $(COPY) -r
33DEL_FILE = rm -f
34SYMLINK = ln -sf
35DEL_DIR = rmdir
36MOVE = mv -f
37CHK_DIR_EXISTS= test -d
38MKDIR = mkdir -p
39
40####### Output directory
41
42OBJECTS_DIR = QREADEROBJS/
43
44####### Files
45
46HEADERS = pdb.h
47SOURCES = plucker_base.cpp
48OBJECTS = QREADEROBJS/plucker_base.o
49FORMS =
50UICDECLS =
51UICIMPLS =
52SRCMOC =
53OBJMOC =
54 DIST = pluckerbaselib.pro
55QMAKE_TARGET = reader_pluckerbase
56DESTDIR = $(READERDIR)/lib/
57TARGET = libreader_pluckerbase.so.1.0.0
58 TARGETA= $(READERDIR)/lib/libreader_pluckerbase.a
59 TARGETD= libreader_pluckerbase.so.1.0.0
60 TARGET0= libreader_pluckerbase.so
61 TARGET1= libreader_pluckerbase.so.1
62 TARGET2= libreader_pluckerbase.so.1.0
63
64first: all
65####### Implicit rules
66
67.SUFFIXES: .c .o .cpp .cc .cxx .C
68
69.cpp.o:
70 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
71
72.cc.o:
73 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
74
75.cxx.o:
76 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
77
78.C.o:
79 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
80
81.c.o:
82 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
83
84####### Build rules
85
86all: pluckerbaselib.mak $(READERDIR)/lib/$(TARGET)
87
88$(READERDIR)/lib/$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)
89 test -d $(READERDIR)/lib/ || mkdir -p $(READERDIR)/lib/
90 -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
91 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
92 -ln -s $(TARGET) $(TARGET0)
93 -ln -s $(TARGET) $(TARGET1)
94 -ln -s $(TARGET) $(TARGET2)
95 -$(DEL_FILE) $(READERDIR)/lib/$(TARGET)
96 -$(DEL_FILE) $(READERDIR)/lib/$(TARGET0)
97 -$(DEL_FILE) $(READERDIR)/lib/$(TARGET1)
98 -$(DEL_FILE) $(READERDIR)/lib/$(TARGET2)
99 -$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/lib/
100
101
102
103staticlib: $(TARGETA)
104
105$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
106 -$(DEL_FILE) $(TARGETA)
107 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
108
109mocables: $(SRCMOC)
110uicables: $(UICDECLS) $(UICIMPLS)
111
112$(MOC):
113 ( cd $(QTDIR)/src/moc ; $(MAKE) )
114
115pluckerbaselib.mak: pluckerbaselib.pro /usr/lib/qt3/mkspecs/default/qmake.conf
116 $(QMAKE) -o pluckerbaselib.mak pluckerbaselib.pro
117qmake:
118 @$(QMAKE) -o pluckerbaselib.mak pluckerbaselib.pro
119
120dist:
121 @mkdir -p QREADEROBJS/reader_pluckerbase && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/reader_pluckerbase/ && ( cd `dirname QREADEROBJS/reader_pluckerbase` && $(TAR) reader_pluckerbase.tar reader_pluckerbase && $(GZIP) reader_pluckerbase.tar ) && $(MOVE) `dirname QREADEROBJS/reader_pluckerbase`/reader_pluckerbase.tar.gz . && $(DEL_FILE) -r QREADEROBJS/reader_pluckerbase
122
123mocclean:
124
125uiclean:
126
127yaccclean:
128lexclean:
129clean:
130 -$(DEL_FILE) $(OBJECTS)
131 -$(DEL_FILE) *~ core *.core
132
133
134####### Sub-libraries
135
136distclean: clean
137 -$(DEL_FILE) $(READERDIR)/lib/$(TARGET) $(TARGET)
138 -$(DEL_FILE) $(READERDIR)/lib/$(TARGET0) $(READERDIR)/lib/$(TARGET1) $(READERDIR)/lib/$(TARGET2) $(TARGETA)
139
140
141FORCE:
142
143####### Compile
144
145QREADEROBJS/plucker_base.o: plucker_base.cpp QREADERINC/useqpe.h \
146 QREADERINC/static.h \
147 plucker_base.h \
148 Aportis.h \
149 hrule.h \
150 CExpander.h \
151 ztxt.h \
152 pdb.h \
153 CBuffer.h \
154 my_list.h \
155 Navigation.h \
156 config.h \
157 StyleConsts.h \
158 Markups.h \
159 names.h \
160 linktype.h \
161 ustring.h
162 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/plucker_base.o plucker_base.cpp
163
164####### Install
165
166install: all
167
168uninstall:
169
diff --git a/noncore/apps/opie-reader/pluckerbaselib.omak b/noncore/apps/opie-reader/pluckerbaselib.omak
deleted file mode 100644
index 605eabd..0000000
--- a/noncore/apps/opie-reader/pluckerbaselib.omak
+++ b/dev/null
@@ -1,131 +0,0 @@
1#############################################################################
2# Makefile for building libreader_pluckerbase.so.1.0.0
3# Generated by tmake at 15:14, 2004/05/08
4# Project: pluckerbaselib.opro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
14 INCPATH =-IOREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =-shared -Wl,-soname,libreader_pluckerbase.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lqte
18 AR =arm-linux-ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =pdb.h
29 SOURCES =plucker_base.cpp
30 OBJECTS =OREADEROBJS/plucker_base.o
31 INTERFACES =
32 UICDECLS =
33 UICIMPLS =
34 SRCMOC =
35 OBJMOC =
36 DIST =
37 TARGET =libreader_pluckerbase.so.1.0.0
38 TARGETA =$(QTDIR)/lib/libreader_pluckerbase.a
39 TARGETD =libreader_pluckerbase.so.1.0.0
40 TARGET0 =libreader_pluckerbase.so
41 TARGET1 =libreader_pluckerbase.so.1
42 TARGET2 =libreader_pluckerbase.so.1.0
43INTERFACE_DECL_PATH = .
44
45####### Implicit rules
46
47.SUFFIXES: .cpp .cxx .cc .C .c
48
49.cpp.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51
52.cxx.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54
55.cc.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57
58.C.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60
61.c.o:
62 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
63
64####### Build rules
65
66
67all: $(QTDIR)/lib/libreader_pluckerbase.so.1.0.0
68
69$(QTDIR)/lib/libreader_pluckerbase.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
70 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
71 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
72 -ln -s $(TARGET) $(TARGET0)
73 -ln -s $(TARGET) $(TARGET1)
74 -ln -s $(TARGET) $(TARGET2)
75 -rm -f $(QTDIR)/lib/$(TARGET)
76 -rm -f $(QTDIR)/lib/$(TARGET0)
77 -rm -f $(QTDIR)/lib/$(TARGET1)
78 -rm -f $(QTDIR)/lib/$(TARGET2)
79 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
80
81staticlib: $(TARGETA)
82
83$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
84 -rm -f $(TARGETA)
85 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
86
87moc: $(SRCMOC)
88
89tmake: pluckerbaselib.omak
90
91pluckerbaselib.omak: pluckerbaselib.opro
92 tmake pluckerbaselib.opro -o pluckerbaselib.omak
93
94dist:
95 $(TAR) pluckerbaselib.opro.tar pluckerbaselib.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
96 $(GZIP) pluckerbaselib.opro.tar
97
98clean:
99 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
100 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
101 -rm -f *~ core
102
103####### Sub-libraries
104
105
106###### Combined headers
107
108
109####### Compile
110
111OREADEROBJS/plucker_base.o: plucker_base.cpp \
112 OREADERINC/useqpe.h \
113 OREADERINC/static.h \
114 plucker_base.h \
115 CExpander.h \
116 config.h \
117 ustring.h \
118 StyleConsts.h \
119 Markups.h \
120 names.h \
121 linktype.h \
122 ztxt.h \
123 pdb.h \
124 CBuffer.h \
125 my_list.h \
126 Navigation.h \
127 hrule.h \
128 Aportis.h \
129 Model.h
130 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/plucker_base.o plucker_base.cpp
131
diff --git a/noncore/apps/opie-reader/pluckerbaselib.wmak b/noncore/apps/opie-reader/pluckerbaselib.wmak
deleted file mode 100644
index 3cc63a4..0000000
--- a/noncore/apps/opie-reader/pluckerbaselib.wmak
+++ b/dev/null
@@ -1,131 +0,0 @@
1#############################################################################
2# Makefile for building libreader_pluckerbase.so.1.0.0
3# Generated by tmake at 23:23, 2004/03/09
4# Project: pluckerbaselib.wpro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =gcc-2.96
11 CXX =g++-2.96
12 CFLAGS =-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
14 INCPATH =-IWSREADERINC -I$(QTDIR)/include
15 LINK =g++-2.96
16 LFLAGS =-shared -Wl,-soname,libreader_pluckerbase.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lqte
18 AR =ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =pdb.h
29 SOURCES =plucker_base.cpp
30 OBJECTS =WSREADEROBJS/plucker_base.o
31 INTERFACES =
32 UICDECLS =
33 UICIMPLS =
34 SRCMOC =
35 OBJMOC =
36 DIST =
37 TARGET =libreader_pluckerbase.so.1.0.0
38 TARGETA =$(QTDIR)/lib/libreader_pluckerbase.a
39 TARGETD =libreader_pluckerbase.so.1.0.0
40 TARGET0 =libreader_pluckerbase.so
41 TARGET1 =libreader_pluckerbase.so.1
42 TARGET2 =libreader_pluckerbase.so.1.0
43INTERFACE_DECL_PATH = .
44
45####### Implicit rules
46
47.SUFFIXES: .cpp .cxx .cc .C .c
48
49.cpp.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51
52.cxx.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54
55.cc.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57
58.C.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60
61.c.o:
62 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
63
64####### Build rules
65
66
67all: $(QTDIR)/lib/libreader_pluckerbase.so.1.0.0
68
69$(QTDIR)/lib/libreader_pluckerbase.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
70 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
71 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
72 -ln -s $(TARGET) $(TARGET0)
73 -ln -s $(TARGET) $(TARGET1)
74 -ln -s $(TARGET) $(TARGET2)
75 -rm -f $(QTDIR)/lib/$(TARGET)
76 -rm -f $(QTDIR)/lib/$(TARGET0)
77 -rm -f $(QTDIR)/lib/$(TARGET1)
78 -rm -f $(QTDIR)/lib/$(TARGET2)
79 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
80
81staticlib: $(TARGETA)
82
83$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
84 -rm -f $(TARGETA)
85 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
86
87moc: $(SRCMOC)
88
89tmake: pluckerbaselib.wmak
90
91pluckerbaselib.wmak: pluckerbaselib.wpro
92 tmake pluckerbaselib.wpro -o pluckerbaselib.wmak
93
94dist:
95 $(TAR) pluckerbaselib.wpro.tar pluckerbaselib.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
96 $(GZIP) pluckerbaselib.wpro.tar
97
98clean:
99 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
100 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
101 -rm -f *~ core
102
103####### Sub-libraries
104
105
106###### Combined headers
107
108
109####### Compile
110
111WSREADEROBJS/plucker_base.o: plucker_base.cpp \
112 WSREADERINC/useqpe.h \
113 WSREADERINC/static.h \
114 plucker_base.h \
115 CExpander.h \
116 config.h \
117 ustring.h \
118 StyleConsts.h \
119 Markups.h \
120 names.h \
121 linktype.h \
122 ztxt.h \
123 pdb.h \
124 CBuffer.h \
125 my_list.h \
126 Navigation.h \
127 hrule.h \
128 Aportis.h \
129 Model.h
130 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/plucker_base.o plucker_base.cpp
131
diff --git a/noncore/apps/opie-reader/pluckerbaselib.wpro b/noncore/apps/opie-reader/pluckerbaselib.wpro
deleted file mode 100644
index 6798c0d..0000000
--- a/noncore/apps/opie-reader/pluckerbaselib.wpro
+++ b/dev/null
@@ -1,14 +0,0 @@
1 TEMPLATE= lib
2 CONFIG = qt warn_on release dll
3 HEADERS = pdb.h
4
5 SOURCES = plucker_base.cpp
6
7 INTERFACES=
8 DESTDIR = $(QTDIR)/lib
9 TARGET = reader_pluckerbase
10
11OBJECTS_DIR = WSREADEROBJS
12MOC_DIR = WSREADERMOCS
13 INCLUDEPATH+= WSREADERINC
14 DEPENDPATH+= WSREADERINC
diff --git a/noncore/apps/opie-reader/pluckerbaselib.zmak b/noncore/apps/opie-reader/pluckerbaselib.zmak
deleted file mode 100644
index 16dd6e4..0000000
--- a/noncore/apps/opie-reader/pluckerbaselib.zmak
+++ b/dev/null
@@ -1,131 +0,0 @@
1#############################################################################
2# Makefile for building libreader_pluckerbase.so.1.0.0
3# Generated by tmake at 15:17, 2004/05/08
4# Project: pluckerbaselib.zpro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
14 INCPATH =-IZREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =-shared -Wl,-soname,libreader_pluckerbase.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lqte
18 AR =arm-linux-ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =pdb.h
29 SOURCES =plucker_base.cpp
30 OBJECTS =ZREADEROBJS/plucker_base.o
31 INTERFACES =
32 UICDECLS =
33 UICIMPLS =
34 SRCMOC =
35 OBJMOC =
36 DIST =
37 TARGET =libreader_pluckerbase.so.1.0.0
38 TARGETA =$(QTDIR)/lib/libreader_pluckerbase.a
39 TARGETD =libreader_pluckerbase.so.1.0.0
40 TARGET0 =libreader_pluckerbase.so
41 TARGET1 =libreader_pluckerbase.so.1
42 TARGET2 =libreader_pluckerbase.so.1.0
43INTERFACE_DECL_PATH = .
44
45####### Implicit rules
46
47.SUFFIXES: .cpp .cxx .cc .C .c
48
49.cpp.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51
52.cxx.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54
55.cc.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57
58.C.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60
61.c.o:
62 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
63
64####### Build rules
65
66
67all: $(QTDIR)/lib/libreader_pluckerbase.so.1.0.0
68
69$(QTDIR)/lib/libreader_pluckerbase.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
70 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
71 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
72 -ln -s $(TARGET) $(TARGET0)
73 -ln -s $(TARGET) $(TARGET1)
74 -ln -s $(TARGET) $(TARGET2)
75 -rm -f $(QTDIR)/lib/$(TARGET)
76 -rm -f $(QTDIR)/lib/$(TARGET0)
77 -rm -f $(QTDIR)/lib/$(TARGET1)
78 -rm -f $(QTDIR)/lib/$(TARGET2)
79 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
80
81staticlib: $(TARGETA)
82
83$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
84 -rm -f $(TARGETA)
85 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
86
87moc: $(SRCMOC)
88
89tmake: pluckerbaselib.zmak
90
91pluckerbaselib.zmak: pluckerbaselib.zpro
92 tmake pluckerbaselib.zpro -o pluckerbaselib.zmak
93
94dist:
95 $(TAR) pluckerbaselib.zpro.tar pluckerbaselib.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
96 $(GZIP) pluckerbaselib.zpro.tar
97
98clean:
99 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
100 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
101 -rm -f *~ core
102
103####### Sub-libraries
104
105
106###### Combined headers
107
108
109####### Compile
110
111ZREADEROBJS/plucker_base.o: plucker_base.cpp \
112 ZREADERINC/useqpe.h \
113 ZREADERINC/static.h \
114 plucker_base.h \
115 CExpander.h \
116 config.h \
117 ustring.h \
118 StyleConsts.h \
119 Markups.h \
120 names.h \
121 linktype.h \
122 ztxt.h \
123 pdb.h \
124 CBuffer.h \
125 my_list.h \
126 Navigation.h \
127 hrule.h \
128 Aportis.h \
129 Model.h
130 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/plucker_base.o plucker_base.cpp
131
diff --git a/noncore/apps/opie-reader/pluckerbaselib.zpro b/noncore/apps/opie-reader/pluckerbaselib.zpro
deleted file mode 100644
index 006aa07..0000000
--- a/noncore/apps/opie-reader/pluckerbaselib.zpro
+++ b/dev/null
@@ -1,14 +0,0 @@
1 TEMPLATE= lib
2 CONFIG = qt warn_on release dll
3 HEADERS = pdb.h
4
5 SOURCES = plucker_base.cpp
6
7 INTERFACES=
8 DESTDIR = $(QTDIR)/lib
9 TARGET = reader_pluckerbase
10
11OBJECTS_DIR = ZREADEROBJS
12MOC_DIR = ZREADERMOCS
13 INCLUDEPATH+= ZREADERINC
14 DEPENDPATH+= ZREADERINC
diff --git a/noncore/apps/opie-reader/ppmsCodec.mak b/noncore/apps/opie-reader/ppmsCodec.mak
deleted file mode 100644
index 19d3a2c..0000000
--- a/noncore/apps/opie-reader/ppmsCodec.mak
+++ b/dev/null
@@ -1,178 +0,0 @@
1#############################################################################
2# Makefile for building: libppms.so.1.0.0
3# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:41:16 2004
4# Project: ppmsCodec.pro
5# Template: lib
6# Command: $(QMAKE) -o ppmsCodec.mak ppmsCodec.pro
7#############################################################################
8
9####### Compiler, tools and options
10
11CC = gcc
12CXX = g++
13LEX = flex
14YACC = yacc
15CFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
16CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
17LEXFLAGS =
18YACCFLAGS= -d
19INCPATH = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
20LINK = g++
21LFLAGS = -shared -Wl,-soname,libppms.so.1
22LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_codec -lqt-mt -lXext -lX11 -lm -lpthread
23AR = ar cqs
24RANLIB =
25MOC = $(QTDIR)/bin/moc
26UIC = $(QTDIR)/bin/uic
27QMAKE = qmake
28TAR = tar -cf
29GZIP = gzip -9f
30COPY = cp -f
31COPY_FILE= $(COPY)
32COPY_DIR = $(COPY) -r
33DEL_FILE = rm -f
34SYMLINK = ln -sf
35DEL_DIR = rmdir
36MOVE = mv -f
37CHK_DIR_EXISTS= test -d
38MKDIR = mkdir -p
39
40####### Output directory
41
42OBJECTS_DIR = QREADEROBJS/
43
44####### Files
45
46HEADERS = Aportis.h
47SOURCES = ppm_expander.cpp \
48 ppm.cpp \
49 arith_d.cpp
50OBJECTS = QREADEROBJS/ppm_expander.o \
51 QREADEROBJS/ppm.o \
52 QREADEROBJS/arith_d.o
53FORMS =
54UICDECLS =
55UICIMPLS =
56SRCMOC =
57OBJMOC =
58 DIST = ppmsCodec.pro
59QMAKE_TARGET = ppms
60DESTDIR = $(READERDIR)/codecs/
61TARGET = libppms.so.1.0.0
62 TARGETA= $(READERDIR)/codecs/libppms.a
63 TARGETD= libppms.so.1.0.0
64 TARGET0= libppms.so
65 TARGET1= libppms.so.1
66 TARGET2= libppms.so.1.0
67
68first: all
69####### Implicit rules
70
71.SUFFIXES: .c .o .cpp .cc .cxx .C
72
73.cpp.o:
74 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
75
76.cc.o:
77 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
78
79.cxx.o:
80 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
81
82.C.o:
83 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
84
85.c.o:
86 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
87
88####### Build rules
89
90all: ppmsCodec.mak $(READERDIR)/codecs/$(TARGET)
91
92$(READERDIR)/codecs/$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)
93 test -d $(READERDIR)/codecs/ || mkdir -p $(READERDIR)/codecs/
94 -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
95 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
96 -ln -s $(TARGET) $(TARGET0)
97 -ln -s $(TARGET) $(TARGET1)
98 -ln -s $(TARGET) $(TARGET2)
99 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET)
100 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0)
101 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET1)
102 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET2)
103 -$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/codecs/
104
105
106
107staticlib: $(TARGETA)
108
109$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
110 -$(DEL_FILE) $(TARGETA)
111 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
112
113mocables: $(SRCMOC)
114uicables: $(UICDECLS) $(UICIMPLS)
115
116$(MOC):
117 ( cd $(QTDIR)/src/moc ; $(MAKE) )
118
119ppmsCodec.mak: ppmsCodec.pro /usr/lib/qt3/mkspecs/default/qmake.conf
120 $(QMAKE) -o ppmsCodec.mak ppmsCodec.pro
121qmake:
122 @$(QMAKE) -o ppmsCodec.mak ppmsCodec.pro
123
124dist:
125 @mkdir -p QREADEROBJS/ppms && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/ppms/ && ( cd `dirname QREADEROBJS/ppms` && $(TAR) ppms.tar ppms && $(GZIP) ppms.tar ) && $(MOVE) `dirname QREADEROBJS/ppms`/ppms.tar.gz . && $(DEL_FILE) -r QREADEROBJS/ppms
126
127mocclean:
128
129uiclean:
130
131yaccclean:
132lexclean:
133clean:
134 -$(DEL_FILE) $(OBJECTS)
135 -$(DEL_FILE) *~ core *.core
136
137
138####### Sub-libraries
139
140distclean: clean
141 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET) $(TARGET)
142 -$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0) $(READERDIR)/codecs/$(TARGET1) $(READERDIR)/codecs/$(TARGET2) $(TARGETA)
143
144
145FORCE:
146
147####### Compile
148
149QREADEROBJS/ppm_expander.o: ppm_expander.cpp QREADERINC/static.h \
150 ppm_expander.h \
151 QREADERINC/useqpe.h \
152 CExpander.h \
153 utypes.h \
154 ppm.h \
155 arith.h \
156 config.h \
157 StyleConsts.h \
158 Markups.h \
159 names.h \
160 linktype.h \
161 ustring.h
162 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/ppm_expander.o ppm_expander.cpp
163
164QREADEROBJS/ppm.o: ppm.cpp arith.h \
165 ppm.h \
166 utypes.h
167 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/ppm.o ppm.cpp
168
169QREADEROBJS/arith_d.o: arith_d.cpp arith.h \
170 utypes.h
171 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/arith_d.o arith_d.cpp
172
173####### Install
174
175install: all
176
177uninstall:
178
diff --git a/noncore/apps/opie-reader/ppmsCodec.omak b/noncore/apps/opie-reader/ppmsCodec.omak
deleted file mode 100644
index c974898..0000000
--- a/noncore/apps/opie-reader/ppmsCodec.omak
+++ b/dev/null
@@ -1,141 +0,0 @@
1#############################################################################
2# Makefile for building libppms.so.1.0.0
3# Generated by tmake at 15:14, 2004/05/08
4# Project: ppmsCodec.opro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
14 INCPATH =-IOREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =-shared -Wl,-soname,libppms.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lreader_codec -lqte
18 AR =arm-linux-ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =Aportis.h
29 SOURCES =ppm_expander.cpp \
30 ppm.cpp \
31 arith_d.cpp
32 OBJECTS =OREADEROBJS/ppm_expander.o \
33 OREADEROBJS/ppm.o \
34 OREADEROBJS/arith_d.o
35 INTERFACES =
36 UICDECLS =
37 UICIMPLS =
38 SRCMOC =
39 OBJMOC =
40 DIST =
41 TARGET =libppms.so.1.0.0
42 TARGETA =$(QTDIR)/plugins/reader/codecs/libppms.a
43 TARGETD =libppms.so.1.0.0
44 TARGET0 =libppms.so
45 TARGET1 =libppms.so.1
46 TARGET2 =libppms.so.1.0
47INTERFACE_DECL_PATH = .
48
49####### Implicit rules
50
51.SUFFIXES: .cpp .cxx .cc .C .c
52
53.cpp.o:
54 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
55
56.cxx.o:
57 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
58
59.cc.o:
60 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
61
62.C.o:
63 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
64
65.c.o:
66 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
67
68####### Build rules
69
70
71all: $(QTDIR)/plugins/reader/codecs/libppms.so.1.0.0
72
73$(QTDIR)/plugins/reader/codecs/libppms.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
74 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
75 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
76 -ln -s $(TARGET) $(TARGET0)
77 -ln -s $(TARGET) $(TARGET1)
78 -ln -s $(TARGET) $(TARGET2)
79 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
80 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
81 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
82 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
83 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
84
85staticlib: $(TARGETA)
86
87$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
88 -rm -f $(TARGETA)
89 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
90
91moc: $(SRCMOC)
92
93tmake: ppmsCodec.omak
94
95ppmsCodec.omak: ppmsCodec.opro
96 tmake ppmsCodec.opro -o ppmsCodec.omak
97
98dist:
99 $(TAR) ppmsCodec.opro.tar ppmsCodec.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
100 $(GZIP) ppmsCodec.opro.tar
101
102clean:
103 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
104 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
105 -rm -f *~ core
106
107####### Sub-libraries
108
109
110###### Combined headers
111
112
113####### Compile
114
115OREADEROBJS/ppm_expander.o: ppm_expander.cpp \
116 OREADERINC/static.h \
117 ppm_expander.h \
118 OREADERINC/useqpe.h \
119 CExpander.h \
120 config.h \
121 ustring.h \
122 StyleConsts.h \
123 Markups.h \
124 names.h \
125 linktype.h \
126 utypes.h \
127 ppm.h \
128 arith.h
129 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/ppm_expander.o ppm_expander.cpp
130
131OREADEROBJS/ppm.o: ppm.cpp \
132 arith.h \
133 utypes.h \
134 ppm.h
135 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/ppm.o ppm.cpp
136
137OREADEROBJS/arith_d.o: arith_d.cpp \
138 arith.h \
139 utypes.h
140 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/arith_d.o arith_d.cpp
141
diff --git a/noncore/apps/opie-reader/ppmsCodec.wmak b/noncore/apps/opie-reader/ppmsCodec.wmak
deleted file mode 100644
index 5d8d4a7..0000000
--- a/noncore/apps/opie-reader/ppmsCodec.wmak
+++ b/dev/null
@@ -1,141 +0,0 @@
1#############################################################################
2# Makefile for building libppms.so.1.0.0
3# Generated by tmake at 23:23, 2004/03/09
4# Project: ppmsCodec.wpro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =gcc-2.96
11 CXX =g++-2.96
12 CFLAGS =-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
14 INCPATH =-IWSREADERINC -I$(QTDIR)/include
15 LINK =g++-2.96
16 LFLAGS =-shared -Wl,-soname,libppms.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lreader_codec -lqte
18 AR =ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =Aportis.h
29 SOURCES =ppm_expander.cpp \
30 ppm.cpp \
31 arith_d.cpp
32 OBJECTS =WSREADEROBJS/ppm_expander.o \
33 WSREADEROBJS/ppm.o \
34 WSREADEROBJS/arith_d.o
35 INTERFACES =
36 UICDECLS =
37 UICIMPLS =
38 SRCMOC =
39 OBJMOC =
40 DIST =
41 TARGET =libppms.so.1.0.0
42 TARGETA =$(QTDIR)/plugins/reader/codecs/libppms.a
43 TARGETD =libppms.so.1.0.0
44 TARGET0 =libppms.so
45 TARGET1 =libppms.so.1
46 TARGET2 =libppms.so.1.0
47INTERFACE_DECL_PATH = .
48
49####### Implicit rules
50
51.SUFFIXES: .cpp .cxx .cc .C .c
52
53.cpp.o:
54 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
55
56.cxx.o:
57 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
58
59.cc.o:
60 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
61
62.C.o:
63 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
64
65.c.o:
66 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
67
68####### Build rules
69
70
71all: $(QTDIR)/plugins/reader/codecs/libppms.so.1.0.0
72
73$(QTDIR)/plugins/reader/codecs/libppms.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
74 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
75 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
76 -ln -s $(TARGET) $(TARGET0)
77 -ln -s $(TARGET) $(TARGET1)
78 -ln -s $(TARGET) $(TARGET2)
79 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
80 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
81 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
82 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
83 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
84
85staticlib: $(TARGETA)
86
87$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
88 -rm -f $(TARGETA)
89 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
90
91moc: $(SRCMOC)
92
93tmake: ppmsCodec.wmak
94
95ppmsCodec.wmak: ppmsCodec.wpro
96 tmake ppmsCodec.wpro -o ppmsCodec.wmak
97
98dist:
99 $(TAR) ppmsCodec.wpro.tar ppmsCodec.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
100 $(GZIP) ppmsCodec.wpro.tar
101
102clean:
103 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
104 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
105 -rm -f *~ core
106
107####### Sub-libraries
108
109
110###### Combined headers
111
112
113####### Compile
114
115WSREADEROBJS/ppm_expander.o: ppm_expander.cpp \
116 WSREADERINC/static.h \
117 ppm_expander.h \
118 WSREADERINC/useqpe.h \
119 CExpander.h \
120 config.h \
121 ustring.h \
122 StyleConsts.h \
123 Markups.h \
124 names.h \
125 linktype.h \
126 utypes.h \
127 ppm.h \
128 arith.h
129 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/ppm_expander.o ppm_expander.cpp
130
131WSREADEROBJS/ppm.o: ppm.cpp \
132 arith.h \
133 utypes.h \
134 ppm.h
135 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/ppm.o ppm.cpp
136
137WSREADEROBJS/arith_d.o: arith_d.cpp \
138 arith.h \
139 utypes.h
140 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/arith_d.o arith_d.cpp
141
diff --git a/noncore/apps/opie-reader/ppmsCodec.wpro b/noncore/apps/opie-reader/ppmsCodec.wpro
deleted file mode 100644
index f250d90..0000000
--- a/noncore/apps/opie-reader/ppmsCodec.wpro
+++ b/dev/null
@@ -1,17 +0,0 @@
1 TEMPLATE= lib
2 CONFIG = qt warn_on release dll
3 HEADERS = Aportis.h
4
5 SOURCES = ppm_expander.cpp \
6 ppm.cpp \
7 arith_d.cpp
8
9 INTERFACES=
10 DESTDIR = $(QTDIR)/plugins/reader/codecs
11 TARGET = ppms
12LIBS += -lreader_codec
13
14OBJECTS_DIR = WSREADEROBJS
15MOC_DIR = WSREADERMOCS
16 INCLUDEPATH+= WSREADERINC
17 DEPENDPATH+= WSREADERINC
diff --git a/noncore/apps/opie-reader/ppmsCodec.zmak b/noncore/apps/opie-reader/ppmsCodec.zmak
deleted file mode 100644
index df92c50..0000000
--- a/noncore/apps/opie-reader/ppmsCodec.zmak
+++ b/dev/null
@@ -1,141 +0,0 @@
1#############################################################################
2# Makefile for building libppms.so.1.0.0
3# Generated by tmake at 15:17, 2004/05/08
4# Project: ppmsCodec.zpro
5# Template: lib
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
14 INCPATH =-IZREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =-shared -Wl,-soname,libppms.so.1
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lreader_codec -lqte
18 AR =arm-linux-ar cqs
19 RANLIB =
20 MOC =$(QTDIR)/bin/moc
21 UIC =$(QTDIR)/bin/uic
22
23 TAR =tar -cf
24 GZIP =gzip -9f
25
26####### Files
27
28 HEADERS =Aportis.h
29 SOURCES =ppm_expander.cpp \
30 ppm.cpp \
31 arith_d.cpp
32 OBJECTS =ZREADEROBJS/ppm_expander.o \
33 ZREADEROBJS/ppm.o \
34 ZREADEROBJS/arith_d.o
35 INTERFACES =
36 UICDECLS =
37 UICIMPLS =
38 SRCMOC =
39 OBJMOC =
40 DIST =
41 TARGET =libppms.so.1.0.0
42 TARGETA =$(QTDIR)/plugins/reader/codecs/libppms.a
43 TARGETD =libppms.so.1.0.0
44 TARGET0 =libppms.so
45 TARGET1 =libppms.so.1
46 TARGET2 =libppms.so.1.0
47INTERFACE_DECL_PATH = .
48
49####### Implicit rules
50
51.SUFFIXES: .cpp .cxx .cc .C .c
52
53.cpp.o:
54 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
55
56.cxx.o:
57 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
58
59.cc.o:
60 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
61
62.C.o:
63 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
64
65.c.o:
66 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
67
68####### Build rules
69
70
71all: $(QTDIR)/plugins/reader/codecs/libppms.so.1.0.0
72
73$(QTDIR)/plugins/reader/codecs/libppms.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS)
74 -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
75 $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
76 -ln -s $(TARGET) $(TARGET0)
77 -ln -s $(TARGET) $(TARGET1)
78 -ln -s $(TARGET) $(TARGET2)
79 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
80 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
81 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
82 -rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
83 -mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
84
85staticlib: $(TARGETA)
86
87$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)
88 -rm -f $(TARGETA)
89 $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
90
91moc: $(SRCMOC)
92
93tmake: ppmsCodec.zmak
94
95ppmsCodec.zmak: ppmsCodec.zpro
96 tmake ppmsCodec.zpro -o ppmsCodec.zmak
97
98dist:
99 $(TAR) ppmsCodec.zpro.tar ppmsCodec.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
100 $(GZIP) ppmsCodec.zpro.tar
101
102clean:
103 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
104 -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
105 -rm -f *~ core
106
107####### Sub-libraries
108
109
110###### Combined headers
111
112
113####### Compile
114
115ZREADEROBJS/ppm_expander.o: ppm_expander.cpp \
116 ZREADERINC/static.h \
117 ppm_expander.h \
118 ZREADERINC/useqpe.h \
119 CExpander.h \
120 config.h \
121 ustring.h \
122 StyleConsts.h \
123 Markups.h \
124 names.h \
125 linktype.h \
126 utypes.h \
127 ppm.h \
128 arith.h
129 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/ppm_expander.o ppm_expander.cpp
130
131ZREADEROBJS/ppm.o: ppm.cpp \
132 arith.h \
133 utypes.h \
134 ppm.h
135 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/ppm.o ppm.cpp
136
137ZREADEROBJS/arith_d.o: arith_d.cpp \
138 arith.h \
139 utypes.h
140 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/arith_d.o arith_d.cpp
141
diff --git a/noncore/apps/opie-reader/ppmsCodec.zpro b/noncore/apps/opie-reader/ppmsCodec.zpro
deleted file mode 100644
index f758118..0000000
--- a/noncore/apps/opie-reader/ppmsCodec.zpro
+++ b/dev/null
@@ -1,17 +0,0 @@
1 TEMPLATE= lib
2 CONFIG = qt warn_on release dll
3 HEADERS = Aportis.h
4
5 SOURCES = ppm_expander.cpp \
6 ppm.cpp \
7 arith_d.cpp
8
9 INTERFACES=
10 DESTDIR = $(QTDIR)/plugins/reader/codecs
11 TARGET = ppms
12LIBS += -lreader_codec
13
14OBJECTS_DIR = ZREADEROBJS
15MOC_DIR = ZREADERMOCS
16 INCLUDEPATH+= ZREADERINC
17 DEPENDPATH+= ZREADERINC
diff --git a/noncore/apps/opie-reader/reader.mak b/noncore/apps/opie-reader/reader.mak
deleted file mode 100644
index 4bc2eec..0000000
--- a/noncore/apps/opie-reader/reader.mak
+++ b/dev/null
@@ -1,591 +0,0 @@
1#############################################################################
2# Makefile for building: ../bin/uqtreader
3# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:41:42 2004
4# Project: reader.pro
5# Template: app
6# Command: $(QMAKE) -o reader.mak reader.pro
7#############################################################################
8
9####### Compiler, tools and options
10
11CC = gcc
12CXX = g++
13LEX = flex
14YACC = yacc
15CFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -DQT_NO_DEBUG
16CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -DQT_NO_DEBUG
17LEXFLAGS =
18YACCFLAGS= -d
19INCPATH = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
20LINK = g++
21LFLAGS =
22LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_codec -lqt-mt -lXext -lX11 -lm
23AR = ar cqs
24RANLIB =
25MOC = $(QTDIR)/bin/moc
26UIC = $(QTDIR)/bin/uic
27QMAKE = qmake
28TAR = tar -cf
29GZIP = gzip -9f
30COPY = cp -f
31COPY_FILE= $(COPY)
32COPY_DIR = $(COPY) -r
33DEL_FILE = rm -f
34SYMLINK = ln -sf
35DEL_DIR = rmdir
36MOVE = mv -f
37CHK_DIR_EXISTS= test -d
38MKDIR = mkdir -p
39
40####### Output directory
41
42OBJECTS_DIR = QREADEROBJS/
43
44####### Files
45
46HEADERS = Aportis.h \
47 Bkmks.h \
48 BuffDoc.h \
49 ButtonPrefs.h \
50 CAnnoEdit.h \
51 CBuffer.h \
52 CDrawBuffer.h \
53 CEncoding.h \
54 CEncoding_tables.h \
55 CExpander.h \
56 CFilter.h \
57 CloseDialog.h \
58 Filedata.h \
59 FixedFont.h \
60 FontControl.h \
61 GraphicWin.h \
62 Markups.h \
63 Navigation.h \
64 Palm2QImage.h \
65 Prefs.h \
66 QFloatBar.h \
67 QTReader.h \
68 QTReaderApp.h \
69 QtrListView.h \
70 Queue.h \
71 StyleConsts.h \
72 ToolbarPrefs.h \
73 URLDialog.h \
74 ZText.h \
75 arith.h \
76 cbkmkselector.h \
77 config.h \
78 infowin.h \
79 linktype.h \
80 my_list.h \
81 names.h \
82 QREADERINC/opie.h \
83 pdb.h \
84 plucker.h \
85 plucker_base.h \
86 ppm.h \
87 ppm_expander.h \
88 preferences.h \
89 usenef.h \
90 QREADERINC/useqpe.h \
91 ustring.h \
92 util.h \
93 utypes.h \
94 version.h \
95 ztxt.h
96SOURCES = BuffDoc.cpp \
97 ButtonPrefs.cpp \
98 CAnnoEdit.cpp \
99 CDrawBuffer.cpp \
100 CEncoding.cpp \
101 CEncoding_tables.cpp \
102 CFilter.cpp \
103 CRegExp.cpp \
104 CloseDialog.cpp \
105 FontControl.cpp \
106 GraphicWin.cpp \
107 Prefs.cpp \
108 QTReader.cpp \
109 QTReaderApp.cpp \
110 QtrListView.cpp \
111 ToolbarPrefs.cpp \
112 URLDialog.cpp \
113 infowin.cpp \
114 main.cpp \
115 orkey.cpp \
116 preferences.cpp \
117 util.cpp \
118 version.cpp
119OBJECTS = QREADEROBJS/BuffDoc.o \
120 QREADEROBJS/ButtonPrefs.o \
121 QREADEROBJS/CAnnoEdit.o \
122 QREADEROBJS/CDrawBuffer.o \
123 QREADEROBJS/CEncoding.o \
124 QREADEROBJS/CEncoding_tables.o \
125 QREADEROBJS/CFilter.o \
126 QREADEROBJS/CRegExp.o \
127 QREADEROBJS/CloseDialog.o \
128 QREADEROBJS/FontControl.o \
129 QREADEROBJS/GraphicWin.o \
130 QREADEROBJS/Prefs.o \
131 QREADEROBJS/QTReader.o \
132 QREADEROBJS/QTReaderApp.o \
133 QREADEROBJS/QtrListView.o \
134 QREADEROBJS/ToolbarPrefs.o \
135 QREADEROBJS/URLDialog.o \
136 QREADEROBJS/infowin.o \
137 QREADEROBJS/main.o \
138 QREADEROBJS/orkey.o \
139 QREADEROBJS/preferences.o \
140 QREADEROBJS/util.o \
141 QREADEROBJS/version.o
142FORMS =
143UICDECLS =
144UICIMPLS =
145SRCMOC = QREADERMOCS/moc_ButtonPrefs.cpp \
146 QREADERMOCS/moc_CAnnoEdit.cpp \
147 QREADERMOCS/moc_CloseDialog.cpp \
148 QREADERMOCS/moc_GraphicWin.cpp \
149 QREADERMOCS/moc_Prefs.cpp \
150 QREADERMOCS/moc_QFloatBar.cpp \
151 QREADERMOCS/moc_QTReader.cpp \
152 QREADERMOCS/moc_QTReaderApp.cpp \
153 QREADERMOCS/moc_QtrListView.cpp \
154 QREADERMOCS/moc_ToolbarPrefs.cpp \
155 QREADERMOCS/moc_URLDialog.cpp \
156 QREADERMOCS/moc_cbkmkselector.cpp \
157 QREADERMOCS/moc_infowin.cpp
158OBJMOC = QREADEROBJS/moc_ButtonPrefs.o \
159 QREADEROBJS/moc_CAnnoEdit.o \
160 QREADEROBJS/moc_CloseDialog.o \
161 QREADEROBJS/moc_GraphicWin.o \
162 QREADEROBJS/moc_Prefs.o \
163 QREADEROBJS/moc_QFloatBar.o \
164 QREADEROBJS/moc_QTReader.o \
165 QREADEROBJS/moc_QTReaderApp.o \
166 QREADEROBJS/moc_QtrListView.o \
167 QREADEROBJS/moc_ToolbarPrefs.o \
168 QREADEROBJS/moc_URLDialog.o \
169 QREADEROBJS/moc_cbkmkselector.o \
170 QREADEROBJS/moc_infowin.o
171 DIST = reader.pro
172QMAKE_TARGET = uqtreader
173DESTDIR = ../bin/
174TARGET = ../bin/uqtreader
175
176first: all
177####### Implicit rules
178
179.SUFFIXES: .c .o .cpp .cc .cxx .C
180
181.cpp.o:
182 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
183
184.cc.o:
185 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
186
187.cxx.o:
188 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
189
190.C.o:
191 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
192
193.c.o:
194 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
195
196####### Build rules
197
198all: reader.mak $(TARGET)
199
200$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
201 test -d ../bin/ || mkdir -p ../bin/
202 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
203
204mocables: $(SRCMOC)
205uicables: $(UICDECLS) $(UICIMPLS)
206
207$(MOC):
208 ( cd $(QTDIR)/src/moc ; $(MAKE) )
209
210reader.mak: reader.pro /usr/lib/qt3/mkspecs/default/qmake.conf
211 $(QMAKE) -o reader.mak reader.pro
212qmake:
213 @$(QMAKE) -o reader.mak reader.pro
214
215dist:
216 @mkdir -p QREADEROBJS/uqtreader && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/uqtreader/ && ( cd `dirname QREADEROBJS/uqtreader` && $(TAR) uqtreader.tar uqtreader && $(GZIP) uqtreader.tar ) && $(MOVE) `dirname QREADEROBJS/uqtreader`/uqtreader.tar.gz . && $(DEL_FILE) -r QREADEROBJS/uqtreader
217
218mocclean:
219 -$(DEL_FILE) $(OBJMOC)
220 -$(DEL_FILE) $(SRCMOC)
221
222uiclean:
223
224yaccclean:
225lexclean:
226clean: mocclean
227 -$(DEL_FILE) $(OBJECTS)
228 -$(DEL_FILE) *~ core *.core
229
230
231####### Sub-libraries
232
233distclean: clean
234 -$(DEL_FILE) ../bin/$(TARGET) $(TARGET)
235
236
237FORCE:
238
239####### Compile
240
241QREADEROBJS/BuffDoc.o: BuffDoc.cpp QREADERINC/static.h \
242 names.h \
243 BuffDoc.h \
244 config.h \
245 CDrawBuffer.h \
246 ZText.h \
247 ebookcodec.h \
248 QREADERINC/useqpe.h \
249 Aportis.h \
250 CHM.h \
251 ppm_expander.h \
252 ztxt.h \
253 plucker.h \
254 iSilo.h \
255 CFilter.h \
256 CExpander.h \
257 StyleConsts.h \
258 CBuffer.h \
259 my_list.h \
260 linktype.h \
261 ustring.h \
262 CEncoding.h \
263 Markups.h \
264 CEncoding_tables.h \
265 pdb.h \
266 chm_lib.h \
267 utypes.h \
268 ppm.h \
269 arith.h \
270 plucker_base.h \
271 Navigation.h \
272 hrule.h
273 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/BuffDoc.o BuffDoc.cpp
274
275QREADEROBJS/ButtonPrefs.o: ButtonPrefs.cpp ButtonPrefs.h \
276 orkey.h
277 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/ButtonPrefs.o ButtonPrefs.cpp
278
279QREADEROBJS/CAnnoEdit.o: CAnnoEdit.cpp CAnnoEdit.h
280 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CAnnoEdit.o CAnnoEdit.cpp
281
282QREADEROBJS/CDrawBuffer.o: CDrawBuffer.cpp CDrawBuffer.h \
283 FontControl.h \
284 QREADERINC/useqpe.h \
285 QREADERINC/opie.h \
286 StyleConsts.h \
287 CBuffer.h \
288 my_list.h \
289 linktype.h \
290 config.h \
291 ustring.h
292 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CDrawBuffer.o CDrawBuffer.cpp
293
294QREADEROBJS/CEncoding.o: CEncoding.cpp CEncoding.h \
295 CExpander.h \
296 CEncoding_tables.h \
297 QREADERINC/useqpe.h \
298 config.h \
299 StyleConsts.h \
300 Markups.h \
301 names.h \
302 linktype.h \
303 ustring.h
304 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CEncoding.o CEncoding.cpp
305
306QREADEROBJS/CEncoding_tables.o: CEncoding_tables.cpp CEncoding_tables.h \
307 config.h \
308 ustring.h
309 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CEncoding_tables.o CEncoding_tables.cpp
310
311QREADEROBJS/CFilter.o: CFilter.cpp QREADERINC/useqpe.h \
312 CDrawBuffer.h \
313 CFilter.h \
314 hrule.h \
315 Bkmks.h \
316 QTReader.h \
317 CRegExp.h \
318 StyleConsts.h \
319 CBuffer.h \
320 my_list.h \
321 linktype.h \
322 config.h \
323 ustring.h \
324 CExpander.h \
325 CEncoding.h \
326 QREADERINC/static.h \
327 Markups.h \
328 names.h \
329 CEncoding_tables.h \
330 Filedata.h \
331 BuffDoc.h \
332 FontControl.h \
333 BGType.h \
334 striphtml.h \
335 Navigation.h \
336 hash.h \
337 Queue.h
338 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CFilter.o CFilter.cpp
339
340QREADEROBJS/CRegExp.o: CRegExp.cpp CRegExp.h \
341 config.h \
342 hash.h \
343 Queue.h \
344 ustring.h \
345 my_list.h
346 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CRegExp.o CRegExp.cpp
347
348QREADEROBJS/CloseDialog.o: CloseDialog.cpp CloseDialog.h \
349 QREADERINC/useqpe.h
350 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CloseDialog.o CloseDialog.cpp
351
352QREADEROBJS/FontControl.o: FontControl.cpp QREADERINC/opie.h \
353 QREADERINC/useqpe.h \
354 FontControl.h \
355 StyleConsts.h
356 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/FontControl.o FontControl.cpp
357
358QREADEROBJS/GraphicWin.o: GraphicWin.cpp
359 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/GraphicWin.o GraphicWin.cpp
360
361QREADEROBJS/Prefs.o: Prefs.cpp Prefs.h \
362 CEncoding_tables.h \
363 orkey.h
364 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/Prefs.o Prefs.cpp
365
366QREADEROBJS/QTReader.o: QTReader.cpp QREADERINC/useqpe.h \
367 config.h \
368 QTReader.h \
369 CDrawBuffer.h \
370 ustring.h \
371 QREADERINC/static.h \
372 my_list.h \
373 BuffDoc.h \
374 FontControl.h \
375 BGType.h \
376 striphtml.h \
377 CFilter.h \
378 CExpander.h \
379 StyleConsts.h \
380 CBuffer.h \
381 linktype.h \
382 CEncoding.h \
383 Markups.h \
384 names.h \
385 CEncoding_tables.h \
386 Navigation.h
387 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/QTReader.o QTReader.cpp
388
389QREADEROBJS/QTReaderApp.o: QTReaderApp.cpp QREADERINC/useqpe.h \
390 QTReader.h \
391 GraphicWin.h \
392 Bkmks.h \
393 cbkmkselector.h \
394 infowin.h \
395 ToolbarPrefs.h \
396 Prefs.h \
397 CAnnoEdit.h \
398 QFloatBar.h \
399 FixedFont.h \
400 URLDialog.h \
401 util.h \
402 QREADERINC/opie.h \
403 fileBrowser.h \
404 QTReaderApp.h \
405 CDrawBuffer.h \
406 Filedata.h \
407 names.h \
408 CEncoding_tables.h \
409 CloseDialog.h \
410 ButtonPrefs.h \
411 QREADERINC/static.h \
412 my_list.h \
413 BuffDoc.h \
414 FontControl.h \
415 BGType.h \
416 striphtml.h \
417 CFilter.h \
418 CExpander.h \
419 StyleConsts.h \
420 CBuffer.h \
421 linktype.h \
422 config.h \
423 ustring.h \
424 CEncoding.h \
425 Markups.h \
426 Navigation.h \
427 preferences.h \
428 orkey.h
429 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/QTReaderApp.o QTReaderApp.cpp
430
431QREADEROBJS/QtrListView.o: QtrListView.cpp QtrListView.h
432 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/QtrListView.o QtrListView.cpp
433
434QREADEROBJS/ToolbarPrefs.o: ToolbarPrefs.cpp QREADERINC/useqpe.h \
435 ToolbarPrefs.h \
436 preferences.h
437 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/ToolbarPrefs.o ToolbarPrefs.cpp
438
439QREADEROBJS/URLDialog.o: URLDialog.cpp URLDialog.h \
440 QREADERINC/useqpe.h
441 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/URLDialog.o URLDialog.cpp
442
443QREADEROBJS/infowin.o: infowin.cpp infowin.h \
444 version.h \
445 names.h
446 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/infowin.o infowin.cpp
447
448QREADEROBJS/main.o: main.cpp QREADERINC/useqpe.h \
449 QTReaderApp.h \
450 CExpander.h \
451 CEncoding.h \
452 orkey.h \
453 BGType.h \
454 config.h \
455 StyleConsts.h \
456 Markups.h \
457 names.h \
458 linktype.h \
459 ustring.h \
460 CEncoding_tables.h
461 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/main.o main.cpp
462
463QREADEROBJS/orkey.o: orkey.cpp orkey.h
464 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/orkey.o orkey.cpp
465
466QREADEROBJS/preferences.o: preferences.cpp QREADERINC/useqpe.h \
467 preferences.h
468 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/preferences.o preferences.cpp
469
470QREADEROBJS/util.o: util.cpp util.h
471 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/util.o util.cpp
472
473QREADEROBJS/version.o: version.cpp version.h \
474 names.h
475 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/version.o version.cpp
476
477QREADEROBJS/moc_ButtonPrefs.o: QREADERMOCS/moc_ButtonPrefs.cpp ButtonPrefs.h orkey.h
478 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_ButtonPrefs.o QREADERMOCS/moc_ButtonPrefs.cpp
479
480QREADEROBJS/moc_CAnnoEdit.o: QREADERMOCS/moc_CAnnoEdit.cpp CAnnoEdit.h
481 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_CAnnoEdit.o QREADERMOCS/moc_CAnnoEdit.cpp
482
483QREADEROBJS/moc_CloseDialog.o: QREADERMOCS/moc_CloseDialog.cpp CloseDialog.h QREADERINC/useqpe.h
484 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_CloseDialog.o QREADERMOCS/moc_CloseDialog.cpp
485
486QREADEROBJS/moc_GraphicWin.o: QREADERMOCS/moc_GraphicWin.cpp GraphicWin.h
487 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_GraphicWin.o QREADERMOCS/moc_GraphicWin.cpp
488
489QREADEROBJS/moc_Prefs.o: QREADERMOCS/moc_Prefs.cpp Prefs.h orkey.h
490 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_Prefs.o QREADERMOCS/moc_Prefs.cpp
491
492QREADEROBJS/moc_QFloatBar.o: QREADERMOCS/moc_QFloatBar.cpp QFloatBar.h
493 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_QFloatBar.o QREADERMOCS/moc_QFloatBar.cpp
494
495QREADEROBJS/moc_QTReader.o: QREADERMOCS/moc_QTReader.cpp QTReader.h QREADERINC/static.h \
496 my_list.h \
497 BuffDoc.h \
498 FontControl.h \
499 BGType.h \
500 striphtml.h \
501 QREADERINC/useqpe.h \
502 CDrawBuffer.h \
503 CFilter.h \
504 CExpander.h \
505 StyleConsts.h \
506 CBuffer.h \
507 linktype.h \
508 config.h \
509 ustring.h \
510 CEncoding.h \
511 Markups.h \
512 names.h \
513 CEncoding_tables.h \
514 Navigation.h
515 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_QTReader.o QREADERMOCS/moc_QTReader.cpp
516
517QREADEROBJS/moc_QTReaderApp.o: QREADERMOCS/moc_QTReaderApp.cpp QTReaderApp.h QREADERINC/useqpe.h \
518 CExpander.h \
519 CEncoding.h \
520 orkey.h \
521 BGType.h \
522 config.h \
523 StyleConsts.h \
524 Markups.h \
525 names.h \
526 linktype.h \
527 ustring.h \
528 CEncoding_tables.h
529 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_QTReaderApp.o QREADERMOCS/moc_QTReaderApp.cpp
530
531QREADEROBJS/moc_QtrListView.o: QREADERMOCS/moc_QtrListView.cpp QtrListView.h
532 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_QtrListView.o QREADERMOCS/moc_QtrListView.cpp
533
534QREADEROBJS/moc_ToolbarPrefs.o: QREADERMOCS/moc_ToolbarPrefs.cpp ToolbarPrefs.h QREADERINC/useqpe.h \
535 preferences.h
536 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_ToolbarPrefs.o QREADERMOCS/moc_ToolbarPrefs.cpp
537
538QREADEROBJS/moc_URLDialog.o: QREADERMOCS/moc_URLDialog.cpp URLDialog.h QREADERINC/useqpe.h
539 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_URLDialog.o QREADERMOCS/moc_URLDialog.cpp
540
541QREADEROBJS/moc_cbkmkselector.o: QREADERMOCS/moc_cbkmkselector.cpp cbkmkselector.h
542 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_cbkmkselector.o QREADERMOCS/moc_cbkmkselector.cpp
543
544QREADEROBJS/moc_infowin.o: QREADERMOCS/moc_infowin.cpp infowin.h
545 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_infowin.o QREADERMOCS/moc_infowin.cpp
546
547QREADERMOCS/moc_ButtonPrefs.cpp: $(MOC) ButtonPrefs.h
548 $(MOC) ButtonPrefs.h -o QREADERMOCS/moc_ButtonPrefs.cpp
549
550QREADERMOCS/moc_CAnnoEdit.cpp: $(MOC) CAnnoEdit.h
551 $(MOC) CAnnoEdit.h -o QREADERMOCS/moc_CAnnoEdit.cpp
552
553QREADERMOCS/moc_CloseDialog.cpp: $(MOC) CloseDialog.h
554 $(MOC) CloseDialog.h -o QREADERMOCS/moc_CloseDialog.cpp
555
556QREADERMOCS/moc_GraphicWin.cpp: $(MOC) GraphicWin.h
557 $(MOC) GraphicWin.h -o QREADERMOCS/moc_GraphicWin.cpp
558
559QREADERMOCS/moc_Prefs.cpp: $(MOC) Prefs.h
560 $(MOC) Prefs.h -o QREADERMOCS/moc_Prefs.cpp
561
562QREADERMOCS/moc_QFloatBar.cpp: $(MOC) QFloatBar.h
563 $(MOC) QFloatBar.h -o QREADERMOCS/moc_QFloatBar.cpp
564
565QREADERMOCS/moc_QTReader.cpp: $(MOC) QTReader.h
566 $(MOC) QTReader.h -o QREADERMOCS/moc_QTReader.cpp
567
568QREADERMOCS/moc_QTReaderApp.cpp: $(MOC) QTReaderApp.h
569 $(MOC) QTReaderApp.h -o QREADERMOCS/moc_QTReaderApp.cpp
570
571QREADERMOCS/moc_QtrListView.cpp: $(MOC) QtrListView.h
572 $(MOC) QtrListView.h -o QREADERMOCS/moc_QtrListView.cpp
573
574QREADERMOCS/moc_ToolbarPrefs.cpp: $(MOC) ToolbarPrefs.h
575 $(MOC) ToolbarPrefs.h -o QREADERMOCS/moc_ToolbarPrefs.cpp
576
577QREADERMOCS/moc_URLDialog.cpp: $(MOC) URLDialog.h
578 $(MOC) URLDialog.h -o QREADERMOCS/moc_URLDialog.cpp
579
580QREADERMOCS/moc_cbkmkselector.cpp: $(MOC) cbkmkselector.h
581 $(MOC) cbkmkselector.h -o QREADERMOCS/moc_cbkmkselector.cpp
582
583QREADERMOCS/moc_infowin.cpp: $(MOC) infowin.h
584 $(MOC) infowin.h -o QREADERMOCS/moc_infowin.cpp
585
586####### Install
587
588install: all
589
590uninstall:
591
diff --git a/noncore/apps/opie-reader/reader.omak b/noncore/apps/opie-reader/reader.omak
deleted file mode 100644
index e4553ee..0000000
--- a/noncore/apps/opie-reader/reader.omak
+++ b/dev/null
@@ -1,605 +0,0 @@
1#############################################################################
2# Makefile for building $(QPEDIR)/bin/reader
3# Generated by tmake at 15:14, 2004/05/08
4# Project: reader.opro
5# Template: app
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O3 -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -DNO_DEBUG
14 INCPATH =-IOREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lqpe -lreader_codec -lpng12 -ljpeg -lz -lqte
18 MOC =$(QTDIR)/bin/moc
19 UIC =$(QTDIR)/bin/uic
20
21 TAR =tar -cf
22 GZIP =gzip -9f
23
24####### Files
25
26 HEADERS =Aportis.h \
27 Bkmks.h \
28 BuffDoc.h \
29 ButtonPrefs.h \
30 CAnnoEdit.h \
31 CBuffer.h \
32 CDrawBuffer.h \
33 CEncoding.h \
34 CEncoding_tables.h \
35 CExpander.h \
36 CFilter.h \
37 CloseDialog.h \
38 Coder.h \
39 CSource.h \
40 Filedata.h \
41 FixedFont.h \
42 FontControl.h \
43 GraphicWin.h \
44 Markups.h \
45 Navigation.h \
46 Palm2QImage.h \
47 Prefs.h \
48 PPMd.h \
49 PPMdType.h \
50 QFloatBar.h \
51 QTReader.h \
52 QTReaderApp.h \
53 QtrListView.h \
54 Queue.h \
55 StateData.h \
56 StyleConsts.h \
57 SubAlloc.h \
58 ToolbarPrefs.h \
59 URLDialog.h \
60 ZText.h \
61 arith.h \
62 arrierego.h \
63 cbkmkselector.h \
64 config.h \
65 fileBrowser.h \
66 infowin.h \
67 linktype.h \
68 my_list.h \
69 names.h \
70 nef.h \
71 OREADERINC/opie.h \
72 pdb.h \
73 plucker.h \
74 plucker_base.h \
75 ppm.h \
76 ppm_expander.h \
77 usenef.h \
78 OREADERINC/useqpe.h \
79 ustring.h \
80 util.h \
81 utypes.h \
82 version.h \
83 ztxt.h
84 SOURCES =BuffDoc.cpp \
85 ButtonPrefs.cpp \
86 CAnnoEdit.cpp \
87 CDrawBuffer.cpp \
88 CEncoding.cpp \
89 CEncoding_tables.cpp \
90 CFilter.cpp \
91 CRegExp.cpp \
92 CloseDialog.cpp \
93 FontControl.cpp \
94 Prefs.cpp \
95 QTReader.cpp \
96 QTReaderApp.cpp \
97 QtrListView.cpp \
98 ToolbarPrefs.cpp \
99 URLDialog.cpp \
100 fileBrowser.cpp \
101 infowin.cpp \
102 main.cpp \
103 orkey.cpp \
104 util.cpp \
105 version.cpp
106 OBJECTS =OREADEROBJS/BuffDoc.o \
107 OREADEROBJS/ButtonPrefs.o \
108 OREADEROBJS/CAnnoEdit.o \
109 OREADEROBJS/CDrawBuffer.o \
110 OREADEROBJS/CEncoding.o \
111 OREADEROBJS/CEncoding_tables.o \
112 OREADEROBJS/CFilter.o \
113 OREADEROBJS/CRegExp.o \
114 OREADEROBJS/CloseDialog.o \
115 OREADEROBJS/FontControl.o \
116 OREADEROBJS/Prefs.o \
117 OREADEROBJS/QTReader.o \
118 OREADEROBJS/QTReaderApp.o \
119 OREADEROBJS/QtrListView.o \
120 OREADEROBJS/ToolbarPrefs.o \
121 OREADEROBJS/URLDialog.o \
122 OREADEROBJS/fileBrowser.o \
123 OREADEROBJS/infowin.o \
124 OREADEROBJS/main.o \
125 OREADEROBJS/orkey.o \
126 OREADEROBJS/util.o \
127 OREADEROBJS/version.o
128 INTERFACES =
129 UICDECLS =
130 UICIMPLS =
131 SRCMOC =OREADERMOCS/moc_ButtonPrefs.cpp \
132 OREADERMOCS/moc_CAnnoEdit.cpp \
133 OREADERMOCS/moc_CloseDialog.cpp \
134 OREADERMOCS/moc_GraphicWin.cpp \
135 OREADERMOCS/moc_Prefs.cpp \
136 OREADERMOCS/moc_QFloatBar.cpp \
137 OREADERMOCS/moc_QTReader.cpp \
138 OREADERMOCS/moc_QTReaderApp.cpp \
139 OREADERMOCS/moc_QtrListView.cpp \
140 OREADERMOCS/moc_ToolbarPrefs.cpp \
141 OREADERMOCS/moc_URLDialog.cpp \
142 OREADERMOCS/moc_cbkmkselector.cpp \
143 OREADERMOCS/moc_fileBrowser.cpp \
144 OREADERMOCS/moc_infowin.cpp
145 OBJMOC =OREADEROBJS/moc_ButtonPrefs.o \
146 OREADEROBJS/moc_CAnnoEdit.o \
147 OREADEROBJS/moc_CloseDialog.o \
148 OREADEROBJS/moc_GraphicWin.o \
149 OREADEROBJS/moc_Prefs.o \
150 OREADEROBJS/moc_QFloatBar.o \
151 OREADEROBJS/moc_QTReader.o \
152 OREADEROBJS/moc_QTReaderApp.o \
153 OREADEROBJS/moc_QtrListView.o \
154 OREADEROBJS/moc_ToolbarPrefs.o \
155 OREADEROBJS/moc_URLDialog.o \
156 OREADEROBJS/moc_cbkmkselector.o \
157 OREADEROBJS/moc_fileBrowser.o \
158 OREADEROBJS/moc_infowin.o
159 DIST =
160 TARGET =$(QPEDIR)/bin/reader
161INTERFACE_DECL_PATH = .
162
163####### Implicit rules
164
165.SUFFIXES: .cpp .cxx .cc .C .c
166
167.cpp.o:
168 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
169
170.cxx.o:
171 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
172
173.cc.o:
174 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
175
176.C.o:
177 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
178
179.c.o:
180 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
181
182####### Build rules
183
184
185all: $(TARGET)
186
187$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
188 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
189
190moc: $(SRCMOC)
191
192tmake: reader.omak
193
194reader.omak: reader.opro
195 tmake reader.opro -o reader.omak
196
197dist:
198 $(TAR) reader.opro.tar reader.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
199 $(GZIP) reader.opro.tar
200
201clean:
202 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
203 -rm -f *~ core
204
205####### Sub-libraries
206
207
208###### Combined headers
209
210
211####### Compile
212
213OREADEROBJS/BuffDoc.o: BuffDoc.cpp \
214 OREADERINC/static.h \
215 names.h \
216 BuffDoc.h \
217 OREADERINC/useqpe.h \
218 CDrawBuffer.h \
219 StyleConsts.h \
220 CBuffer.h \
221 config.h \
222 ustring.h \
223 my_list.h \
224 linktype.h \
225 CFilter.h \
226 CExpander.h \
227 Markups.h \
228 CEncoding.h \
229 CEncoding_tables.h \
230 ZText.h \
231 ebookcodec.h \
232 Aportis.h \
233 pdb.h \
234 CHM.h \
235 chm_lib.h \
236 ppm_expander.h \
237 utypes.h \
238 ppm.h \
239 arith.h \
240 ztxt.h \
241 plucker.h \
242 plucker_base.h \
243 Navigation.h \
244 hrule.h \
245 nef.h \
246 usenef.h \
247 arrierego.h \
248 iSilo.h
249 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/BuffDoc.o BuffDoc.cpp
250
251OREADEROBJS/ButtonPrefs.o: ButtonPrefs.cpp \
252 ButtonPrefs.h \
253 orkey.h
254 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/ButtonPrefs.o ButtonPrefs.cpp
255
256OREADEROBJS/CAnnoEdit.o: CAnnoEdit.cpp \
257 CAnnoEdit.h
258 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CAnnoEdit.o CAnnoEdit.cpp
259
260OREADEROBJS/CDrawBuffer.o: CDrawBuffer.cpp \
261 CDrawBuffer.h \
262 StyleConsts.h \
263 CBuffer.h \
264 config.h \
265 ustring.h \
266 my_list.h \
267 linktype.h \
268 FontControl.h \
269 OREADERINC/useqpe.h \
270 OREADERINC/opie.h
271 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CDrawBuffer.o CDrawBuffer.cpp
272
273OREADEROBJS/CEncoding.o: CEncoding.cpp \
274 CEncoding.h \
275 CExpander.h \
276 OREADERINC/useqpe.h \
277 config.h \
278 ustring.h \
279 StyleConsts.h \
280 Markups.h \
281 names.h \
282 linktype.h \
283 CEncoding_tables.h
284 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CEncoding.o CEncoding.cpp
285
286OREADEROBJS/CEncoding_tables.o: CEncoding_tables.cpp \
287 CEncoding_tables.h \
288 config.h \
289 ustring.h
290 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CEncoding_tables.o CEncoding_tables.cpp
291
292OREADEROBJS/CFilter.o: CFilter.cpp \
293 OREADERINC/useqpe.h \
294 CDrawBuffer.h \
295 StyleConsts.h \
296 CBuffer.h \
297 config.h \
298 ustring.h \
299 my_list.h \
300 linktype.h \
301 CFilter.h \
302 CExpander.h \
303 Markups.h \
304 names.h \
305 CEncoding.h \
306 CEncoding_tables.h \
307 OREADERINC/static.h \
308 hrule.h \
309 Bkmks.h \
310 Filedata.h \
311 QTReader.h \
312 BuffDoc.h \
313 FontControl.h \
314 BGType.h \
315 striphtml.h \
316 Navigation.h \
317 CRegExp.h \
318 hash.h \
319 Queue.h
320 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CFilter.o CFilter.cpp
321
322OREADEROBJS/CRegExp.o: CRegExp.cpp \
323 CRegExp.h \
324 config.h \
325 ustring.h \
326 hash.h \
327 Queue.h \
328 my_list.h
329 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CRegExp.o CRegExp.cpp
330
331OREADEROBJS/CloseDialog.o: CloseDialog.cpp \
332 CloseDialog.h \
333 OREADERINC/useqpe.h
334 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CloseDialog.o CloseDialog.cpp
335
336OREADEROBJS/FontControl.o: FontControl.cpp \
337 OREADERINC/opie.h \
338 OREADERINC/useqpe.h \
339 FontControl.h \
340 StyleConsts.h
341 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/FontControl.o FontControl.cpp
342
343OREADEROBJS/Prefs.o: Prefs.cpp \
344 Prefs.h \
345 orkey.h \
346 CEncoding_tables.h
347 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/Prefs.o Prefs.cpp
348
349OREADEROBJS/QTReader.o: QTReader.cpp \
350 OREADERINC/useqpe.h \
351 config.h \
352 ustring.h \
353 QTReader.h \
354 OREADERINC/static.h \
355 my_list.h \
356 BuffDoc.h \
357 CDrawBuffer.h \
358 StyleConsts.h \
359 CBuffer.h \
360 linktype.h \
361 CFilter.h \
362 CExpander.h \
363 Markups.h \
364 names.h \
365 CEncoding.h \
366 CEncoding_tables.h \
367 FontControl.h \
368 BGType.h \
369 striphtml.h \
370 Navigation.h
371 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/QTReader.o QTReader.cpp
372
373OREADEROBJS/QTReaderApp.o: QTReaderApp.cpp \
374 OREADERINC/useqpe.h \
375 QTReader.h \
376 OREADERINC/static.h \
377 my_list.h \
378 BuffDoc.h \
379 CDrawBuffer.h \
380 StyleConsts.h \
381 CBuffer.h \
382 config.h \
383 ustring.h \
384 linktype.h \
385 CFilter.h \
386 CExpander.h \
387 Markups.h \
388 names.h \
389 CEncoding.h \
390 CEncoding_tables.h \
391 FontControl.h \
392 BGType.h \
393 striphtml.h \
394 Navigation.h \
395 GraphicWin.h \
396 Bkmks.h \
397 Filedata.h \
398 cbkmkselector.h \
399 infowin.h \
400 ToolbarPrefs.h \
401 preferences.h \
402 Prefs.h \
403 orkey.h \
404 CAnnoEdit.h \
405 QFloatBar.h \
406 FixedFont.h \
407 URLDialog.h \
408 util.h \
409 fileBrowser.h \
410 QTReaderApp.h \
411 CloseDialog.h \
412 ButtonPrefs.h
413 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/QTReaderApp.o QTReaderApp.cpp
414
415OREADEROBJS/QtrListView.o: QtrListView.cpp \
416 QtrListView.h
417 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/QtrListView.o QtrListView.cpp
418
419OREADEROBJS/ToolbarPrefs.o: ToolbarPrefs.cpp \
420 OREADERINC/useqpe.h \
421 ToolbarPrefs.h \
422 preferences.h
423 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/ToolbarPrefs.o ToolbarPrefs.cpp
424
425OREADEROBJS/URLDialog.o: URLDialog.cpp \
426 URLDialog.h \
427 OREADERINC/useqpe.h
428 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/URLDialog.o URLDialog.cpp
429
430OREADEROBJS/fileBrowser.o: fileBrowser.cpp \
431 fileBrowser.h \
432 QtrListView.h
433 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/fileBrowser.o fileBrowser.cpp
434
435OREADEROBJS/infowin.o: infowin.cpp \
436 infowin.h \
437 version.h \
438 names.h
439 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/infowin.o infowin.cpp
440
441OREADEROBJS/main.o: main.cpp \
442 OREADERINC/useqpe.h \
443 QTReaderApp.h \
444 CExpander.h \
445 config.h \
446 ustring.h \
447 StyleConsts.h \
448 Markups.h \
449 names.h \
450 linktype.h \
451 CEncoding.h \
452 CEncoding_tables.h \
453 orkey.h \
454 BGType.h
455 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/main.o main.cpp
456
457OREADEROBJS/orkey.o: orkey.cpp \
458 orkey.h
459 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/orkey.o orkey.cpp
460
461OREADEROBJS/util.o: util.cpp \
462 util.h
463 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/util.o util.cpp
464
465OREADEROBJS/version.o: version.cpp \
466 version.h \
467 names.h
468 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/version.o version.cpp
469
470OREADEROBJS/moc_ButtonPrefs.o: OREADERMOCS/moc_ButtonPrefs.cpp \
471 ButtonPrefs.h \
472 orkey.h
473 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_ButtonPrefs.o OREADERMOCS/moc_ButtonPrefs.cpp
474
475OREADEROBJS/moc_CAnnoEdit.o: OREADERMOCS/moc_CAnnoEdit.cpp \
476 CAnnoEdit.h
477 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_CAnnoEdit.o OREADERMOCS/moc_CAnnoEdit.cpp
478
479OREADEROBJS/moc_CloseDialog.o: OREADERMOCS/moc_CloseDialog.cpp \
480 CloseDialog.h \
481 OREADERINC/useqpe.h
482 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_CloseDialog.o OREADERMOCS/moc_CloseDialog.cpp
483
484OREADEROBJS/moc_GraphicWin.o: OREADERMOCS/moc_GraphicWin.cpp \
485 GraphicWin.h
486 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_GraphicWin.o OREADERMOCS/moc_GraphicWin.cpp
487
488OREADEROBJS/moc_Prefs.o: OREADERMOCS/moc_Prefs.cpp \
489 Prefs.h \
490 orkey.h
491 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_Prefs.o OREADERMOCS/moc_Prefs.cpp
492
493OREADEROBJS/moc_QFloatBar.o: OREADERMOCS/moc_QFloatBar.cpp \
494 QFloatBar.h
495 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_QFloatBar.o OREADERMOCS/moc_QFloatBar.cpp
496
497OREADEROBJS/moc_QTReader.o: OREADERMOCS/moc_QTReader.cpp \
498 QTReader.h \
499 OREADERINC/static.h \
500 my_list.h \
501 BuffDoc.h \
502 OREADERINC/useqpe.h \
503 CDrawBuffer.h \
504 StyleConsts.h \
505 CBuffer.h \
506 config.h \
507 ustring.h \
508 linktype.h \
509 CFilter.h \
510 CExpander.h \
511 Markups.h \
512 names.h \
513 CEncoding.h \
514 CEncoding_tables.h \
515 FontControl.h \
516 BGType.h \
517 striphtml.h \
518 Navigation.h
519 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_QTReader.o OREADERMOCS/moc_QTReader.cpp
520
521OREADEROBJS/moc_QTReaderApp.o: OREADERMOCS/moc_QTReaderApp.cpp \
522 QTReaderApp.h \
523 OREADERINC/useqpe.h \
524 CExpander.h \
525 config.h \
526 ustring.h \
527 StyleConsts.h \
528 Markups.h \
529 names.h \
530 linktype.h \
531 CEncoding.h \
532 CEncoding_tables.h \
533 orkey.h \
534 BGType.h
535 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_QTReaderApp.o OREADERMOCS/moc_QTReaderApp.cpp
536
537OREADEROBJS/moc_QtrListView.o: OREADERMOCS/moc_QtrListView.cpp \
538 QtrListView.h
539 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_QtrListView.o OREADERMOCS/moc_QtrListView.cpp
540
541OREADEROBJS/moc_ToolbarPrefs.o: OREADERMOCS/moc_ToolbarPrefs.cpp \
542 ToolbarPrefs.h \
543 OREADERINC/useqpe.h \
544 preferences.h
545 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_ToolbarPrefs.o OREADERMOCS/moc_ToolbarPrefs.cpp
546
547OREADEROBJS/moc_URLDialog.o: OREADERMOCS/moc_URLDialog.cpp \
548 URLDialog.h \
549 OREADERINC/useqpe.h
550 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_URLDialog.o OREADERMOCS/moc_URLDialog.cpp
551
552OREADEROBJS/moc_cbkmkselector.o: OREADERMOCS/moc_cbkmkselector.cpp \
553 cbkmkselector.h
554 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_cbkmkselector.o OREADERMOCS/moc_cbkmkselector.cpp
555
556OREADEROBJS/moc_fileBrowser.o: OREADERMOCS/moc_fileBrowser.cpp \
557 fileBrowser.h
558 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_fileBrowser.o OREADERMOCS/moc_fileBrowser.cpp
559
560OREADEROBJS/moc_infowin.o: OREADERMOCS/moc_infowin.cpp \
561 infowin.h
562 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_infowin.o OREADERMOCS/moc_infowin.cpp
563
564OREADERMOCS/moc_ButtonPrefs.cpp: ButtonPrefs.h
565 $(MOC) ButtonPrefs.h -o OREADERMOCS/moc_ButtonPrefs.cpp
566
567OREADERMOCS/moc_CAnnoEdit.cpp: CAnnoEdit.h
568 $(MOC) CAnnoEdit.h -o OREADERMOCS/moc_CAnnoEdit.cpp
569
570OREADERMOCS/moc_CloseDialog.cpp: CloseDialog.h
571 $(MOC) CloseDialog.h -o OREADERMOCS/moc_CloseDialog.cpp
572
573OREADERMOCS/moc_GraphicWin.cpp: GraphicWin.h
574 $(MOC) GraphicWin.h -o OREADERMOCS/moc_GraphicWin.cpp
575
576OREADERMOCS/moc_Prefs.cpp: Prefs.h
577 $(MOC) Prefs.h -o OREADERMOCS/moc_Prefs.cpp
578
579OREADERMOCS/moc_QFloatBar.cpp: QFloatBar.h
580 $(MOC) QFloatBar.h -o OREADERMOCS/moc_QFloatBar.cpp
581
582OREADERMOCS/moc_QTReader.cpp: QTReader.h
583 $(MOC) QTReader.h -o OREADERMOCS/moc_QTReader.cpp
584
585OREADERMOCS/moc_QTReaderApp.cpp: QTReaderApp.h
586 $(MOC) QTReaderApp.h -o OREADERMOCS/moc_QTReaderApp.cpp
587
588OREADERMOCS/moc_QtrListView.cpp: QtrListView.h
589 $(MOC) QtrListView.h -o OREADERMOCS/moc_QtrListView.cpp
590
591OREADERMOCS/moc_ToolbarPrefs.cpp: ToolbarPrefs.h
592 $(MOC) ToolbarPrefs.h -o OREADERMOCS/moc_ToolbarPrefs.cpp
593
594OREADERMOCS/moc_URLDialog.cpp: URLDialog.h
595 $(MOC) URLDialog.h -o OREADERMOCS/moc_URLDialog.cpp
596
597OREADERMOCS/moc_cbkmkselector.cpp: cbkmkselector.h
598 $(MOC) cbkmkselector.h -o OREADERMOCS/moc_cbkmkselector.cpp
599
600OREADERMOCS/moc_fileBrowser.cpp: fileBrowser.h
601 $(MOC) fileBrowser.h -o OREADERMOCS/moc_fileBrowser.cpp
602
603OREADERMOCS/moc_infowin.cpp: infowin.h
604 $(MOC) infowin.h -o OREADERMOCS/moc_infowin.cpp
605
diff --git a/noncore/apps/opie-reader/reader.staticmak b/noncore/apps/opie-reader/reader.staticmak
deleted file mode 100644
index eab8857..0000000
--- a/noncore/apps/opie-reader/reader.staticmak
+++ b/dev/null
@@ -1,846 +0,0 @@
1#############################################################################
2# Makefile for building: QSTATICREADEROBJS/uqtreader
3# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 09:15:20 2004
4# Project: reader.staticpro
5# Template: app
6# Command: $(QMAKE) -o reader.staticmak reader.staticpro
7#############################################################################
8
9####### Compiler, tools and options
10
11CC = gcc
12CXX = g++
13LEX = flex
14YACC = yacc
15CFLAGS = -pipe -w -g
16CXXFLAGS = -pipe -w -g
17LEXFLAGS =
18YACCFLAGS= -d
19INCPATH = -I/usr/lib/qt3/mkspecs/default -I. -IQSTATICREADERINC -I$(QTDIR)/include -IQSTATICREADERMOCS/
20LINK = g++
21LFLAGS =
22LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm
23AR = ar cqs
24RANLIB =
25MOC = $(QTDIR)/bin/moc
26UIC = $(QTDIR)/bin/uic
27QMAKE = qmake
28TAR = tar -cf
29GZIP = gzip -9f
30COPY = cp -f
31COPY_FILE= $(COPY)
32COPY_DIR = $(COPY) -r
33DEL_FILE = rm -f
34SYMLINK = ln -sf
35DEL_DIR = rmdir
36MOVE = mv -f
37CHK_DIR_EXISTS= test -d
38MKDIR = mkdir -p
39
40####### Output directory
41
42OBJECTS_DIR = QSTATICREADEROBJS/
43
44####### Files
45
46HEADERS = Aportis.h \
47 Bkmks.h \
48 BuffDoc.h \
49 ButtonPrefs.h \
50 CAnnoEdit.h \
51 CBuffer.h \
52 CDrawBuffer.h \
53 CEncoding.h \
54 CEncoding_tables.h \
55 CExpander.h \
56 CFilter.h \
57 CloseDialog.h \
58 Filedata.h \
59 FixedFont.h \
60 FontControl.h \
61 GraphicWin.h \
62 Markups.h \
63 Navigation.h \
64 Palm2QImage.h \
65 Prefs.h \
66 QFloatBar.h \
67 QTReader.h \
68 QTReaderApp.h \
69 QtrListView.h \
70 Queue.h \
71 StyleConsts.h \
72 ToolbarPrefs.h \
73 URLDialog.h \
74 ZText.h \
75 arith.h \
76 cbkmkselector.h \
77 config.h \
78 fileBrowser.h \
79 infowin.h \
80 linktype.h \
81 my_list.h \
82 names.h \
83 QSTATICREADERINC/opie.h \
84 pdb.h \
85 plucker_base.h \
86 plucker.h \
87 ppm.h \
88 ppm_expander.h \
89 preferences.h \
90 QSTATICREADERINC/static.h \
91 usenef.h \
92 QSTATICREADERINC/useqpe.h \
93 ustring.h \
94 utypes.h \
95 version.h \
96 ztxt.h
97SOURCES = Aportis.cpp \
98 Bkmks.cpp \
99 BuffDoc.cpp \
100 ButtonPrefs.cpp \
101 CAnnoEdit.cpp \
102 CBuffer.cpp \
103 CDrawBuffer.cpp \
104 CEncoding.cpp \
105 CEncoding_tables.cpp \
106 CExpander.cpp \
107 CFilter.cpp \
108 CHM.cpp \
109 CRegExp.cpp \
110 CloseDialog.cpp \
111 FontControl.cpp \
112 GraphicWin.cpp \
113 Navigation.cpp \
114 Palm2QImage.cpp \
115 Prefs.cpp \
116 QTReader.cpp \
117 QTReaderApp.cpp \
118 QtrListView.cpp \
119 StyleConsts.cpp \
120 ToolbarPrefs.cpp \
121 URLDialog.cpp \
122 arith_d.cpp \
123 chm_lib.c \
124 fileBrowser.cpp \
125 hrule.cpp \
126 infowin.cpp \
127 iSilo.cpp \
128 lzx.c \
129 main.cpp \
130 orkey.cpp \
131 pdb.cpp \
132 plucker.cpp \
133 plucker_base.cpp \
134 ppm.cpp \
135 ppm_expander.cpp \
136 preferences.cpp \
137 striphtml.cpp \
138 util.cpp \
139 version.cpp \
140 ztxt.cpp
141OBJECTS = QSTATICREADEROBJS/Aportis.o \
142 QSTATICREADEROBJS/Bkmks.o \
143 QSTATICREADEROBJS/BuffDoc.o \
144 QSTATICREADEROBJS/ButtonPrefs.o \
145 QSTATICREADEROBJS/CAnnoEdit.o \
146 QSTATICREADEROBJS/CBuffer.o \
147 QSTATICREADEROBJS/CDrawBuffer.o \
148 QSTATICREADEROBJS/CEncoding.o \
149 QSTATICREADEROBJS/CEncoding_tables.o \
150 QSTATICREADEROBJS/CExpander.o \
151 QSTATICREADEROBJS/CFilter.o \
152 QSTATICREADEROBJS/CHM.o \
153 QSTATICREADEROBJS/CRegExp.o \
154 QSTATICREADEROBJS/CloseDialog.o \
155 QSTATICREADEROBJS/FontControl.o \
156 QSTATICREADEROBJS/GraphicWin.o \
157 QSTATICREADEROBJS/Navigation.o \
158 QSTATICREADEROBJS/Palm2QImage.o \
159 QSTATICREADEROBJS/Prefs.o \
160 QSTATICREADEROBJS/QTReader.o \
161 QSTATICREADEROBJS/QTReaderApp.o \
162 QSTATICREADEROBJS/QtrListView.o \
163 QSTATICREADEROBJS/StyleConsts.o \
164 QSTATICREADEROBJS/ToolbarPrefs.o \
165 QSTATICREADEROBJS/URLDialog.o \
166 QSTATICREADEROBJS/arith_d.o \
167 QSTATICREADEROBJS/chm_lib.o \
168 QSTATICREADEROBJS/fileBrowser.o \
169 QSTATICREADEROBJS/hrule.o \
170 QSTATICREADEROBJS/infowin.o \
171 QSTATICREADEROBJS/iSilo.o \
172 QSTATICREADEROBJS/lzx.o \
173 QSTATICREADEROBJS/main.o \
174 QSTATICREADEROBJS/orkey.o \
175 QSTATICREADEROBJS/pdb.o \
176 QSTATICREADEROBJS/plucker.o \
177 QSTATICREADEROBJS/plucker_base.o \
178 QSTATICREADEROBJS/ppm.o \
179 QSTATICREADEROBJS/ppm_expander.o \
180 QSTATICREADEROBJS/preferences.o \
181 QSTATICREADEROBJS/striphtml.o \
182 QSTATICREADEROBJS/util.o \
183 QSTATICREADEROBJS/version.o \
184 QSTATICREADEROBJS/ztxt.o
185FORMS =
186UICDECLS =
187UICIMPLS =
188SRCMOC = QSTATICREADERMOCS/moc_ButtonPrefs.cpp \
189 QSTATICREADERMOCS/moc_CAnnoEdit.cpp \
190 QSTATICREADERMOCS/moc_CloseDialog.cpp \
191 QSTATICREADERMOCS/moc_GraphicWin.cpp \
192 QSTATICREADERMOCS/moc_Prefs.cpp \
193 QSTATICREADERMOCS/moc_QFloatBar.cpp \
194 QSTATICREADERMOCS/moc_QTReader.cpp \
195 QSTATICREADERMOCS/moc_QTReaderApp.cpp \
196 QSTATICREADERMOCS/moc_QtrListView.cpp \
197 QSTATICREADERMOCS/moc_ToolbarPrefs.cpp \
198 QSTATICREADERMOCS/moc_URLDialog.cpp \
199 QSTATICREADERMOCS/moc_cbkmkselector.cpp \
200 QSTATICREADERMOCS/moc_fileBrowser.cpp \
201 QSTATICREADERMOCS/moc_infowin.cpp
202OBJMOC = QSTATICREADEROBJS/moc_ButtonPrefs.o \
203 QSTATICREADEROBJS/moc_CAnnoEdit.o \
204 QSTATICREADEROBJS/moc_CloseDialog.o \
205 QSTATICREADEROBJS/moc_GraphicWin.o \
206 QSTATICREADEROBJS/moc_Prefs.o \
207 QSTATICREADEROBJS/moc_QFloatBar.o \
208 QSTATICREADEROBJS/moc_QTReader.o \
209 QSTATICREADEROBJS/moc_QTReaderApp.o \
210 QSTATICREADEROBJS/moc_QtrListView.o \
211 QSTATICREADEROBJS/moc_ToolbarPrefs.o \
212 QSTATICREADEROBJS/moc_URLDialog.o \
213 QSTATICREADEROBJS/moc_cbkmkselector.o \
214 QSTATICREADEROBJS/moc_fileBrowser.o \
215 QSTATICREADEROBJS/moc_infowin.o
216 DIST = reader.staticpro
217QMAKE_TARGET = uqtreader
218DESTDIR = QSTATICREADEROBJS/
219TARGET = QSTATICREADEROBJS/uqtreader
220
221first: all
222####### Implicit rules
223
224.SUFFIXES: .c .o .cpp .cc .cxx .C
225
226.cpp.o:
227 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
228
229.cc.o:
230 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
231
232.cxx.o:
233 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
234
235.C.o:
236 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
237
238.c.o:
239 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
240
241####### Build rules
242
243all: reader.staticmak $(TARGET)
244
245$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
246 test -d QSTATICREADEROBJS/ || mkdir -p QSTATICREADEROBJS/
247 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
248
249mocables: $(SRCMOC)
250uicables: $(UICDECLS) $(UICIMPLS)
251
252$(MOC):
253 ( cd $(QTDIR)/src/moc ; $(MAKE) )
254
255reader.staticmak: reader.staticpro /usr/lib/qt3/mkspecs/default/qmake.conf
256 $(QMAKE) -o reader.staticmak reader.staticpro
257qmake:
258 @$(QMAKE) -o reader.staticmak reader.staticpro
259
260dist:
261 @mkdir -p QSTATICREADEROBJS/uqtreader && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QSTATICREADEROBJS/uqtreader/ && ( cd `dirname QSTATICREADEROBJS/uqtreader` && $(TAR) uqtreader.tar uqtreader && $(GZIP) uqtreader.tar ) && $(MOVE) `dirname QSTATICREADEROBJS/uqtreader`/uqtreader.tar.gz . && $(DEL_FILE) -r QSTATICREADEROBJS/uqtreader
262
263mocclean:
264 -$(DEL_FILE) $(OBJMOC)
265 -$(DEL_FILE) $(SRCMOC)
266
267uiclean:
268
269yaccclean:
270lexclean:
271clean: mocclean
272 -$(DEL_FILE) $(OBJECTS)
273 -$(DEL_FILE) *~ core *.core
274
275
276####### Sub-libraries
277
278distclean: clean
279 -$(DEL_FILE) QSTATICREADEROBJS/$(TARGET) $(TARGET)
280
281
282FORCE:
283
284####### Compile
285
286QSTATICREADEROBJS/Aportis.o: Aportis.cpp Aportis.h \
287 my_list.h \
288 Bkmks.h \
289 QSTATICREADERINC/static.h \
290 CExpander.h \
291 pdb.h \
292 QSTATICREADERINC/useqpe.h \
293 config.h \
294 StyleConsts.h \
295 Markups.h \
296 names.h \
297 linktype.h \
298 ustring.h \
299 Filedata.h
300 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/Aportis.o Aportis.cpp
301
302QSTATICREADEROBJS/Bkmks.o: Bkmks.cpp Bkmks.h \
303 StyleConsts.h \
304 Markups.h \
305 my_list.h \
306 version.h \
307 names.h \
308 config.h \
309 Filedata.h \
310 ustring.h
311 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/Bkmks.o Bkmks.cpp
312
313QSTATICREADEROBJS/BuffDoc.o: BuffDoc.cpp QSTATICREADERINC/static.h \
314 names.h \
315 QSTATICREADERINC/useqpe.h \
316 usenef.h \
317 BuffDoc.h \
318 config.h \
319 CDrawBuffer.h \
320 ZText.h \
321 ebookcodec.h \
322 Aportis.h \
323 CHM.h \
324 ppm_expander.h \
325 ztxt.h \
326 plucker.h \
327 iSilo.h \
328 CFilter.h \
329 CExpander.h \
330 StyleConsts.h \
331 CBuffer.h \
332 my_list.h \
333 linktype.h \
334 ustring.h \
335 CEncoding.h \
336 Markups.h \
337 CEncoding_tables.h \
338 pdb.h \
339 chm_lib.h \
340 utypes.h \
341 ppm.h \
342 arith.h \
343 plucker_base.h \
344 Navigation.h \
345 hrule.h
346 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/BuffDoc.o BuffDoc.cpp
347
348QSTATICREADEROBJS/ButtonPrefs.o: ButtonPrefs.cpp ButtonPrefs.h \
349 orkey.h
350 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/ButtonPrefs.o ButtonPrefs.cpp
351
352QSTATICREADEROBJS/CAnnoEdit.o: CAnnoEdit.cpp CAnnoEdit.h
353 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CAnnoEdit.o CAnnoEdit.cpp
354
355QSTATICREADEROBJS/CBuffer.o: CBuffer.cpp CBuffer.h \
356 config.h \
357 ustring.h
358 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CBuffer.o CBuffer.cpp
359
360QSTATICREADEROBJS/CDrawBuffer.o: CDrawBuffer.cpp CDrawBuffer.h \
361 FontControl.h \
362 QSTATICREADERINC/useqpe.h \
363 QSTATICREADERINC/opie.h \
364 StyleConsts.h \
365 CBuffer.h \
366 my_list.h \
367 linktype.h \
368 config.h \
369 ustring.h
370 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CDrawBuffer.o CDrawBuffer.cpp
371
372QSTATICREADEROBJS/CEncoding.o: CEncoding.cpp CEncoding.h \
373 CExpander.h \
374 CEncoding_tables.h \
375 QSTATICREADERINC/useqpe.h \
376 config.h \
377 StyleConsts.h \
378 Markups.h \
379 names.h \
380 linktype.h \
381 ustring.h
382 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CEncoding.o CEncoding.cpp
383
384QSTATICREADEROBJS/CEncoding_tables.o: CEncoding_tables.cpp CEncoding_tables.h \
385 config.h \
386 ustring.h
387 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CEncoding_tables.o CEncoding_tables.cpp
388
389QSTATICREADEROBJS/CExpander.o: CExpander.cpp CExpander.h \
390 QSTATICREADERINC/useqpe.h \
391 config.h \
392 StyleConsts.h \
393 Markups.h \
394 names.h \
395 linktype.h \
396 ustring.h
397 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CExpander.o CExpander.cpp
398
399QSTATICREADEROBJS/CFilter.o: CFilter.cpp QSTATICREADERINC/useqpe.h \
400 CDrawBuffer.h \
401 CFilter.h \
402 hrule.h \
403 Bkmks.h \
404 QTReader.h \
405 CRegExp.h \
406 StyleConsts.h \
407 CBuffer.h \
408 my_list.h \
409 linktype.h \
410 config.h \
411 ustring.h \
412 CExpander.h \
413 CEncoding.h \
414 QSTATICREADERINC/static.h \
415 Markups.h \
416 names.h \
417 CEncoding_tables.h \
418 Filedata.h \
419 BuffDoc.h \
420 FontControl.h \
421 BGType.h \
422 striphtml.h \
423 Navigation.h \
424 hash.h \
425 Queue.h
426 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CFilter.o CFilter.cpp
427
428QSTATICREADEROBJS/CHM.o: CHM.cpp CHM.h \
429 chm_lib.h \
430 QSTATICREADERINC/static.h \
431 QSTATICREADERINC/useqpe.h \
432 CExpander.h \
433 my_list.h \
434 config.h \
435 StyleConsts.h \
436 Markups.h \
437 names.h \
438 linktype.h \
439 ustring.h
440 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CHM.o CHM.cpp
441
442QSTATICREADEROBJS/CRegExp.o: CRegExp.cpp CRegExp.h \
443 config.h \
444 hash.h \
445 Queue.h \
446 ustring.h \
447 my_list.h
448 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CRegExp.o CRegExp.cpp
449
450QSTATICREADEROBJS/CloseDialog.o: CloseDialog.cpp CloseDialog.h \
451 QSTATICREADERINC/useqpe.h
452 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CloseDialog.o CloseDialog.cpp
453
454QSTATICREADEROBJS/FontControl.o: FontControl.cpp QSTATICREADERINC/opie.h \
455 QSTATICREADERINC/useqpe.h \
456 FontControl.h \
457 StyleConsts.h
458 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/FontControl.o FontControl.cpp
459
460QSTATICREADEROBJS/GraphicWin.o: GraphicWin.cpp GraphicWin.h
461 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/GraphicWin.o GraphicWin.cpp
462
463QSTATICREADEROBJS/Navigation.o: Navigation.cpp Navigation.h
464 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/Navigation.o Navigation.cpp
465
466QSTATICREADEROBJS/Palm2QImage.o: Palm2QImage.cpp QSTATICREADERINC/useqpe.h
467 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/Palm2QImage.o Palm2QImage.cpp
468
469QSTATICREADEROBJS/Prefs.o: Prefs.cpp Prefs.h \
470 CEncoding_tables.h \
471 orkey.h
472 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/Prefs.o Prefs.cpp
473
474QSTATICREADEROBJS/QTReader.o: QTReader.cpp QSTATICREADERINC/useqpe.h \
475 config.h \
476 QTReader.h \
477 CDrawBuffer.h \
478 ustring.h \
479 QSTATICREADERINC/static.h \
480 my_list.h \
481 BuffDoc.h \
482 FontControl.h \
483 BGType.h \
484 striphtml.h \
485 CFilter.h \
486 CExpander.h \
487 StyleConsts.h \
488 CBuffer.h \
489 linktype.h \
490 CEncoding.h \
491 Markups.h \
492 names.h \
493 CEncoding_tables.h \
494 Navigation.h
495 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/QTReader.o QTReader.cpp
496
497QSTATICREADEROBJS/QTReaderApp.o: QTReaderApp.cpp QSTATICREADERINC/useqpe.h \
498 QTReader.h \
499 GraphicWin.h \
500 Bkmks.h \
501 cbkmkselector.h \
502 infowin.h \
503 ToolbarPrefs.h \
504 Prefs.h \
505 CAnnoEdit.h \
506 QFloatBar.h \
507 FixedFont.h \
508 URLDialog.h \
509 util.h \
510 QSTATICREADERINC/opie.h \
511 fileBrowser.h \
512 QTReaderApp.h \
513 CDrawBuffer.h \
514 Filedata.h \
515 names.h \
516 CEncoding_tables.h \
517 CloseDialog.h \
518 ButtonPrefs.h \
519 QSTATICREADERINC/static.h \
520 my_list.h \
521 BuffDoc.h \
522 FontControl.h \
523 BGType.h \
524 striphtml.h \
525 CFilter.h \
526 CExpander.h \
527 StyleConsts.h \
528 CBuffer.h \
529 linktype.h \
530 config.h \
531 ustring.h \
532 CEncoding.h \
533 Markups.h \
534 Navigation.h \
535 preferences.h \
536 orkey.h
537 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/QTReaderApp.o QTReaderApp.cpp
538
539QSTATICREADEROBJS/QtrListView.o: QtrListView.cpp QtrListView.h
540 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/QtrListView.o QtrListView.cpp
541
542QSTATICREADEROBJS/StyleConsts.o: StyleConsts.cpp StyleConsts.h
543 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/StyleConsts.o StyleConsts.cpp
544
545QSTATICREADEROBJS/ToolbarPrefs.o: ToolbarPrefs.cpp QSTATICREADERINC/useqpe.h \
546 ToolbarPrefs.h \
547 preferences.h
548 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/ToolbarPrefs.o ToolbarPrefs.cpp
549
550QSTATICREADEROBJS/URLDialog.o: URLDialog.cpp URLDialog.h \
551 QSTATICREADERINC/useqpe.h
552 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/URLDialog.o URLDialog.cpp
553
554QSTATICREADEROBJS/arith_d.o: arith_d.cpp arith.h \
555 utypes.h
556 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/arith_d.o arith_d.cpp
557
558QSTATICREADEROBJS/chm_lib.o: chm_lib.c chm_lib.h \
559 lzx.h
560 $(CC) -c $(CFLAGS) $(INCPATH) -o QSTATICREADEROBJS/chm_lib.o chm_lib.c
561
562QSTATICREADEROBJS/fileBrowser.o: fileBrowser.cpp fileBrowser.h \
563 QtrListView.h
564 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/fileBrowser.o fileBrowser.cpp
565
566QSTATICREADEROBJS/hrule.o: hrule.cpp
567 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/hrule.o hrule.cpp
568
569QSTATICREADEROBJS/infowin.o: infowin.cpp infowin.h \
570 version.h \
571 names.h
572 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/infowin.o infowin.cpp
573
574QSTATICREADEROBJS/iSilo.o: iSilo.cpp iSilo.h \
575 pdb.h \
576 QSTATICREADERINC/useqpe.h \
577 CExpander.h \
578 config.h \
579 StyleConsts.h \
580 Markups.h \
581 names.h \
582 linktype.h \
583 ustring.h
584 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/iSilo.o iSilo.cpp
585
586QSTATICREADEROBJS/lzx.o: lzx.c lzx.h
587 $(CC) -c $(CFLAGS) $(INCPATH) -o QSTATICREADEROBJS/lzx.o lzx.c
588
589QSTATICREADEROBJS/main.o: main.cpp QSTATICREADERINC/useqpe.h \
590 QTReaderApp.h \
591 CExpander.h \
592 CEncoding.h \
593 orkey.h \
594 BGType.h \
595 config.h \
596 StyleConsts.h \
597 Markups.h \
598 names.h \
599 linktype.h \
600 ustring.h \
601 CEncoding_tables.h
602 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/main.o main.cpp
603
604QSTATICREADEROBJS/orkey.o: orkey.cpp orkey.h
605 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/orkey.o orkey.cpp
606
607QSTATICREADEROBJS/pdb.o: pdb.cpp pdb.h \
608 QSTATICREADERINC/useqpe.h \
609 CExpander.h \
610 config.h \
611 StyleConsts.h \
612 Markups.h \
613 names.h \
614 linktype.h \
615 ustring.h
616 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/pdb.o pdb.cpp
617
618QSTATICREADEROBJS/plucker.o: plucker.cpp QSTATICREADERINC/useqpe.h \
619 plucker.h \
620 Aportis.h \
621 Palm2QImage.h \
622 QSTATICREADERINC/static.h \
623 plucker_base.h \
624 CExpander.h \
625 ztxt.h \
626 pdb.h \
627 CBuffer.h \
628 my_list.h \
629 Navigation.h \
630 hrule.h \
631 config.h \
632 StyleConsts.h \
633 Markups.h \
634 names.h \
635 linktype.h \
636 ustring.h
637 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/plucker.o plucker.cpp
638
639QSTATICREADEROBJS/plucker_base.o: plucker_base.cpp QSTATICREADERINC/useqpe.h \
640 usenef.h \
641 QSTATICREADERINC/static.h \
642 plucker_base.h \
643 Aportis.h \
644 hrule.h \
645 CExpander.h \
646 ztxt.h \
647 pdb.h \
648 CBuffer.h \
649 my_list.h \
650 Navigation.h \
651 config.h \
652 StyleConsts.h \
653 Markups.h \
654 names.h \
655 linktype.h \
656 ustring.h
657 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/plucker_base.o plucker_base.cpp
658
659QSTATICREADEROBJS/ppm.o: ppm.cpp arith.h \
660 ppm.h \
661 utypes.h
662 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/ppm.o ppm.cpp
663
664QSTATICREADEROBJS/ppm_expander.o: ppm_expander.cpp QSTATICREADERINC/static.h \
665 ppm_expander.h \
666 QSTATICREADERINC/useqpe.h \
667 CExpander.h \
668 utypes.h \
669 ppm.h \
670 arith.h \
671 config.h \
672 StyleConsts.h \
673 Markups.h \
674 names.h \
675 linktype.h \
676 ustring.h
677 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/ppm_expander.o ppm_expander.cpp
678
679QSTATICREADEROBJS/preferences.o: preferences.cpp QSTATICREADERINC/useqpe.h \
680 preferences.h
681 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/preferences.o preferences.cpp
682
683QSTATICREADEROBJS/striphtml.o: striphtml.cpp QSTATICREADERINC/useqpe.h \
684 CDrawBuffer.h \
685 striphtml.h \
686 hrule.h \
687 StyleConsts.h \
688 CBuffer.h \
689 my_list.h \
690 linktype.h \
691 config.h \
692 ustring.h \
693 CFilter.h \
694 Navigation.h \
695 CExpander.h \
696 CEncoding.h \
697 QSTATICREADERINC/static.h \
698 Markups.h \
699 names.h \
700 CEncoding_tables.h
701 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/striphtml.o striphtml.cpp
702
703QSTATICREADEROBJS/util.o: util.cpp util.h
704 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/util.o util.cpp
705
706QSTATICREADEROBJS/version.o: version.cpp version.h \
707 names.h
708 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/version.o version.cpp
709
710QSTATICREADEROBJS/ztxt.o: ztxt.cpp ztxt.h \
711 my_list.h \
712 Bkmks.h \
713 QSTATICREADERINC/static.h \
714 CExpander.h \
715 pdb.h \
716 QSTATICREADERINC/useqpe.h \
717 config.h \
718 StyleConsts.h \
719 Markups.h \
720 names.h \
721 linktype.h \
722 ustring.h \
723 Filedata.h
724 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/ztxt.o ztxt.cpp
725
726QSTATICREADEROBJS/moc_ButtonPrefs.o: QSTATICREADERMOCS/moc_ButtonPrefs.cpp ButtonPrefs.h orkey.h
727 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_ButtonPrefs.o QSTATICREADERMOCS/moc_ButtonPrefs.cpp
728
729QSTATICREADEROBJS/moc_CAnnoEdit.o: QSTATICREADERMOCS/moc_CAnnoEdit.cpp CAnnoEdit.h
730 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_CAnnoEdit.o QSTATICREADERMOCS/moc_CAnnoEdit.cpp
731
732QSTATICREADEROBJS/moc_CloseDialog.o: QSTATICREADERMOCS/moc_CloseDialog.cpp CloseDialog.h QSTATICREADERINC/useqpe.h
733 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_CloseDialog.o QSTATICREADERMOCS/moc_CloseDialog.cpp
734
735QSTATICREADEROBJS/moc_GraphicWin.o: QSTATICREADERMOCS/moc_GraphicWin.cpp GraphicWin.h
736 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_GraphicWin.o QSTATICREADERMOCS/moc_GraphicWin.cpp
737
738QSTATICREADEROBJS/moc_Prefs.o: QSTATICREADERMOCS/moc_Prefs.cpp Prefs.h orkey.h
739 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_Prefs.o QSTATICREADERMOCS/moc_Prefs.cpp
740
741QSTATICREADEROBJS/moc_QFloatBar.o: QSTATICREADERMOCS/moc_QFloatBar.cpp QFloatBar.h
742 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_QFloatBar.o QSTATICREADERMOCS/moc_QFloatBar.cpp
743
744QSTATICREADEROBJS/moc_QTReader.o: QSTATICREADERMOCS/moc_QTReader.cpp QTReader.h QSTATICREADERINC/static.h \
745 my_list.h \
746 BuffDoc.h \
747 FontControl.h \
748 BGType.h \
749 striphtml.h \
750 QSTATICREADERINC/useqpe.h \
751 CDrawBuffer.h \
752 CFilter.h \
753 CExpander.h \
754 StyleConsts.h \
755 CBuffer.h \
756 linktype.h \
757 config.h \
758 ustring.h \
759 CEncoding.h \
760 Markups.h \
761 names.h \
762 CEncoding_tables.h \
763 Navigation.h
764 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_QTReader.o QSTATICREADERMOCS/moc_QTReader.cpp
765
766QSTATICREADEROBJS/moc_QTReaderApp.o: QSTATICREADERMOCS/moc_QTReaderApp.cpp QTReaderApp.h QSTATICREADERINC/useqpe.h \
767 CExpander.h \
768 CEncoding.h \
769 orkey.h \
770 BGType.h \
771 config.h \
772 StyleConsts.h \
773 Markups.h \
774 names.h \
775 linktype.h \
776 ustring.h \
777 CEncoding_tables.h
778 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_QTReaderApp.o QSTATICREADERMOCS/moc_QTReaderApp.cpp
779
780QSTATICREADEROBJS/moc_QtrListView.o: QSTATICREADERMOCS/moc_QtrListView.cpp QtrListView.h
781 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_QtrListView.o QSTATICREADERMOCS/moc_QtrListView.cpp
782
783QSTATICREADEROBJS/moc_ToolbarPrefs.o: QSTATICREADERMOCS/moc_ToolbarPrefs.cpp ToolbarPrefs.h QSTATICREADERINC/useqpe.h \
784 preferences.h
785 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_ToolbarPrefs.o QSTATICREADERMOCS/moc_ToolbarPrefs.cpp
786
787QSTATICREADEROBJS/moc_URLDialog.o: QSTATICREADERMOCS/moc_URLDialog.cpp URLDialog.h QSTATICREADERINC/useqpe.h
788 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_URLDialog.o QSTATICREADERMOCS/moc_URLDialog.cpp
789
790QSTATICREADEROBJS/moc_cbkmkselector.o: QSTATICREADERMOCS/moc_cbkmkselector.cpp cbkmkselector.h
791 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_cbkmkselector.o QSTATICREADERMOCS/moc_cbkmkselector.cpp
792
793QSTATICREADEROBJS/moc_fileBrowser.o: QSTATICREADERMOCS/moc_fileBrowser.cpp fileBrowser.h
794 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_fileBrowser.o QSTATICREADERMOCS/moc_fileBrowser.cpp
795
796QSTATICREADEROBJS/moc_infowin.o: QSTATICREADERMOCS/moc_infowin.cpp infowin.h
797 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_infowin.o QSTATICREADERMOCS/moc_infowin.cpp
798
799QSTATICREADERMOCS/moc_ButtonPrefs.cpp: $(MOC) ButtonPrefs.h
800 $(MOC) ButtonPrefs.h -o QSTATICREADERMOCS/moc_ButtonPrefs.cpp
801
802QSTATICREADERMOCS/moc_CAnnoEdit.cpp: $(MOC) CAnnoEdit.h
803 $(MOC) CAnnoEdit.h -o QSTATICREADERMOCS/moc_CAnnoEdit.cpp
804
805QSTATICREADERMOCS/moc_CloseDialog.cpp: $(MOC) CloseDialog.h
806 $(MOC) CloseDialog.h -o QSTATICREADERMOCS/moc_CloseDialog.cpp
807
808QSTATICREADERMOCS/moc_GraphicWin.cpp: $(MOC) GraphicWin.h
809 $(MOC) GraphicWin.h -o QSTATICREADERMOCS/moc_GraphicWin.cpp
810
811QSTATICREADERMOCS/moc_Prefs.cpp: $(MOC) Prefs.h
812 $(MOC) Prefs.h -o QSTATICREADERMOCS/moc_Prefs.cpp
813
814QSTATICREADERMOCS/moc_QFloatBar.cpp: $(MOC) QFloatBar.h
815 $(MOC) QFloatBar.h -o QSTATICREADERMOCS/moc_QFloatBar.cpp
816
817QSTATICREADERMOCS/moc_QTReader.cpp: $(MOC) QTReader.h
818 $(MOC) QTReader.h -o QSTATICREADERMOCS/moc_QTReader.cpp
819
820QSTATICREADERMOCS/moc_QTReaderApp.cpp: $(MOC) QTReaderApp.h
821 $(MOC) QTReaderApp.h -o QSTATICREADERMOCS/moc_QTReaderApp.cpp
822
823QSTATICREADERMOCS/moc_QtrListView.cpp: $(MOC) QtrListView.h
824 $(MOC) QtrListView.h -o QSTATICREADERMOCS/moc_QtrListView.cpp
825
826QSTATICREADERMOCS/moc_ToolbarPrefs.cpp: $(MOC) ToolbarPrefs.h
827 $(MOC) ToolbarPrefs.h -o QSTATICREADERMOCS/moc_ToolbarPrefs.cpp
828
829QSTATICREADERMOCS/moc_URLDialog.cpp: $(MOC) URLDialog.h
830 $(MOC) URLDialog.h -o QSTATICREADERMOCS/moc_URLDialog.cpp
831
832QSTATICREADERMOCS/moc_cbkmkselector.cpp: $(MOC) cbkmkselector.h
833 $(MOC) cbkmkselector.h -o QSTATICREADERMOCS/moc_cbkmkselector.cpp
834
835QSTATICREADERMOCS/moc_fileBrowser.cpp: $(MOC) fileBrowser.h
836 $(MOC) fileBrowser.h -o QSTATICREADERMOCS/moc_fileBrowser.cpp
837
838QSTATICREADERMOCS/moc_infowin.cpp: $(MOC) infowin.h
839 $(MOC) infowin.h -o QSTATICREADERMOCS/moc_infowin.cpp
840
841####### Install
842
843install: all
844
845uninstall:
846
diff --git a/noncore/apps/opie-reader/reader.staticzmak b/noncore/apps/opie-reader/reader.staticzmak
deleted file mode 100644
index f9315c1..0000000
--- a/noncore/apps/opie-reader/reader.staticzmak
+++ b/dev/null
@@ -1,862 +0,0 @@
1#############################################################################
2# Makefile for building ZSTATICREADEROBJS/uqtreader
3# Generated by tmake at 09:24, 2004/07/25
4# Project: reader.staticzpro
5# Template: app
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O2 -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -DNO_DEBUG
14 INCPATH =-IZSTATICREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lqpe -lqte
18 MOC =$(QTDIR)/bin/moc
19 UIC =$(QTDIR)/bin/uic
20
21 TAR =tar -cf
22 GZIP =gzip -9f
23
24####### Files
25
26 HEADERS =Aportis.h \
27 Bkmks.h \
28 BuffDoc.h \
29 ButtonPrefs.h \
30 CAnnoEdit.h \
31 CBuffer.h \
32 CDrawBuffer.h \
33 CEncoding.h \
34 CEncoding_tables.h \
35 CExpander.h \
36 CFilter.h \
37 CloseDialog.h \
38 Filedata.h \
39 FixedFont.h \
40 FontControl.h \
41 GraphicWin.h \
42 Markups.h \
43 Navigation.h \
44 Palm2QImage.h \
45 Prefs.h \
46 QFloatBar.h \
47 QTReader.h \
48 QTReaderApp.h \
49 QtrListView.h \
50 Queue.h \
51 StateData.h \
52 StyleConsts.h \
53 ToolbarPrefs.h \
54 URLDialog.h \
55 ZText.h \
56 arith.h \
57 cbkmkselector.h \
58 config.h \
59 fileBrowser.h \
60 infowin.h \
61 linktype.h \
62 my_list.h \
63 names.h \
64 ZSTATICREADERINC/opie.h \
65 pdb.h \
66 plucker_base.h \
67 plucker.h \
68 ppm.h \
69 ppm_expander.h \
70 preferences.h \
71 ZSTATICREADERINC/static.h \
72 usenef.h \
73 ZSTATICREADERINC/useqpe.h \
74 ustring.h \
75 utypes.h \
76 version.h \
77 ztxt.h
78 SOURCES =Aportis.cpp \
79 Bkmks.cpp \
80 BuffDoc.cpp \
81 ButtonPrefs.cpp \
82 CAnnoEdit.cpp \
83 CBuffer.cpp \
84 CDrawBuffer.cpp \
85 CEncoding.cpp \
86 CEncoding_tables.cpp \
87 CExpander.cpp \
88 CFilter.cpp \
89 CHM.cpp \
90 CRegExp.cpp \
91 CloseDialog.cpp \
92 FontControl.cpp \
93 GraphicWin.cpp \
94 Navigation.cpp \
95 Palm2QImage.cpp \
96 Prefs.cpp \
97 QTReader.cpp \
98 QTReaderApp.cpp \
99 QtrListView.cpp \
100 StyleConsts.cpp \
101 ToolbarPrefs.cpp \
102 URLDialog.cpp \
103 arith_d.cpp \
104 chm_lib.c \
105 fileBrowser.cpp \
106 hrule.cpp \
107 infowin.cpp \
108 iSilo.cpp \
109 lzx.c \
110 main.cpp \
111 orkey.cpp \
112 pdb.cpp \
113 plucker.cpp \
114 plucker_base.cpp \
115 ppm.cpp \
116 ppm_expander.cpp \
117 striphtml.cpp \
118 util.cpp \
119 version.cpp \
120 ztxt.cpp
121 OBJECTS =ZSTATICREADEROBJS/Aportis.o \
122 ZSTATICREADEROBJS/Bkmks.o \
123 ZSTATICREADEROBJS/BuffDoc.o \
124 ZSTATICREADEROBJS/ButtonPrefs.o \
125 ZSTATICREADEROBJS/CAnnoEdit.o \
126 ZSTATICREADEROBJS/CBuffer.o \
127 ZSTATICREADEROBJS/CDrawBuffer.o \
128 ZSTATICREADEROBJS/CEncoding.o \
129 ZSTATICREADEROBJS/CEncoding_tables.o \
130 ZSTATICREADEROBJS/CExpander.o \
131 ZSTATICREADEROBJS/CFilter.o \
132 ZSTATICREADEROBJS/CHM.o \
133 ZSTATICREADEROBJS/CRegExp.o \
134 ZSTATICREADEROBJS/CloseDialog.o \
135 ZSTATICREADEROBJS/FontControl.o \
136 ZSTATICREADEROBJS/GraphicWin.o \
137 ZSTATICREADEROBJS/Navigation.o \
138 ZSTATICREADEROBJS/Palm2QImage.o \
139 ZSTATICREADEROBJS/Prefs.o \
140 ZSTATICREADEROBJS/QTReader.o \
141 ZSTATICREADEROBJS/QTReaderApp.o \
142 ZSTATICREADEROBJS/QtrListView.o \
143 ZSTATICREADEROBJS/StyleConsts.o \
144 ZSTATICREADEROBJS/ToolbarPrefs.o \
145 ZSTATICREADEROBJS/URLDialog.o \
146 ZSTATICREADEROBJS/arith_d.o \
147 ZSTATICREADEROBJS/chm_lib.o \
148 ZSTATICREADEROBJS/fileBrowser.o \
149 ZSTATICREADEROBJS/hrule.o \
150 ZSTATICREADEROBJS/infowin.o \
151 ZSTATICREADEROBJS/iSilo.o \
152 ZSTATICREADEROBJS/lzx.o \
153 ZSTATICREADEROBJS/main.o \
154 ZSTATICREADEROBJS/orkey.o \
155 ZSTATICREADEROBJS/pdb.o \
156 ZSTATICREADEROBJS/plucker.o \
157 ZSTATICREADEROBJS/plucker_base.o \
158 ZSTATICREADEROBJS/ppm.o \
159 ZSTATICREADEROBJS/ppm_expander.o \
160 ZSTATICREADEROBJS/striphtml.o \
161 ZSTATICREADEROBJS/util.o \
162 ZSTATICREADEROBJS/version.o \
163 ZSTATICREADEROBJS/ztxt.o
164 INTERFACES =
165 UICDECLS =
166 UICIMPLS =
167 SRCMOC =ZSTATICREADERMOCS/moc_ButtonPrefs.cpp \
168 ZSTATICREADERMOCS/moc_CAnnoEdit.cpp \
169 ZSTATICREADERMOCS/moc_CloseDialog.cpp \
170 ZSTATICREADERMOCS/moc_GraphicWin.cpp \
171 ZSTATICREADERMOCS/moc_Prefs.cpp \
172 ZSTATICREADERMOCS/moc_QFloatBar.cpp \
173 ZSTATICREADERMOCS/moc_QTReader.cpp \
174 ZSTATICREADERMOCS/moc_QTReaderApp.cpp \
175 ZSTATICREADERMOCS/moc_QtrListView.cpp \
176 ZSTATICREADERMOCS/moc_ToolbarPrefs.cpp \
177 ZSTATICREADERMOCS/moc_URLDialog.cpp \
178 ZSTATICREADERMOCS/moc_cbkmkselector.cpp \
179 ZSTATICREADERMOCS/moc_fileBrowser.cpp \
180 ZSTATICREADERMOCS/moc_infowin.cpp
181 OBJMOC =ZSTATICREADEROBJS/moc_ButtonPrefs.o \
182 ZSTATICREADEROBJS/moc_CAnnoEdit.o \
183 ZSTATICREADEROBJS/moc_CloseDialog.o \
184 ZSTATICREADEROBJS/moc_GraphicWin.o \
185 ZSTATICREADEROBJS/moc_Prefs.o \
186 ZSTATICREADEROBJS/moc_QFloatBar.o \
187 ZSTATICREADEROBJS/moc_QTReader.o \
188 ZSTATICREADEROBJS/moc_QTReaderApp.o \
189 ZSTATICREADEROBJS/moc_QtrListView.o \
190 ZSTATICREADEROBJS/moc_ToolbarPrefs.o \
191 ZSTATICREADEROBJS/moc_URLDialog.o \
192 ZSTATICREADEROBJS/moc_cbkmkselector.o \
193 ZSTATICREADEROBJS/moc_fileBrowser.o \
194 ZSTATICREADEROBJS/moc_infowin.o
195 DIST =
196 TARGET =ZSTATICREADEROBJS/uqtreader
197INTERFACE_DECL_PATH = .
198
199####### Implicit rules
200
201.SUFFIXES: .cpp .cxx .cc .C .c
202
203.cpp.o:
204 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
205
206.cxx.o:
207 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
208
209.cc.o:
210 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
211
212.C.o:
213 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
214
215.c.o:
216 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
217
218####### Build rules
219
220
221all: $(TARGET)
222
223$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
224 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
225
226moc: $(SRCMOC)
227
228tmake: reader.staticzmak
229
230reader.staticzmak: reader.staticzpro
231 tmake reader.staticzpro -o reader.staticzmak
232
233dist:
234 $(TAR) reader.staticzpro.tar reader.staticzpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
235 $(GZIP) reader.staticzpro.tar
236
237clean:
238 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
239 -rm -f *~ core
240
241####### Sub-libraries
242
243
244###### Combined headers
245
246
247####### Compile
248
249ZSTATICREADEROBJS/Aportis.o: Aportis.cpp \
250 Aportis.h \
251 CExpander.h \
252 ZSTATICREADERINC/useqpe.h \
253 config.h \
254 ustring.h \
255 StyleConsts.h \
256 Markups.h \
257 names.h \
258 linktype.h \
259 pdb.h \
260 my_list.h \
261 Bkmks.h \
262 Filedata.h \
263 ZSTATICREADERINC/static.h
264 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/Aportis.o Aportis.cpp
265
266ZSTATICREADEROBJS/Bkmks.o: Bkmks.cpp \
267 Bkmks.h \
268 config.h \
269 ustring.h \
270 Filedata.h \
271 StyleConsts.h \
272 Markups.h \
273 my_list.h \
274 version.h \
275 names.h
276 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/Bkmks.o Bkmks.cpp
277
278ZSTATICREADEROBJS/BuffDoc.o: BuffDoc.cpp \
279 ZSTATICREADERINC/static.h \
280 names.h \
281 ZSTATICREADERINC/useqpe.h \
282 usenef.h \
283 BuffDoc.h \
284 CDrawBuffer.h \
285 StyleConsts.h \
286 CBuffer.h \
287 config.h \
288 ustring.h \
289 my_list.h \
290 linktype.h \
291 CFilter.h \
292 CExpander.h \
293 Markups.h \
294 CEncoding.h \
295 CEncoding_tables.h \
296 ZText.h \
297 ebookcodec.h \
298 Aportis.h \
299 pdb.h \
300 CHM.h \
301 chm_lib.h \
302 ppm_expander.h \
303 utypes.h \
304 ppm.h \
305 arith.h \
306 ztxt.h \
307 plucker.h \
308 plucker_base.h \
309 Navigation.h \
310 hrule.h \
311 iSilo.h
312 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/BuffDoc.o BuffDoc.cpp
313
314ZSTATICREADEROBJS/ButtonPrefs.o: ButtonPrefs.cpp \
315 ButtonPrefs.h \
316 orkey.h
317 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/ButtonPrefs.o ButtonPrefs.cpp
318
319ZSTATICREADEROBJS/CAnnoEdit.o: CAnnoEdit.cpp \
320 CAnnoEdit.h
321 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CAnnoEdit.o CAnnoEdit.cpp
322
323ZSTATICREADEROBJS/CBuffer.o: CBuffer.cpp \
324 CBuffer.h \
325 config.h \
326 ustring.h
327 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CBuffer.o CBuffer.cpp
328
329ZSTATICREADEROBJS/CDrawBuffer.o: CDrawBuffer.cpp \
330 CDrawBuffer.h \
331 StyleConsts.h \
332 CBuffer.h \
333 config.h \
334 ustring.h \
335 my_list.h \
336 linktype.h \
337 FontControl.h \
338 ZSTATICREADERINC/useqpe.h \
339 ZSTATICREADERINC/opie.h
340 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CDrawBuffer.o CDrawBuffer.cpp
341
342ZSTATICREADEROBJS/CEncoding.o: CEncoding.cpp \
343 CEncoding.h \
344 CExpander.h \
345 ZSTATICREADERINC/useqpe.h \
346 config.h \
347 ustring.h \
348 StyleConsts.h \
349 Markups.h \
350 names.h \
351 linktype.h \
352 CEncoding_tables.h
353 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CEncoding.o CEncoding.cpp
354
355ZSTATICREADEROBJS/CEncoding_tables.o: CEncoding_tables.cpp \
356 CEncoding_tables.h \
357 config.h \
358 ustring.h
359 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CEncoding_tables.o CEncoding_tables.cpp
360
361ZSTATICREADEROBJS/CExpander.o: CExpander.cpp \
362 CExpander.h \
363 ZSTATICREADERINC/useqpe.h \
364 config.h \
365 ustring.h \
366 StyleConsts.h \
367 Markups.h \
368 names.h \
369 linktype.h
370 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CExpander.o CExpander.cpp
371
372ZSTATICREADEROBJS/CFilter.o: CFilter.cpp \
373 ZSTATICREADERINC/useqpe.h \
374 CDrawBuffer.h \
375 StyleConsts.h \
376 CBuffer.h \
377 config.h \
378 ustring.h \
379 my_list.h \
380 linktype.h \
381 CFilter.h \
382 CExpander.h \
383 Markups.h \
384 names.h \
385 CEncoding.h \
386 CEncoding_tables.h \
387 ZSTATICREADERINC/static.h \
388 hrule.h \
389 Bkmks.h \
390 Filedata.h \
391 QTReader.h \
392 BuffDoc.h \
393 FontControl.h \
394 BGType.h \
395 striphtml.h \
396 Navigation.h \
397 CRegExp.h \
398 hash.h \
399 Queue.h
400 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CFilter.o CFilter.cpp
401
402ZSTATICREADEROBJS/CHM.o: CHM.cpp \
403 CHM.h \
404 ZSTATICREADERINC/useqpe.h \
405 CExpander.h \
406 config.h \
407 ustring.h \
408 StyleConsts.h \
409 Markups.h \
410 names.h \
411 linktype.h \
412 chm_lib.h \
413 my_list.h \
414 ZSTATICREADERINC/static.h
415 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CHM.o CHM.cpp
416
417ZSTATICREADEROBJS/CRegExp.o: CRegExp.cpp \
418 CRegExp.h \
419 config.h \
420 ustring.h \
421 hash.h \
422 Queue.h \
423 my_list.h
424 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CRegExp.o CRegExp.cpp
425
426ZSTATICREADEROBJS/CloseDialog.o: CloseDialog.cpp \
427 CloseDialog.h \
428 ZSTATICREADERINC/useqpe.h
429 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CloseDialog.o CloseDialog.cpp
430
431ZSTATICREADEROBJS/FontControl.o: FontControl.cpp \
432 ZSTATICREADERINC/opie.h \
433 ZSTATICREADERINC/useqpe.h \
434 FontControl.h \
435 StyleConsts.h
436 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/FontControl.o FontControl.cpp
437
438ZSTATICREADEROBJS/GraphicWin.o: GraphicWin.cpp \
439 GraphicWin.h
440 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/GraphicWin.o GraphicWin.cpp
441
442ZSTATICREADEROBJS/Navigation.o: Navigation.cpp \
443 Navigation.h
444 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/Navigation.o Navigation.cpp
445
446ZSTATICREADEROBJS/Palm2QImage.o: Palm2QImage.cpp \
447 ZSTATICREADERINC/useqpe.h
448 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/Palm2QImage.o Palm2QImage.cpp
449
450ZSTATICREADEROBJS/Prefs.o: Prefs.cpp \
451 Prefs.h \
452 orkey.h \
453 CEncoding_tables.h
454 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/Prefs.o Prefs.cpp
455
456ZSTATICREADEROBJS/QTReader.o: QTReader.cpp \
457 ZSTATICREADERINC/useqpe.h \
458 config.h \
459 ustring.h \
460 QTReader.h \
461 ZSTATICREADERINC/static.h \
462 my_list.h \
463 BuffDoc.h \
464 CDrawBuffer.h \
465 StyleConsts.h \
466 CBuffer.h \
467 linktype.h \
468 CFilter.h \
469 CExpander.h \
470 Markups.h \
471 names.h \
472 CEncoding.h \
473 CEncoding_tables.h \
474 FontControl.h \
475 BGType.h \
476 striphtml.h \
477 Navigation.h
478 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/QTReader.o QTReader.cpp
479
480ZSTATICREADEROBJS/QTReaderApp.o: QTReaderApp.cpp \
481 ZSTATICREADERINC/useqpe.h \
482 QTReader.h \
483 ZSTATICREADERINC/static.h \
484 my_list.h \
485 BuffDoc.h \
486 CDrawBuffer.h \
487 StyleConsts.h \
488 CBuffer.h \
489 config.h \
490 ustring.h \
491 linktype.h \
492 CFilter.h \
493 CExpander.h \
494 Markups.h \
495 names.h \
496 CEncoding.h \
497 CEncoding_tables.h \
498 FontControl.h \
499 BGType.h \
500 striphtml.h \
501 Navigation.h \
502 GraphicWin.h \
503 Bkmks.h \
504 Filedata.h \
505 cbkmkselector.h \
506 infowin.h \
507 ToolbarPrefs.h \
508 preferences.h \
509 Prefs.h \
510 orkey.h \
511 CAnnoEdit.h \
512 QFloatBar.h \
513 FixedFont.h \
514 URLDialog.h \
515 util.h \
516 ZSTATICREADERINC/opie.h \
517 fileBrowser.h \
518 QTReaderApp.h \
519 CloseDialog.h \
520 ButtonPrefs.h
521 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/QTReaderApp.o QTReaderApp.cpp
522
523ZSTATICREADEROBJS/QtrListView.o: QtrListView.cpp \
524 QtrListView.h
525 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/QtrListView.o QtrListView.cpp
526
527ZSTATICREADEROBJS/StyleConsts.o: StyleConsts.cpp \
528 StyleConsts.h
529 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/StyleConsts.o StyleConsts.cpp
530
531ZSTATICREADEROBJS/ToolbarPrefs.o: ToolbarPrefs.cpp \
532 ZSTATICREADERINC/useqpe.h \
533 ToolbarPrefs.h \
534 preferences.h
535 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/ToolbarPrefs.o ToolbarPrefs.cpp
536
537ZSTATICREADEROBJS/URLDialog.o: URLDialog.cpp \
538 URLDialog.h \
539 ZSTATICREADERINC/useqpe.h
540 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/URLDialog.o URLDialog.cpp
541
542ZSTATICREADEROBJS/arith_d.o: arith_d.cpp \
543 arith.h \
544 utypes.h
545 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/arith_d.o arith_d.cpp
546
547ZSTATICREADEROBJS/chm_lib.o: chm_lib.c \
548 chm_lib.h \
549 lzx.h
550 $(CC) -c $(CFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/chm_lib.o chm_lib.c
551
552ZSTATICREADEROBJS/fileBrowser.o: fileBrowser.cpp \
553 fileBrowser.h \
554 QtrListView.h
555 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/fileBrowser.o fileBrowser.cpp
556
557ZSTATICREADEROBJS/hrule.o: hrule.cpp
558 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/hrule.o hrule.cpp
559
560ZSTATICREADEROBJS/infowin.o: infowin.cpp \
561 infowin.h \
562 version.h \
563 names.h
564 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/infowin.o infowin.cpp
565
566ZSTATICREADEROBJS/iSilo.o: iSilo.cpp \
567 iSilo.h \
568 pdb.h \
569 ZSTATICREADERINC/useqpe.h \
570 CExpander.h \
571 config.h \
572 ustring.h \
573 StyleConsts.h \
574 Markups.h \
575 names.h \
576 linktype.h
577 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/iSilo.o iSilo.cpp
578
579ZSTATICREADEROBJS/lzx.o: lzx.c \
580 lzx.h
581 $(CC) -c $(CFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/lzx.o lzx.c
582
583ZSTATICREADEROBJS/main.o: main.cpp \
584 ZSTATICREADERINC/useqpe.h \
585 QTReaderApp.h \
586 CExpander.h \
587 config.h \
588 ustring.h \
589 StyleConsts.h \
590 Markups.h \
591 names.h \
592 linktype.h \
593 CEncoding.h \
594 CEncoding_tables.h \
595 orkey.h \
596 BGType.h
597 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/main.o main.cpp
598
599ZSTATICREADEROBJS/orkey.o: orkey.cpp \
600 orkey.h
601 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/orkey.o orkey.cpp
602
603ZSTATICREADEROBJS/pdb.o: pdb.cpp \
604 pdb.h \
605 ZSTATICREADERINC/useqpe.h \
606 CExpander.h \
607 config.h \
608 ustring.h \
609 StyleConsts.h \
610 Markups.h \
611 names.h \
612 linktype.h
613 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/pdb.o pdb.cpp
614
615ZSTATICREADEROBJS/plucker.o: plucker.cpp \
616 ZSTATICREADERINC/useqpe.h \
617 plucker.h \
618 plucker_base.h \
619 CExpander.h \
620 config.h \
621 ustring.h \
622 StyleConsts.h \
623 Markups.h \
624 names.h \
625 linktype.h \
626 ztxt.h \
627 pdb.h \
628 CBuffer.h \
629 my_list.h \
630 Navigation.h \
631 hrule.h \
632 Aportis.h \
633 Palm2QImage.h \
634 ZSTATICREADERINC/static.h
635 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/plucker.o plucker.cpp
636
637ZSTATICREADEROBJS/plucker_base.o: plucker_base.cpp \
638 ZSTATICREADERINC/useqpe.h \
639 usenef.h \
640 ZSTATICREADERINC/static.h \
641 plucker_base.h \
642 CExpander.h \
643 config.h \
644 ustring.h \
645 StyleConsts.h \
646 Markups.h \
647 names.h \
648 linktype.h \
649 ztxt.h \
650 pdb.h \
651 CBuffer.h \
652 my_list.h \
653 Navigation.h \
654 hrule.h \
655 Aportis.h
656 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/plucker_base.o plucker_base.cpp
657
658ZSTATICREADEROBJS/ppm.o: ppm.cpp \
659 arith.h \
660 utypes.h \
661 ppm.h
662 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/ppm.o ppm.cpp
663
664ZSTATICREADEROBJS/ppm_expander.o: ppm_expander.cpp \
665 ZSTATICREADERINC/static.h \
666 ppm_expander.h \
667 ZSTATICREADERINC/useqpe.h \
668 CExpander.h \
669 config.h \
670 ustring.h \
671 StyleConsts.h \
672 Markups.h \
673 names.h \
674 linktype.h \
675 utypes.h \
676 ppm.h \
677 arith.h
678 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/ppm_expander.o ppm_expander.cpp
679
680ZSTATICREADEROBJS/striphtml.o: striphtml.cpp \
681 ZSTATICREADERINC/useqpe.h \
682 CDrawBuffer.h \
683 StyleConsts.h \
684 CBuffer.h \
685 config.h \
686 ustring.h \
687 my_list.h \
688 linktype.h \
689 striphtml.h \
690 CFilter.h \
691 CExpander.h \
692 Markups.h \
693 names.h \
694 CEncoding.h \
695 CEncoding_tables.h \
696 ZSTATICREADERINC/static.h \
697 Navigation.h \
698 hrule.h
699 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/striphtml.o striphtml.cpp
700
701ZSTATICREADEROBJS/util.o: util.cpp \
702 util.h
703 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/util.o util.cpp
704
705ZSTATICREADEROBJS/version.o: version.cpp \
706 version.h \
707 names.h
708 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/version.o version.cpp
709
710ZSTATICREADEROBJS/ztxt.o: ztxt.cpp \
711 ztxt.h \
712 CExpander.h \
713 ZSTATICREADERINC/useqpe.h \
714 config.h \
715 ustring.h \
716 StyleConsts.h \
717 Markups.h \
718 names.h \
719 linktype.h \
720 pdb.h \
721 my_list.h \
722 Bkmks.h \
723 Filedata.h \
724 ZSTATICREADERINC/static.h
725 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/ztxt.o ztxt.cpp
726
727ZSTATICREADEROBJS/moc_ButtonPrefs.o: ZSTATICREADERMOCS/moc_ButtonPrefs.cpp \
728 ButtonPrefs.h \
729 orkey.h
730 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_ButtonPrefs.o ZSTATICREADERMOCS/moc_ButtonPrefs.cpp
731
732ZSTATICREADEROBJS/moc_CAnnoEdit.o: ZSTATICREADERMOCS/moc_CAnnoEdit.cpp \
733 CAnnoEdit.h
734 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_CAnnoEdit.o ZSTATICREADERMOCS/moc_CAnnoEdit.cpp
735
736ZSTATICREADEROBJS/moc_CloseDialog.o: ZSTATICREADERMOCS/moc_CloseDialog.cpp \
737 CloseDialog.h \
738 ZSTATICREADERINC/useqpe.h
739 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_CloseDialog.o ZSTATICREADERMOCS/moc_CloseDialog.cpp
740
741ZSTATICREADEROBJS/moc_GraphicWin.o: ZSTATICREADERMOCS/moc_GraphicWin.cpp \
742 GraphicWin.h
743 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_GraphicWin.o ZSTATICREADERMOCS/moc_GraphicWin.cpp
744
745ZSTATICREADEROBJS/moc_Prefs.o: ZSTATICREADERMOCS/moc_Prefs.cpp \
746 Prefs.h \
747 orkey.h
748 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_Prefs.o ZSTATICREADERMOCS/moc_Prefs.cpp
749
750ZSTATICREADEROBJS/moc_QFloatBar.o: ZSTATICREADERMOCS/moc_QFloatBar.cpp \
751 QFloatBar.h
752 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_QFloatBar.o ZSTATICREADERMOCS/moc_QFloatBar.cpp
753
754ZSTATICREADEROBJS/moc_QTReader.o: ZSTATICREADERMOCS/moc_QTReader.cpp \
755 QTReader.h \
756 ZSTATICREADERINC/static.h \
757 my_list.h \
758 BuffDoc.h \
759 ZSTATICREADERINC/useqpe.h \
760 CDrawBuffer.h \
761 StyleConsts.h \
762 CBuffer.h \
763 config.h \
764 ustring.h \
765 linktype.h \
766 CFilter.h \
767 CExpander.h \
768 Markups.h \
769 names.h \
770 CEncoding.h \
771 CEncoding_tables.h \
772 FontControl.h \
773 BGType.h \
774 striphtml.h \
775 Navigation.h
776 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_QTReader.o ZSTATICREADERMOCS/moc_QTReader.cpp
777
778ZSTATICREADEROBJS/moc_QTReaderApp.o: ZSTATICREADERMOCS/moc_QTReaderApp.cpp \
779 QTReaderApp.h \
780 ZSTATICREADERINC/useqpe.h \
781 CExpander.h \
782 config.h \
783 ustring.h \
784 StyleConsts.h \
785 Markups.h \
786 names.h \
787 linktype.h \
788 CEncoding.h \
789 CEncoding_tables.h \
790 orkey.h \
791 BGType.h
792 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_QTReaderApp.o ZSTATICREADERMOCS/moc_QTReaderApp.cpp
793
794ZSTATICREADEROBJS/moc_QtrListView.o: ZSTATICREADERMOCS/moc_QtrListView.cpp \
795 QtrListView.h
796 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_QtrListView.o ZSTATICREADERMOCS/moc_QtrListView.cpp
797
798ZSTATICREADEROBJS/moc_ToolbarPrefs.o: ZSTATICREADERMOCS/moc_ToolbarPrefs.cpp \
799 ToolbarPrefs.h \
800 ZSTATICREADERINC/useqpe.h \
801 preferences.h
802 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_ToolbarPrefs.o ZSTATICREADERMOCS/moc_ToolbarPrefs.cpp
803
804ZSTATICREADEROBJS/moc_URLDialog.o: ZSTATICREADERMOCS/moc_URLDialog.cpp \
805 URLDialog.h \
806 ZSTATICREADERINC/useqpe.h
807 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_URLDialog.o ZSTATICREADERMOCS/moc_URLDialog.cpp
808
809ZSTATICREADEROBJS/moc_cbkmkselector.o: ZSTATICREADERMOCS/moc_cbkmkselector.cpp \
810 cbkmkselector.h
811 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_cbkmkselector.o ZSTATICREADERMOCS/moc_cbkmkselector.cpp
812
813ZSTATICREADEROBJS/moc_fileBrowser.o: ZSTATICREADERMOCS/moc_fileBrowser.cpp \
814 fileBrowser.h
815 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_fileBrowser.o ZSTATICREADERMOCS/moc_fileBrowser.cpp
816
817ZSTATICREADEROBJS/moc_infowin.o: ZSTATICREADERMOCS/moc_infowin.cpp \
818 infowin.h
819 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_infowin.o ZSTATICREADERMOCS/moc_infowin.cpp
820
821ZSTATICREADERMOCS/moc_ButtonPrefs.cpp: ButtonPrefs.h
822 $(MOC) ButtonPrefs.h -o ZSTATICREADERMOCS/moc_ButtonPrefs.cpp
823
824ZSTATICREADERMOCS/moc_CAnnoEdit.cpp: CAnnoEdit.h
825 $(MOC) CAnnoEdit.h -o ZSTATICREADERMOCS/moc_CAnnoEdit.cpp
826
827ZSTATICREADERMOCS/moc_CloseDialog.cpp: CloseDialog.h
828 $(MOC) CloseDialog.h -o ZSTATICREADERMOCS/moc_CloseDialog.cpp
829
830ZSTATICREADERMOCS/moc_GraphicWin.cpp: GraphicWin.h
831 $(MOC) GraphicWin.h -o ZSTATICREADERMOCS/moc_GraphicWin.cpp
832
833ZSTATICREADERMOCS/moc_Prefs.cpp: Prefs.h
834 $(MOC) Prefs.h -o ZSTATICREADERMOCS/moc_Prefs.cpp
835
836ZSTATICREADERMOCS/moc_QFloatBar.cpp: QFloatBar.h
837 $(MOC) QFloatBar.h -o ZSTATICREADERMOCS/moc_QFloatBar.cpp
838
839ZSTATICREADERMOCS/moc_QTReader.cpp: QTReader.h
840 $(MOC) QTReader.h -o ZSTATICREADERMOCS/moc_QTReader.cpp
841
842ZSTATICREADERMOCS/moc_QTReaderApp.cpp: QTReaderApp.h
843 $(MOC) QTReaderApp.h -o ZSTATICREADERMOCS/moc_QTReaderApp.cpp
844
845ZSTATICREADERMOCS/moc_QtrListView.cpp: QtrListView.h
846 $(MOC) QtrListView.h -o ZSTATICREADERMOCS/moc_QtrListView.cpp
847
848ZSTATICREADERMOCS/moc_ToolbarPrefs.cpp: ToolbarPrefs.h
849 $(MOC) ToolbarPrefs.h -o ZSTATICREADERMOCS/moc_ToolbarPrefs.cpp
850
851ZSTATICREADERMOCS/moc_URLDialog.cpp: URLDialog.h
852 $(MOC) URLDialog.h -o ZSTATICREADERMOCS/moc_URLDialog.cpp
853
854ZSTATICREADERMOCS/moc_cbkmkselector.cpp: cbkmkselector.h
855 $(MOC) cbkmkselector.h -o ZSTATICREADERMOCS/moc_cbkmkselector.cpp
856
857ZSTATICREADERMOCS/moc_fileBrowser.cpp: fileBrowser.h
858 $(MOC) fileBrowser.h -o ZSTATICREADERMOCS/moc_fileBrowser.cpp
859
860ZSTATICREADERMOCS/moc_infowin.cpp: infowin.h
861 $(MOC) infowin.h -o ZSTATICREADERMOCS/moc_infowin.cpp
862
diff --git a/noncore/apps/opie-reader/reader.wmak b/noncore/apps/opie-reader/reader.wmak
deleted file mode 100644
index dda01c1..0000000
--- a/noncore/apps/opie-reader/reader.wmak
+++ b/dev/null
@@ -1,604 +0,0 @@
1#############################################################################
2# Makefile for building $(QPEDIR)/bin/uqtreader
3# Generated by tmake at 23:23, 2004/03/09
4# Project: reader.wpro
5# Template: app
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =gcc-2.96
11 CXX =g++-2.96
12 CFLAGS =-pipe -Wall -W -O2 -DNO_DEBUG
13 CXXFLAGS=-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -DNO_DEBUG
14 INCPATH =-IWSREADERINC -I$(QTDIR)/include
15 LINK =g++-2.96
16 LFLAGS =
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lqpe -lreader_codec -lqte
18 MOC =$(QTDIR)/bin/moc
19 UIC =$(QTDIR)/bin/uic
20
21 TAR =tar -cf
22 GZIP =gzip -9f
23
24####### Files
25
26 HEADERS =Aportis.h \
27 Bkmks.h \
28 BuffDoc.h \
29 ButtonPrefs.h \
30 CAnnoEdit.h \
31 CBuffer.h \
32 CDrawBuffer.h \
33 CEncoding.h \
34 CEncoding_tables.h \
35 CExpander.h \
36 CFilter.h \
37 CloseDialog.h \
38 Coder.h \
39 CSource.h \
40 Filedata.h \
41 FixedFont.h \
42 FontControl.h \
43 GraphicWin.h \
44 Markups.h \
45 Navigation.h \
46 Palm2QImage.h \
47 Prefs.h \
48 PPMd.h \
49 PPMdType.h \
50 QFloatBar.h \
51 QTReader.h \
52 QTReaderApp.h \
53 QtrListView.h \
54 Queue.h \
55 StateData.h \
56 StyleConsts.h \
57 SubAlloc.h \
58 ToolbarPrefs.h \
59 URLDialog.h \
60 ZText.h \
61 arith.h \
62 arrierego.h \
63 cbkmkselector.h \
64 config.h \
65 fileBrowser.h \
66 infowin.h \
67 linktype.h \
68 my_list.h \
69 names.h \
70 nef.h \
71 WSREADERINC/opie.h \
72 pdb.h \
73 plucker.h \
74 plucker_base.h \
75 ppm.h \
76 ppm_expander.h \
77 usenef.h \
78 WSREADERINC/useqpe.h \
79 ustring.h \
80 utypes.h \
81 version.h \
82 ztxt.h
83 SOURCES =BuffDoc.cpp \
84 ButtonPrefs.cpp \
85 CAnnoEdit.cpp \
86 CDrawBuffer.cpp \
87 CEncoding.cpp \
88 CEncoding_tables.cpp \
89 CFilter.cpp \
90 CRegExp.cpp \
91 CloseDialog.cpp \
92 FontControl.cpp \
93 Prefs.cpp \
94 QTReader.cpp \
95 QTReaderApp.cpp \
96 QtrListView.cpp \
97 ToolbarPrefs.cpp \
98 URLDialog.cpp \
99 fileBrowser.cpp \
100 infowin.cpp \
101 main.cpp \
102 orkey.cpp \
103 util.cpp \
104 version.cpp
105 OBJECTS =WSREADEROBJS/BuffDoc.o \
106 WSREADEROBJS/ButtonPrefs.o \
107 WSREADEROBJS/CAnnoEdit.o \
108 WSREADEROBJS/CDrawBuffer.o \
109 WSREADEROBJS/CEncoding.o \
110 WSREADEROBJS/CEncoding_tables.o \
111 WSREADEROBJS/CFilter.o \
112 WSREADEROBJS/CRegExp.o \
113 WSREADEROBJS/CloseDialog.o \
114 WSREADEROBJS/FontControl.o \
115 WSREADEROBJS/Prefs.o \
116 WSREADEROBJS/QTReader.o \
117 WSREADEROBJS/QTReaderApp.o \
118 WSREADEROBJS/QtrListView.o \
119 WSREADEROBJS/ToolbarPrefs.o \
120 WSREADEROBJS/URLDialog.o \
121 WSREADEROBJS/fileBrowser.o \
122 WSREADEROBJS/infowin.o \
123 WSREADEROBJS/main.o \
124 WSREADEROBJS/orkey.o \
125 WSREADEROBJS/util.o \
126 WSREADEROBJS/version.o
127 INTERFACES =
128 UICDECLS =
129 UICIMPLS =
130 SRCMOC =WSREADERMOCS/moc_ButtonPrefs.cpp \
131 WSREADERMOCS/moc_CAnnoEdit.cpp \
132 WSREADERMOCS/moc_CloseDialog.cpp \
133 WSREADERMOCS/moc_GraphicWin.cpp \
134 WSREADERMOCS/moc_Prefs.cpp \
135 WSREADERMOCS/moc_QFloatBar.cpp \
136 WSREADERMOCS/moc_QTReader.cpp \
137 WSREADERMOCS/moc_QTReaderApp.cpp \
138 WSREADERMOCS/moc_QtrListView.cpp \
139 WSREADERMOCS/moc_ToolbarPrefs.cpp \
140 WSREADERMOCS/moc_URLDialog.cpp \
141 WSREADERMOCS/moc_cbkmkselector.cpp \
142 WSREADERMOCS/moc_fileBrowser.cpp \
143 WSREADERMOCS/moc_infowin.cpp
144 OBJMOC =WSREADEROBJS/moc_ButtonPrefs.o \
145 WSREADEROBJS/moc_CAnnoEdit.o \
146 WSREADEROBJS/moc_CloseDialog.o \
147 WSREADEROBJS/moc_GraphicWin.o \
148 WSREADEROBJS/moc_Prefs.o \
149 WSREADEROBJS/moc_QFloatBar.o \
150 WSREADEROBJS/moc_QTReader.o \
151 WSREADEROBJS/moc_QTReaderApp.o \
152 WSREADEROBJS/moc_QtrListView.o \
153 WSREADEROBJS/moc_ToolbarPrefs.o \
154 WSREADEROBJS/moc_URLDialog.o \
155 WSREADEROBJS/moc_cbkmkselector.o \
156 WSREADEROBJS/moc_fileBrowser.o \
157 WSREADEROBJS/moc_infowin.o
158 DIST =
159 TARGET =$(QPEDIR)/bin/uqtreader
160INTERFACE_DECL_PATH = .
161
162####### Implicit rules
163
164.SUFFIXES: .cpp .cxx .cc .C .c
165
166.cpp.o:
167 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
168
169.cxx.o:
170 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
171
172.cc.o:
173 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
174
175.C.o:
176 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
177
178.c.o:
179 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
180
181####### Build rules
182
183
184all: $(TARGET)
185
186$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
187 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
188
189moc: $(SRCMOC)
190
191tmake: reader.wmak
192
193reader.wmak: reader.wpro
194 tmake reader.wpro -o reader.wmak
195
196dist:
197 $(TAR) reader.wpro.tar reader.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
198 $(GZIP) reader.wpro.tar
199
200clean:
201 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
202 -rm -f *~ core
203
204####### Sub-libraries
205
206
207###### Combined headers
208
209
210####### Compile
211
212WSREADEROBJS/BuffDoc.o: BuffDoc.cpp \
213 WSREADERINC/static.h \
214 names.h \
215 BuffDoc.h \
216 WSREADERINC/useqpe.h \
217 CDrawBuffer.h \
218 StyleConsts.h \
219 CBuffer.h \
220 config.h \
221 ustring.h \
222 my_list.h \
223 linktype.h \
224 CFilter.h \
225 CExpander.h \
226 Markups.h \
227 CEncoding.h \
228 CEncoding_tables.h \
229 ZText.h \
230 ebookcodec.h \
231 Aportis.h \
232 pdb.h \
233 CHM.h \
234 chm_lib.h \
235 ppm_expander.h \
236 utypes.h \
237 ppm.h \
238 arith.h \
239 ztxt.h \
240 plucker.h \
241 plucker_base.h \
242 Navigation.h \
243 hrule.h \
244 nef.h \
245 usenef.h \
246 arrierego.h \
247 iSilo.h
248 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/BuffDoc.o BuffDoc.cpp
249
250WSREADEROBJS/ButtonPrefs.o: ButtonPrefs.cpp \
251 ButtonPrefs.h \
252 orkey.h
253 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/ButtonPrefs.o ButtonPrefs.cpp
254
255WSREADEROBJS/CAnnoEdit.o: CAnnoEdit.cpp \
256 CAnnoEdit.h
257 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CAnnoEdit.o CAnnoEdit.cpp
258
259WSREADEROBJS/CDrawBuffer.o: CDrawBuffer.cpp \
260 CDrawBuffer.h \
261 StyleConsts.h \
262 CBuffer.h \
263 config.h \
264 ustring.h \
265 my_list.h \
266 linktype.h \
267 FontControl.h \
268 WSREADERINC/useqpe.h \
269 WSREADERINC/opie.h
270 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CDrawBuffer.o CDrawBuffer.cpp
271
272WSREADEROBJS/CEncoding.o: CEncoding.cpp \
273 CEncoding.h \
274 CExpander.h \
275 WSREADERINC/useqpe.h \
276 config.h \
277 ustring.h \
278 StyleConsts.h \
279 Markups.h \
280 names.h \
281 linktype.h \
282 CEncoding_tables.h
283 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CEncoding.o CEncoding.cpp
284
285WSREADEROBJS/CEncoding_tables.o: CEncoding_tables.cpp \
286 CEncoding_tables.h \
287 config.h \
288 ustring.h
289 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CEncoding_tables.o CEncoding_tables.cpp
290
291WSREADEROBJS/CFilter.o: CFilter.cpp \
292 WSREADERINC/useqpe.h \
293 CDrawBuffer.h \
294 StyleConsts.h \
295 CBuffer.h \
296 config.h \
297 ustring.h \
298 my_list.h \
299 linktype.h \
300 CFilter.h \
301 CExpander.h \
302 Markups.h \
303 names.h \
304 CEncoding.h \
305 CEncoding_tables.h \
306 WSREADERINC/static.h \
307 hrule.h \
308 Bkmks.h \
309 Filedata.h \
310 QTReader.h \
311 BuffDoc.h \
312 FontControl.h \
313 BGType.h \
314 striphtml.h \
315 Navigation.h \
316 CRegExp.h \
317 hash.h \
318 Queue.h
319 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CFilter.o CFilter.cpp
320
321WSREADEROBJS/CRegExp.o: CRegExp.cpp \
322 CRegExp.h \
323 config.h \
324 ustring.h \
325 hash.h \
326 Queue.h \
327 my_list.h
328 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CRegExp.o CRegExp.cpp
329
330WSREADEROBJS/CloseDialog.o: CloseDialog.cpp \
331 CloseDialog.h \
332 WSREADERINC/useqpe.h
333 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CloseDialog.o CloseDialog.cpp
334
335WSREADEROBJS/FontControl.o: FontControl.cpp \
336 WSREADERINC/opie.h \
337 WSREADERINC/useqpe.h \
338 FontControl.h \
339 StyleConsts.h
340 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/FontControl.o FontControl.cpp
341
342WSREADEROBJS/Prefs.o: Prefs.cpp \
343 Prefs.h \
344 orkey.h \
345 CEncoding_tables.h
346 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/Prefs.o Prefs.cpp
347
348WSREADEROBJS/QTReader.o: QTReader.cpp \
349 WSREADERINC/useqpe.h \
350 config.h \
351 ustring.h \
352 QTReader.h \
353 WSREADERINC/static.h \
354 my_list.h \
355 BuffDoc.h \
356 CDrawBuffer.h \
357 StyleConsts.h \
358 CBuffer.h \
359 linktype.h \
360 CFilter.h \
361 CExpander.h \
362 Markups.h \
363 names.h \
364 CEncoding.h \
365 CEncoding_tables.h \
366 FontControl.h \
367 BGType.h \
368 striphtml.h \
369 Navigation.h
370 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/QTReader.o QTReader.cpp
371
372WSREADEROBJS/QTReaderApp.o: QTReaderApp.cpp \
373 WSREADERINC/useqpe.h \
374 QTReader.h \
375 WSREADERINC/static.h \
376 my_list.h \
377 BuffDoc.h \
378 CDrawBuffer.h \
379 StyleConsts.h \
380 CBuffer.h \
381 config.h \
382 ustring.h \
383 linktype.h \
384 CFilter.h \
385 CExpander.h \
386 Markups.h \
387 names.h \
388 CEncoding.h \
389 CEncoding_tables.h \
390 FontControl.h \
391 BGType.h \
392 striphtml.h \
393 Navigation.h \
394 GraphicWin.h \
395 Bkmks.h \
396 Filedata.h \
397 cbkmkselector.h \
398 infowin.h \
399 ToolbarPrefs.h \
400 preferences.h \
401 Prefs.h \
402 orkey.h \
403 CAnnoEdit.h \
404 QFloatBar.h \
405 FixedFont.h \
406 URLDialog.h \
407 util.h \
408 fileBrowser.h \
409 QTReaderApp.h \
410 CloseDialog.h \
411 ButtonPrefs.h
412 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/QTReaderApp.o QTReaderApp.cpp
413
414WSREADEROBJS/QtrListView.o: QtrListView.cpp \
415 QtrListView.h
416 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/QtrListView.o QtrListView.cpp
417
418WSREADEROBJS/ToolbarPrefs.o: ToolbarPrefs.cpp \
419 WSREADERINC/useqpe.h \
420 ToolbarPrefs.h \
421 preferences.h
422 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/ToolbarPrefs.o ToolbarPrefs.cpp
423
424WSREADEROBJS/URLDialog.o: URLDialog.cpp \
425 URLDialog.h \
426 WSREADERINC/useqpe.h
427 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/URLDialog.o URLDialog.cpp
428
429WSREADEROBJS/fileBrowser.o: fileBrowser.cpp \
430 fileBrowser.h \
431 QtrListView.h
432 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/fileBrowser.o fileBrowser.cpp
433
434WSREADEROBJS/infowin.o: infowin.cpp \
435 infowin.h \
436 version.h \
437 names.h
438 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/infowin.o infowin.cpp
439
440WSREADEROBJS/main.o: main.cpp \
441 WSREADERINC/useqpe.h \
442 QTReaderApp.h \
443 CExpander.h \
444 config.h \
445 ustring.h \
446 StyleConsts.h \
447 Markups.h \
448 names.h \
449 linktype.h \
450 CEncoding.h \
451 CEncoding_tables.h \
452 orkey.h \
453 BGType.h
454 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/main.o main.cpp
455
456WSREADEROBJS/orkey.o: orkey.cpp \
457 orkey.h
458 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/orkey.o orkey.cpp
459
460WSREADEROBJS/util.o: util.cpp \
461 util.h
462 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/util.o util.cpp
463
464WSREADEROBJS/version.o: version.cpp \
465 version.h \
466 names.h
467 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/version.o version.cpp
468
469WSREADEROBJS/moc_ButtonPrefs.o: WSREADERMOCS/moc_ButtonPrefs.cpp \
470 ButtonPrefs.h \
471 orkey.h
472 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_ButtonPrefs.o WSREADERMOCS/moc_ButtonPrefs.cpp
473
474WSREADEROBJS/moc_CAnnoEdit.o: WSREADERMOCS/moc_CAnnoEdit.cpp \
475 CAnnoEdit.h
476 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_CAnnoEdit.o WSREADERMOCS/moc_CAnnoEdit.cpp
477
478WSREADEROBJS/moc_CloseDialog.o: WSREADERMOCS/moc_CloseDialog.cpp \
479 CloseDialog.h \
480 WSREADERINC/useqpe.h
481 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_CloseDialog.o WSREADERMOCS/moc_CloseDialog.cpp
482
483WSREADEROBJS/moc_GraphicWin.o: WSREADERMOCS/moc_GraphicWin.cpp \
484 GraphicWin.h
485 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_GraphicWin.o WSREADERMOCS/moc_GraphicWin.cpp
486
487WSREADEROBJS/moc_Prefs.o: WSREADERMOCS/moc_Prefs.cpp \
488 Prefs.h \
489 orkey.h
490 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_Prefs.o WSREADERMOCS/moc_Prefs.cpp
491
492WSREADEROBJS/moc_QFloatBar.o: WSREADERMOCS/moc_QFloatBar.cpp \
493 QFloatBar.h
494 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_QFloatBar.o WSREADERMOCS/moc_QFloatBar.cpp
495
496WSREADEROBJS/moc_QTReader.o: WSREADERMOCS/moc_QTReader.cpp \
497 QTReader.h \
498 WSREADERINC/static.h \
499 my_list.h \
500 BuffDoc.h \
501 WSREADERINC/useqpe.h \
502 CDrawBuffer.h \
503 StyleConsts.h \
504 CBuffer.h \
505 config.h \
506 ustring.h \
507 linktype.h \
508 CFilter.h \
509 CExpander.h \
510 Markups.h \
511 names.h \
512 CEncoding.h \
513 CEncoding_tables.h \
514 FontControl.h \
515 BGType.h \
516 striphtml.h \
517 Navigation.h
518 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_QTReader.o WSREADERMOCS/moc_QTReader.cpp
519
520WSREADEROBJS/moc_QTReaderApp.o: WSREADERMOCS/moc_QTReaderApp.cpp \
521 QTReaderApp.h \
522 WSREADERINC/useqpe.h \
523 CExpander.h \
524 config.h \
525 ustring.h \
526 StyleConsts.h \
527 Markups.h \
528 names.h \
529 linktype.h \
530 CEncoding.h \
531 CEncoding_tables.h \
532 orkey.h \
533 BGType.h
534 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_QTReaderApp.o WSREADERMOCS/moc_QTReaderApp.cpp
535
536WSREADEROBJS/moc_QtrListView.o: WSREADERMOCS/moc_QtrListView.cpp \
537 QtrListView.h
538 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_QtrListView.o WSREADERMOCS/moc_QtrListView.cpp
539
540WSREADEROBJS/moc_ToolbarPrefs.o: WSREADERMOCS/moc_ToolbarPrefs.cpp \
541 ToolbarPrefs.h \
542 WSREADERINC/useqpe.h \
543 preferences.h
544 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_ToolbarPrefs.o WSREADERMOCS/moc_ToolbarPrefs.cpp
545
546WSREADEROBJS/moc_URLDialog.o: WSREADERMOCS/moc_URLDialog.cpp \
547 URLDialog.h \
548 WSREADERINC/useqpe.h
549 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_URLDialog.o WSREADERMOCS/moc_URLDialog.cpp
550
551WSREADEROBJS/moc_cbkmkselector.o: WSREADERMOCS/moc_cbkmkselector.cpp \
552 cbkmkselector.h
553 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_cbkmkselector.o WSREADERMOCS/moc_cbkmkselector.cpp
554
555WSREADEROBJS/moc_fileBrowser.o: WSREADERMOCS/moc_fileBrowser.cpp \
556 fileBrowser.h
557 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_fileBrowser.o WSREADERMOCS/moc_fileBrowser.cpp
558
559WSREADEROBJS/moc_infowin.o: WSREADERMOCS/moc_infowin.cpp \
560 infowin.h
561 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_infowin.o WSREADERMOCS/moc_infowin.cpp
562
563WSREADERMOCS/moc_ButtonPrefs.cpp: ButtonPrefs.h
564 $(MOC) ButtonPrefs.h -o WSREADERMOCS/moc_ButtonPrefs.cpp
565
566WSREADERMOCS/moc_CAnnoEdit.cpp: CAnnoEdit.h
567 $(MOC) CAnnoEdit.h -o WSREADERMOCS/moc_CAnnoEdit.cpp
568
569WSREADERMOCS/moc_CloseDialog.cpp: CloseDialog.h
570 $(MOC) CloseDialog.h -o WSREADERMOCS/moc_CloseDialog.cpp
571
572WSREADERMOCS/moc_GraphicWin.cpp: GraphicWin.h
573 $(MOC) GraphicWin.h -o WSREADERMOCS/moc_GraphicWin.cpp
574
575WSREADERMOCS/moc_Prefs.cpp: Prefs.h
576 $(MOC) Prefs.h -o WSREADERMOCS/moc_Prefs.cpp
577
578WSREADERMOCS/moc_QFloatBar.cpp: QFloatBar.h
579 $(MOC) QFloatBar.h -o WSREADERMOCS/moc_QFloatBar.cpp
580
581WSREADERMOCS/moc_QTReader.cpp: QTReader.h
582 $(MOC) QTReader.h -o WSREADERMOCS/moc_QTReader.cpp
583
584WSREADERMOCS/moc_QTReaderApp.cpp: QTReaderApp.h
585 $(MOC) QTReaderApp.h -o WSREADERMOCS/moc_QTReaderApp.cpp
586
587WSREADERMOCS/moc_QtrListView.cpp: QtrListView.h
588 $(MOC) QtrListView.h -o WSREADERMOCS/moc_QtrListView.cpp
589
590WSREADERMOCS/moc_ToolbarPrefs.cpp: ToolbarPrefs.h
591 $(MOC) ToolbarPrefs.h -o WSREADERMOCS/moc_ToolbarPrefs.cpp
592
593WSREADERMOCS/moc_URLDialog.cpp: URLDialog.h
594 $(MOC) URLDialog.h -o WSREADERMOCS/moc_URLDialog.cpp
595
596WSREADERMOCS/moc_cbkmkselector.cpp: cbkmkselector.h
597 $(MOC) cbkmkselector.h -o WSREADERMOCS/moc_cbkmkselector.cpp
598
599WSREADERMOCS/moc_fileBrowser.cpp: fileBrowser.h
600 $(MOC) fileBrowser.h -o WSREADERMOCS/moc_fileBrowser.cpp
601
602WSREADERMOCS/moc_infowin.cpp: infowin.h
603 $(MOC) infowin.h -o WSREADERMOCS/moc_infowin.cpp
604
diff --git a/noncore/apps/opie-reader/reader.wpro b/noncore/apps/opie-reader/reader.wpro
deleted file mode 100644
index 3e4f345..0000000
--- a/noncore/apps/opie-reader/reader.wpro
+++ b/dev/null
@@ -1,93 +0,0 @@
1 TEMPLATE= app
2 CONFIG = qt warn_on release
3 HEADERS = Aportis.h \
4 Bkmks.h \
5 BuffDoc.h \
6 ButtonPrefs.h \
7 CAnnoEdit.h \
8 CBuffer.h \
9 CDrawBuffer.h \
10 CEncoding.h \
11 CEncoding_tables.h \
12 CExpander.h \
13 CFilter.h \
14 CloseDialog.h \
15 Coder.h \
16 CSource.h \
17 Filedata.h \
18 FixedFont.h \
19 FontControl.h \
20 GraphicWin.h \
21 Markups.h \
22 Navigation.h \
23 Palm2QImage.h \
24 Prefs.h \
25 PPMd.h \
26 PPMdType.h \
27 QFloatBar.h \
28 QTReader.h \
29 QTReaderApp.h \
30 QtrListView.h \
31 Queue.h \
32 StateData.h \
33 StyleConsts.h \
34 SubAlloc.h \
35 ToolbarPrefs.h \
36 URLDialog.h \
37 ZText.h \
38 arith.h \
39 arrierego.h \
40 cbkmkselector.h \
41 config.h \
42 fileBrowser.h \
43 infowin.h \
44 linktype.h \
45 my_list.h \
46 names.h \
47 nef.h \
48 WSREADERINC/opie.h \
49 pdb.h \
50 plucker.h \
51 plucker_base.h \
52 ppm.h \
53 ppm_expander.h \
54 usenef.h \
55 WSREADERINC/useqpe.h \
56 ustring.h \
57 utypes.h \
58 version.h \
59 ztxt.h
60
61 SOURCES = BuffDoc.cpp \
62 ButtonPrefs.cpp \
63 CAnnoEdit.cpp \
64 CDrawBuffer.cpp \
65 CEncoding.cpp \
66 CEncoding_tables.cpp \
67 CFilter.cpp \
68 CRegExp.cpp \
69 CloseDialog.cpp \
70 FontControl.cpp \
71 Prefs.cpp \
72 QTReader.cpp \
73 QTReaderApp.cpp \
74 QtrListView.cpp \
75 ToolbarPrefs.cpp \
76 URLDialog.cpp \
77 fileBrowser.cpp \
78 infowin.cpp \
79 main.cpp \
80 orkey.cpp \
81 util.cpp \
82 version.cpp
83
84
85 INTERFACES=
86 DESTDIR = $(QPEDIR)/bin
87 INCLUDEPATH+= WSREADERINC
88 DEPENDPATH+= WSREADERINC
89 TARGET = uqtreader
90 LIBS += -lqpe -lreader_codec
91
92OBJECTS_DIR = WSREADEROBJS
93MOC_DIR = WSREADERMOCS
diff --git a/noncore/apps/opie-reader/reader.zmak b/noncore/apps/opie-reader/reader.zmak
deleted file mode 100644
index bb697f4..0000000
--- a/noncore/apps/opie-reader/reader.zmak
+++ b/dev/null
@@ -1,605 +0,0 @@
1#############################################################################
2# Makefile for building $(QPEDIR)/bin/uqtreader
3# Generated by tmake at 15:17, 2004/05/08
4# Project: reader.zpro
5# Template: app
6#############################################################################
7
8####### Compiler, tools and options
9
10 CC =arm-linux-gcc
11 CXX =arm-linux-g++
12 CFLAGS =-pipe -Wall -W -O2 -DNO_DEBUG
13 CXXFLAGS=-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -DNO_DEBUG
14 INCPATH =-IZREADERINC -I$(QTDIR)/include
15 LINK =arm-linux-gcc
16 LFLAGS =
17 LIBS =$(SUBLIBS) -L$(QTDIR)/lib -lqpe -lreader_codec -lqte
18 MOC =$(QTDIR)/bin/moc
19 UIC =$(QTDIR)/bin/uic
20
21 TAR =tar -cf
22 GZIP =gzip -9f
23
24####### Files
25
26 HEADERS =Aportis.h \
27 Bkmks.h \
28 BuffDoc.h \
29 ButtonPrefs.h \
30 CAnnoEdit.h \
31 CBuffer.h \
32 CDrawBuffer.h \
33 CEncoding.h \
34 CEncoding_tables.h \
35 CExpander.h \
36 CFilter.h \
37 CloseDialog.h \
38 Coder.h \
39 CSource.h \
40 Filedata.h \
41 FixedFont.h \
42 FontControl.h \
43 GraphicWin.h \
44 Markups.h \
45 Navigation.h \
46 Palm2QImage.h \
47 Prefs.h \
48 PPMd.h \
49 PPMdType.h \
50 QFloatBar.h \
51 QTReader.h \
52 QTReaderApp.h \
53 QtrListView.h \
54 Queue.h \
55 StateData.h \
56 StyleConsts.h \
57 SubAlloc.h \
58 ToolbarPrefs.h \
59 URLDialog.h \
60 ZText.h \
61 arith.h \
62 arrierego.h \
63 cbkmkselector.h \
64 config.h \
65 fileBrowser.h \
66 infowin.h \
67 linktype.h \
68 my_list.h \
69 names.h \
70 nef.h \
71 ZREADERINC/opie.h \
72 pdb.h \
73 plucker.h \
74 plucker_base.h \
75 ppm.h \
76 ppm_expander.h \
77 usenef.h \
78 ZREADERINC/useqpe.h \
79 ustring.h \
80 util.h \
81 utypes.h \
82 version.h \
83 ztxt.h
84 SOURCES =BuffDoc.cpp \
85 ButtonPrefs.cpp \
86 CAnnoEdit.cpp \
87 CDrawBuffer.cpp \
88 CEncoding.cpp \
89 CEncoding_tables.cpp \
90 CFilter.cpp \
91 CRegExp.cpp \
92 CloseDialog.cpp \
93 FontControl.cpp \
94 Prefs.cpp \
95 QTReader.cpp \
96 QTReaderApp.cpp \
97 QtrListView.cpp \
98 ToolbarPrefs.cpp \
99 URLDialog.cpp \
100 fileBrowser.cpp \
101 infowin.cpp \
102 main.cpp \
103 orkey.cpp \
104 util.cpp \
105 version.cpp
106 OBJECTS =ZREADEROBJS/BuffDoc.o \
107 ZREADEROBJS/ButtonPrefs.o \
108 ZREADEROBJS/CAnnoEdit.o \
109 ZREADEROBJS/CDrawBuffer.o \
110 ZREADEROBJS/CEncoding.o \
111 ZREADEROBJS/CEncoding_tables.o \
112 ZREADEROBJS/CFilter.o \
113 ZREADEROBJS/CRegExp.o \
114 ZREADEROBJS/CloseDialog.o \
115 ZREADEROBJS/FontControl.o \
116 ZREADEROBJS/Prefs.o \
117 ZREADEROBJS/QTReader.o \
118 ZREADEROBJS/QTReaderApp.o \
119 ZREADEROBJS/QtrListView.o \
120 ZREADEROBJS/ToolbarPrefs.o \
121 ZREADEROBJS/URLDialog.o \
122 ZREADEROBJS/fileBrowser.o \
123 ZREADEROBJS/infowin.o \
124 ZREADEROBJS/main.o \
125 ZREADEROBJS/orkey.o \
126 ZREADEROBJS/util.o \
127 ZREADEROBJS/version.o
128 INTERFACES =
129 UICDECLS =
130 UICIMPLS =
131 SRCMOC =ZREADERMOCS/moc_ButtonPrefs.cpp \
132 ZREADERMOCS/moc_CAnnoEdit.cpp \
133 ZREADERMOCS/moc_CloseDialog.cpp \
134 ZREADERMOCS/moc_GraphicWin.cpp \
135 ZREADERMOCS/moc_Prefs.cpp \
136 ZREADERMOCS/moc_QFloatBar.cpp \
137 ZREADERMOCS/moc_QTReader.cpp \
138 ZREADERMOCS/moc_QTReaderApp.cpp \
139 ZREADERMOCS/moc_QtrListView.cpp \
140 ZREADERMOCS/moc_ToolbarPrefs.cpp \
141 ZREADERMOCS/moc_URLDialog.cpp \
142 ZREADERMOCS/moc_cbkmkselector.cpp \
143 ZREADERMOCS/moc_fileBrowser.cpp \
144 ZREADERMOCS/moc_infowin.cpp
145 OBJMOC =ZREADEROBJS/moc_ButtonPrefs.o \
146 ZREADEROBJS/moc_CAnnoEdit.o \
147 ZREADEROBJS/moc_CloseDialog.o \
148 ZREADEROBJS/moc_GraphicWin.o \
149 ZREADEROBJS/moc_Prefs.o \
150 ZREADEROBJS/moc_QFloatBar.o \
151 ZREADEROBJS/moc_QTReader.o \
152 ZREADEROBJS/moc_QTReaderApp.o \
153 ZREADEROBJS/moc_QtrListView.o \
154 ZREADEROBJS/moc_ToolbarPrefs.o \
155 ZREADEROBJS/moc_URLDialog.o \
156 ZREADEROBJS/moc_cbkmkselector.o \
157 ZREADEROBJS/moc_fileBrowser.o \
158 ZREADEROBJS/moc_infowin.o
159 DIST =
160 TARGET =$(QPEDIR)/bin/uqtreader
161INTERFACE_DECL_PATH = .
162
163####### Implicit rules
164
165.SUFFIXES: .cpp .cxx .cc .C .c
166
167.cpp.o:
168 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
169
170.cxx.o:
171 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
172
173.cc.o:
174 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
175
176.C.o:
177 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
178
179.c.o:
180 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
181
182####### Build rules
183
184
185all: $(TARGET)
186
187$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
188 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
189
190moc: $(SRCMOC)
191
192tmake: reader.zmak
193
194reader.zmak: reader.zpro
195 tmake reader.zpro -o reader.zmak
196
197dist:
198 $(TAR) reader.zpro.tar reader.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
199 $(GZIP) reader.zpro.tar
200
201clean:
202 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
203 -rm -f *~ core
204
205####### Sub-libraries
206
207
208###### Combined headers
209
210
211####### Compile
212
213ZREADEROBJS/BuffDoc.o: BuffDoc.cpp \
214 ZREADERINC/static.h \
215 names.h \
216 BuffDoc.h \
217 ZREADERINC/useqpe.h \
218 CDrawBuffer.h \
219 StyleConsts.h \
220 CBuffer.h \
221 config.h \
222 ustring.h \
223 my_list.h \
224 linktype.h \
225 CFilter.h \
226 CExpander.h \
227 Markups.h \
228 CEncoding.h \
229 CEncoding_tables.h \
230 ZText.h \
231 ebookcodec.h \
232 Aportis.h \
233 pdb.h \
234 CHM.h \
235 chm_lib.h \
236 ppm_expander.h \
237 utypes.h \
238 ppm.h \
239 arith.h \
240 ztxt.h \
241 plucker.h \
242 plucker_base.h \
243 Navigation.h \
244 hrule.h \
245 nef.h \
246 usenef.h \
247 arrierego.h \
248 iSilo.h
249 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/BuffDoc.o BuffDoc.cpp
250
251ZREADEROBJS/ButtonPrefs.o: ButtonPrefs.cpp \
252 ButtonPrefs.h \
253 orkey.h
254 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/ButtonPrefs.o ButtonPrefs.cpp
255
256ZREADEROBJS/CAnnoEdit.o: CAnnoEdit.cpp \
257 CAnnoEdit.h
258 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CAnnoEdit.o CAnnoEdit.cpp
259
260ZREADEROBJS/CDrawBuffer.o: CDrawBuffer.cpp \
261 CDrawBuffer.h \
262 StyleConsts.h \
263 CBuffer.h \
264 config.h \
265 ustring.h \
266 my_list.h \
267 linktype.h \
268 FontControl.h \
269 ZREADERINC/useqpe.h \
270 ZREADERINC/opie.h
271 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CDrawBuffer.o CDrawBuffer.cpp
272
273ZREADEROBJS/CEncoding.o: CEncoding.cpp \
274 CEncoding.h \
275 CExpander.h \
276 ZREADERINC/useqpe.h \
277 config.h \
278 ustring.h \
279 StyleConsts.h \
280 Markups.h \
281 names.h \
282 linktype.h \
283 CEncoding_tables.h
284 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CEncoding.o CEncoding.cpp
285
286ZREADEROBJS/CEncoding_tables.o: CEncoding_tables.cpp \
287 CEncoding_tables.h \
288 config.h \
289 ustring.h
290 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CEncoding_tables.o CEncoding_tables.cpp
291
292ZREADEROBJS/CFilter.o: CFilter.cpp \
293 ZREADERINC/useqpe.h \
294 CDrawBuffer.h \
295 StyleConsts.h \
296 CBuffer.h \
297 config.h \
298 ustring.h \
299 my_list.h \
300 linktype.h \
301 CFilter.h \
302 CExpander.h \
303 Markups.h \
304 names.h \
305 CEncoding.h \
306 CEncoding_tables.h \
307 ZREADERINC/static.h \
308 hrule.h \
309 Bkmks.h \
310 Filedata.h \
311 QTReader.h \
312 BuffDoc.h \
313 FontControl.h \
314 BGType.h \
315 striphtml.h \
316 Navigation.h \
317 CRegExp.h \
318 hash.h \
319 Queue.h
320 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CFilter.o CFilter.cpp
321
322ZREADEROBJS/CRegExp.o: CRegExp.cpp \
323 CRegExp.h \
324 config.h \
325 ustring.h \
326 hash.h \
327 Queue.h \
328 my_list.h
329 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CRegExp.o CRegExp.cpp
330
331ZREADEROBJS/CloseDialog.o: CloseDialog.cpp \
332 CloseDialog.h \
333 ZREADERINC/useqpe.h
334 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CloseDialog.o CloseDialog.cpp
335
336ZREADEROBJS/FontControl.o: FontControl.cpp \
337 ZREADERINC/opie.h \
338 ZREADERINC/useqpe.h \
339 FontControl.h \
340 StyleConsts.h
341 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/FontControl.o FontControl.cpp
342
343ZREADEROBJS/Prefs.o: Prefs.cpp \
344 Prefs.h \
345 orkey.h \
346 CEncoding_tables.h
347 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/Prefs.o Prefs.cpp
348
349ZREADEROBJS/QTReader.o: QTReader.cpp \
350 ZREADERINC/useqpe.h \
351 config.h \
352 ustring.h \
353 QTReader.h \
354 ZREADERINC/static.h \
355 my_list.h \
356 BuffDoc.h \
357 CDrawBuffer.h \
358 StyleConsts.h \
359 CBuffer.h \
360 linktype.h \
361 CFilter.h \
362 CExpander.h \
363 Markups.h \
364 names.h \
365 CEncoding.h \
366 CEncoding_tables.h \
367 FontControl.h \
368 BGType.h \
369 striphtml.h \
370 Navigation.h
371 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/QTReader.o QTReader.cpp
372
373ZREADEROBJS/QTReaderApp.o: QTReaderApp.cpp \
374 ZREADERINC/useqpe.h \
375 QTReader.h \
376 ZREADERINC/static.h \
377 my_list.h \
378 BuffDoc.h \
379 CDrawBuffer.h \
380 StyleConsts.h \
381 CBuffer.h \
382 config.h \
383 ustring.h \
384 linktype.h \
385 CFilter.h \
386 CExpander.h \
387 Markups.h \
388 names.h \
389 CEncoding.h \
390 CEncoding_tables.h \
391 FontControl.h \
392 BGType.h \
393 striphtml.h \
394 Navigation.h \
395 GraphicWin.h \
396 Bkmks.h \
397 Filedata.h \
398 cbkmkselector.h \
399 infowin.h \
400 ToolbarPrefs.h \
401 preferences.h \
402 Prefs.h \
403 orkey.h \
404 CAnnoEdit.h \
405 QFloatBar.h \
406 FixedFont.h \
407 URLDialog.h \
408 util.h \
409 fileBrowser.h \
410 QTReaderApp.h \
411 CloseDialog.h \
412 ButtonPrefs.h
413 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/QTReaderApp.o QTReaderApp.cpp
414
415ZREADEROBJS/QtrListView.o: QtrListView.cpp \
416 QtrListView.h
417 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/QtrListView.o QtrListView.cpp
418
419ZREADEROBJS/ToolbarPrefs.o: ToolbarPrefs.cpp \
420 ZREADERINC/useqpe.h \
421 ToolbarPrefs.h \
422 preferences.h
423 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/ToolbarPrefs.o ToolbarPrefs.cpp
424
425ZREADEROBJS/URLDialog.o: URLDialog.cpp \
426 URLDialog.h \
427 ZREADERINC/useqpe.h
428 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/URLDialog.o URLDialog.cpp
429
430ZREADEROBJS/fileBrowser.o: fileBrowser.cpp \
431 fileBrowser.h \
432 QtrListView.h
433 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/fileBrowser.o fileBrowser.cpp
434
435ZREADEROBJS/infowin.o: infowin.cpp \
436 infowin.h \
437 version.h \
438 names.h
439 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/infowin.o infowin.cpp
440
441ZREADEROBJS/main.o: main.cpp \
442 ZREADERINC/useqpe.h \
443 QTReaderApp.h \
444 CExpander.h \
445 config.h \
446 ustring.h \
447 StyleConsts.h \
448 Markups.h \
449 names.h \
450 linktype.h \
451 CEncoding.h \
452 CEncoding_tables.h \
453 orkey.h \
454 BGType.h
455 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/main.o main.cpp
456
457ZREADEROBJS/orkey.o: orkey.cpp \
458 orkey.h
459 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/orkey.o orkey.cpp
460
461ZREADEROBJS/util.o: util.cpp \
462 util.h
463 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/util.o util.cpp
464
465ZREADEROBJS/version.o: version.cpp \
466 version.h \
467 names.h
468 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/version.o version.cpp
469
470ZREADEROBJS/moc_ButtonPrefs.o: ZREADERMOCS/moc_ButtonPrefs.cpp \
471 ButtonPrefs.h \
472 orkey.h
473 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_ButtonPrefs.o ZREADERMOCS/moc_ButtonPrefs.cpp
474
475ZREADEROBJS/moc_CAnnoEdit.o: ZREADERMOCS/moc_CAnnoEdit.cpp \
476 CAnnoEdit.h
477 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_CAnnoEdit.o ZREADERMOCS/moc_CAnnoEdit.cpp
478
479ZREADEROBJS/moc_CloseDialog.o: ZREADERMOCS/moc_CloseDialog.cpp \
480 CloseDialog.h \
481 ZREADERINC/useqpe.h
482 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_CloseDialog.o ZREADERMOCS/moc_CloseDialog.cpp
483
484ZREADEROBJS/moc_GraphicWin.o: ZREADERMOCS/moc_GraphicWin.cpp \
485 GraphicWin.h
486 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_GraphicWin.o ZREADERMOCS/moc_GraphicWin.cpp
487
488ZREADEROBJS/moc_Prefs.o: ZREADERMOCS/moc_Prefs.cpp \
489 Prefs.h \
490 orkey.h
491 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_Prefs.o ZREADERMOCS/moc_Prefs.cpp
492
493ZREADEROBJS/moc_QFloatBar.o: ZREADERMOCS/moc_QFloatBar.cpp \
494 QFloatBar.h
495 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_QFloatBar.o ZREADERMOCS/moc_QFloatBar.cpp
496
497ZREADEROBJS/moc_QTReader.o: ZREADERMOCS/moc_QTReader.cpp \
498 QTReader.h \
499 ZREADERINC/static.h \
500 my_list.h \
501 BuffDoc.h \
502 ZREADERINC/useqpe.h \
503 CDrawBuffer.h \
504 StyleConsts.h \
505 CBuffer.h \
506 config.h \
507 ustring.h \
508 linktype.h \
509 CFilter.h \
510 CExpander.h \
511 Markups.h \
512 names.h \
513 CEncoding.h \
514 CEncoding_tables.h \
515 FontControl.h \
516 BGType.h \
517 striphtml.h \
518 Navigation.h
519 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_QTReader.o ZREADERMOCS/moc_QTReader.cpp
520
521ZREADEROBJS/moc_QTReaderApp.o: ZREADERMOCS/moc_QTReaderApp.cpp \
522 QTReaderApp.h \
523 ZREADERINC/useqpe.h \
524 CExpander.h \
525 config.h \
526 ustring.h \
527 StyleConsts.h \
528 Markups.h \
529 names.h \
530 linktype.h \
531 CEncoding.h \
532 CEncoding_tables.h \
533 orkey.h \
534 BGType.h
535 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_QTReaderApp.o ZREADERMOCS/moc_QTReaderApp.cpp
536
537ZREADEROBJS/moc_QtrListView.o: ZREADERMOCS/moc_QtrListView.cpp \
538 QtrListView.h
539 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_QtrListView.o ZREADERMOCS/moc_QtrListView.cpp
540
541ZREADEROBJS/moc_ToolbarPrefs.o: ZREADERMOCS/moc_ToolbarPrefs.cpp \
542 ToolbarPrefs.h \
543 ZREADERINC/useqpe.h \
544 preferences.h
545 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_ToolbarPrefs.o ZREADERMOCS/moc_ToolbarPrefs.cpp
546
547ZREADEROBJS/moc_URLDialog.o: ZREADERMOCS/moc_URLDialog.cpp \
548 URLDialog.h \
549 ZREADERINC/useqpe.h
550 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_URLDialog.o ZREADERMOCS/moc_URLDialog.cpp
551
552ZREADEROBJS/moc_cbkmkselector.o: ZREADERMOCS/moc_cbkmkselector.cpp \
553 cbkmkselector.h
554 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_cbkmkselector.o ZREADERMOCS/moc_cbkmkselector.cpp
555
556ZREADEROBJS/moc_fileBrowser.o: ZREADERMOCS/moc_fileBrowser.cpp \
557 fileBrowser.h
558 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_fileBrowser.o ZREADERMOCS/moc_fileBrowser.cpp
559
560ZREADEROBJS/moc_infowin.o: ZREADERMOCS/moc_infowin.cpp \
561 infowin.h
562 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_infowin.o ZREADERMOCS/moc_infowin.cpp
563
564ZREADERMOCS/moc_ButtonPrefs.cpp: ButtonPrefs.h
565 $(MOC) ButtonPrefs.h -o ZREADERMOCS/moc_ButtonPrefs.cpp
566
567ZREADERMOCS/moc_CAnnoEdit.cpp: CAnnoEdit.h
568 $(MOC) CAnnoEdit.h -o ZREADERMOCS/moc_CAnnoEdit.cpp
569
570ZREADERMOCS/moc_CloseDialog.cpp: CloseDialog.h
571 $(MOC) CloseDialog.h -o ZREADERMOCS/moc_CloseDialog.cpp
572
573ZREADERMOCS/moc_GraphicWin.cpp: GraphicWin.h
574 $(MOC) GraphicWin.h -o ZREADERMOCS/moc_GraphicWin.cpp
575
576ZREADERMOCS/moc_Prefs.cpp: Prefs.h
577 $(MOC) Prefs.h -o ZREADERMOCS/moc_Prefs.cpp
578
579ZREADERMOCS/moc_QFloatBar.cpp: QFloatBar.h
580 $(MOC) QFloatBar.h -o ZREADERMOCS/moc_QFloatBar.cpp
581
582ZREADERMOCS/moc_QTReader.cpp: QTReader.h
583 $(MOC) QTReader.h -o ZREADERMOCS/moc_QTReader.cpp
584
585ZREADERMOCS/moc_QTReaderApp.cpp: QTReaderApp.h
586 $(MOC) QTReaderApp.h -o ZREADERMOCS/moc_QTReaderApp.cpp
587
588ZREADERMOCS/moc_QtrListView.cpp: QtrListView.h
589 $(MOC) QtrListView.h -o ZREADERMOCS/moc_QtrListView.cpp
590
591ZREADERMOCS/moc_ToolbarPrefs.cpp: ToolbarPrefs.h
592 $(MOC) ToolbarPrefs.h -o ZREADERMOCS/moc_ToolbarPrefs.cpp
593
594ZREADERMOCS/moc_URLDialog.cpp: URLDialog.h
595 $(MOC) URLDialog.h -o ZREADERMOCS/moc_URLDialog.cpp
596
597ZREADERMOCS/moc_cbkmkselector.cpp: cbkmkselector.h
598 $(MOC) cbkmkselector.h -o ZREADERMOCS/moc_cbkmkselector.cpp
599
600ZREADERMOCS/moc_fileBrowser.cpp: fileBrowser.h
601 $(MOC) fileBrowser.h -o ZREADERMOCS/moc_fileBrowser.cpp
602
603ZREADERMOCS/moc_infowin.cpp: infowin.h
604 $(MOC) infowin.h -o ZREADERMOCS/moc_infowin.cpp
605
diff --git a/noncore/apps/opie-reader/reader.zpro b/noncore/apps/opie-reader/reader.zpro
deleted file mode 100644
index 32deb2b..0000000
--- a/noncore/apps/opie-reader/reader.zpro
+++ b/dev/null
@@ -1,95 +0,0 @@
1 TEMPLATE= app
2 CONFIG = qt warn_on release
3 HEADERS = Aportis.h \
4 Bkmks.h \
5 BuffDoc.h \
6 ButtonPrefs.h \
7 CAnnoEdit.h \
8 CBuffer.h \
9 CDrawBuffer.h \
10 CEncoding.h \
11 CEncoding_tables.h \
12 CExpander.h \
13 CFilter.h \
14 CloseDialog.h \
15 Coder.h \
16 CSource.h \
17 Filedata.h \
18 FixedFont.h \
19 FontControl.h \
20 GraphicWin.h \
21 Markups.h \
22 Navigation.h \
23 Palm2QImage.h \
24 Prefs.h \
25 PPMd.h \
26 PPMdType.h \
27 QFloatBar.h \
28 QTReader.h \
29 QTReaderApp.h \
30 QtrListView.h \
31 Queue.h \
32 StateData.h \
33 StyleConsts.h \
34 SubAlloc.h \
35 ToolbarPrefs.h \
36 URLDialog.h \
37 ZText.h \
38 arith.h \
39 arrierego.h \
40 cbkmkselector.h \
41 config.h \
42 fileBrowser.h \
43 infowin.h \
44 linktype.h \
45 my_list.h \
46 names.h \
47 nef.h \
48 ZREADERINC/opie.h \
49 pdb.h \
50 plucker.h \
51 plucker_base.h \
52 ppm.h \
53 ppm_expander.h \
54 usenef.h \
55 ZREADERINC/useqpe.h \
56 ustring.h \
57 util.h \
58 utypes.h \
59 version.h \
60 ztxt.h
61
62 SOURCES = BuffDoc.cpp \
63 ButtonPrefs.cpp \
64 CAnnoEdit.cpp \
65 CDrawBuffer.cpp \
66 CEncoding.cpp \
67 CEncoding_tables.cpp \
68 CFilter.cpp \
69 CRegExp.cpp \
70 CloseDialog.cpp \
71 FontControl.cpp \
72 GraphicWin.cpp \
73 Prefs.cpp \
74 QTReader.cpp \
75 QTReaderApp.cpp \
76 QtrListView.cpp \
77 ToolbarPrefs.cpp \
78 URLDialog.cpp \
79 fileBrowser.cpp \
80 infowin.cpp \
81 main.cpp \
82 orkey.cpp \
83 util.cpp \
84 version.cpp
85
86
87 INTERFACES=
88 DESTDIR = $(QPEDIR)/bin
89 INCLUDEPATH+= ZREADERINC
90 DEPENDPATH+= ZREADERINC
91 TARGET = uqtreader
92 LIBS += -lqpe -lreader_codec
93
94OBJECTS_DIR = ZREADEROBJS
95MOC_DIR = ZREADERMOCS
diff --git a/noncore/apps/opie-reader/reader/reader.pro b/noncore/apps/opie-reader/reader/reader.pro
index 3f56da9..33975ee 100644
--- a/noncore/apps/opie-reader/reader/reader.pro
+++ b/noncore/apps/opie-reader/reader/reader.pro
@@ -1,91 +1,87 @@
1DEFINES += OPIE USEQPE 1DEFINES += OPIE USEQPE
2VPATH = .. 2VPATH = ..
3 TEMPLATE= app 3 TEMPLATE= app
4 CONFIG = qt warn_on release 4 CONFIG = qt warn_on release
5 HEADERS = Aportis.h \ 5 HEADERS = Aportis.h \
6 Bkmks.h \ 6 Bkmks.h \
7 BuffDoc.h \ 7 BuffDoc.h \
8 ButtonPrefs.h \ 8 ButtonPrefs.h \
9 CAnnoEdit.h \ 9 CAnnoEdit.h \
10 CBuffer.h \ 10 CBuffer.h \
11 CDrawBuffer.h \ 11 CDrawBuffer.h \
12 CEncoding.h \ 12 CEncoding.h \
13 CEncoding_tables.h \ 13 CEncoding_tables.h \
14 CExpander.h \ 14 CExpander.h \
15 CFilter.h \ 15 CFilter.h \
16 CloseDialog.h \ 16 CloseDialog.h \
17 Filedata.h \ 17 Filedata.h \
18 FixedFont.h \ 18 FixedFont.h \
19 FontControl.h \ 19 FontControl.h \
20 GraphicWin.h \ 20 GraphicWin.h \
21 Markups.h \ 21 Markups.h \
22 Navigation.h \ 22 Navigation.h \
23 Palm2QImage.h \ 23 Palm2QImage.h \
24 Prefs.h \ 24 Prefs.h \
25 PPMd.h \ 25 PPMd.h \
26 PPMdType.h \ 26 PPMdType.h \
27 QFloatBar.h \ 27 QFloatBar.h \
28 QTReader.h \ 28 QTReader.h \
29 QTReaderApp.h \ 29 QTReaderApp.h \
30 QtrListView.h \ 30 QtrListView.h \
31 Queue.h \ 31 Queue.h \
32 StyleConsts.h \ 32 StyleConsts.h \
33 ToolbarPrefs.h \ 33 ToolbarPrefs.h \
34 URLDialog.h \ 34 URLDialog.h \
35 ZText.h \ 35 ZText.h \
36 arith.h \ 36 arith.h \
37 cbkmkselector.h \ 37 cbkmkselector.h \
38 config.h \ 38 config.h \
39 fileBrowser.h \ 39 fileBrowser.h \
40 infowin.h \ 40 infowin.h \
41 linktype.h \ 41 linktype.h \
42 my_list.h \ 42 my_list.h \
43 names.h \ 43 names.h \
44 ../OREADERINC/opie.h \
45 pdb.h \ 44 pdb.h \
46 plucker.h \ 45 plucker.h \
47 plucker_base.h \ 46 plucker_base.h \
48 ppm.h \ 47 ppm.h \
49 ppm_expander.h \ 48 ppm_expander.h \
50 usenef.h \ 49 usenef.h \
51 ../OREADERINC/useqpe.h \
52 ustring.h \ 50 ustring.h \
53 util.h \ 51 util.h \
54 utypes.h \ 52 utypes.h \
55 version.h \ 53 version.h \
56 ztxt.h 54 ztxt.h
57 55
58 SOURCES = BuffDoc.cpp \ 56 SOURCES = BuffDoc.cpp \
59 ButtonPrefs.cpp \ 57 ButtonPrefs.cpp \
60 CAnnoEdit.cpp \ 58 CAnnoEdit.cpp \
61 CDrawBuffer.cpp \ 59 CDrawBuffer.cpp \
62 CEncoding.cpp \ 60 CEncoding.cpp \
63 CEncoding_tables.cpp \ 61 CEncoding_tables.cpp \
64 CFilter.cpp \ 62 CFilter.cpp \
65 CRegExp.cpp \ 63 CRegExp.cpp \
66 CloseDialog.cpp \ 64 CloseDialog.cpp \
67 FontControl.cpp \ 65 FontControl.cpp \
68 GraphicWin.cpp \ 66 GraphicWin.cpp \
69 Prefs.cpp \ 67 Prefs.cpp \
70 QTReader.cpp \ 68 QTReader.cpp \
71 QTReaderApp.cpp \ 69 QTReaderApp.cpp \
72 QtrListView.cpp \ 70 QtrListView.cpp \
73 ToolbarPrefs.cpp \ 71 ToolbarPrefs.cpp \
74 URLDialog.cpp \ 72 URLDialog.cpp \
75 fileBrowser.cpp \ 73 fileBrowser.cpp \
76 infowin.cpp \ 74 infowin.cpp \
77 main.cpp \ 75 main.cpp \
78 orkey.cpp \ 76 orkey.cpp \
79 util.cpp \ 77 util.cpp \
80 version.cpp 78 version.cpp
81 79
82 INTERFACES= 80 INTERFACES=
83 DESTDIR = $(OPIEDIR)/bin 81 DESTDIR = $(OPIEDIR)/bin
84 INCLUDEPATH+= ../OREADERINC $(OPIEDIR)/include 82 INCLUDEPATH+= $(OPIEDIR)/include
85 DEPENDPATH+= ../OREADERINC $(OPIEDIR)/include 83 DEPENDPATH+= $(OPIEDIR)/include
86 TARGET = reader 84 TARGET = opie-reader
87 LIBS += -lopieui2 -lqpe -lreader_codec 85 LIBS += -lopiecore2 -lopieui2 -lqpe -lreader_codec
88
89DEPENDPATH += ../OREADERINC
90 86
91include ( $(OPIEDIR)/include.pro ) 87include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/static.h b/noncore/apps/opie-reader/static.h
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/noncore/apps/opie-reader/static.h
diff --git a/noncore/apps/opie-reader/useqpe.h b/noncore/apps/opie-reader/useqpe.h
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/noncore/apps/opie-reader/useqpe.h