From f672e9de991ff44a8f828cb76ffa248f9c13b277 Mon Sep 17 00:00:00 2001
From: dockes <none@none>
Date: Mon, 4 Dec 2006 09:49:46 +0000
Subject: [PATCH] *** empty log message ***

---
 src/qt4gui/recoll.pro.in | 66 +++++++++++++++++++++++++---------------
 src/qt4gui/recoll.qrc    | 15 +++++++++
 src/qt4gui/uifrom3       |  5 +++
 3 files changed, 61 insertions(+), 25 deletions(-)
 create mode 100644 src/qt4gui/recoll.qrc
 create mode 100644 src/qt4gui/uifrom3

diff --git a/src/qt4gui/recoll.pro.in b/src/qt4gui/recoll.pro.in
index 15bdf40a..29ce579d 100644
--- a/src/qt4gui/recoll.pro.in
+++ b/src/qt4gui/recoll.pro.in
@@ -3,42 +3,56 @@ LANGUAGE	= C++
 
 CONFIG	+= qt warn_on thread release debug
 
-HEADERS	+= rclmain.h rclreslist.h uiprefs.h recollmain.h 
-HEADERS += preview/preview.h advsearch.h sort.h ssearchb.h
+HEADERS	+= \
+	../qtgui/advsearch_w.h \
+	../qtgui/spell_w.h \
+	../qtgui/preview_w.h \
+	../qtgui/rclmain_w.h \
+	../qtgui/reslist.h \
+	../qtgui/sort_w.h \
+	../qtgui/searchclause_w.h \
+	../qtgui/ssearch_w.h \
+	../qtgui/uiprefs_w.h
 
-SOURCES	+= main.cpp \
-	rclmain.cpp \
-	idxthread.cpp \
-	plaintorich.cpp \
-	guiutils.cpp \
-	rclreslist.cpp \
-        uiprefs.cpp \
-        recollmain.cpp \
-        preview/preview.cpp \
-        advsearch.cpp \
-        sort.cpp \
-        ssearchb.cpp
 
-FORMS =  sort.ui \
-        advsearch.ui \
-        recollmain.ui \
-        preview/preview.ui \
-        uiprefs.ui \
-        ssearchb.ui
+SOURCES	+= \
+	../qtgui/guiutils.cpp \
+	../qtgui/idxthread.cpp \
+	../qtgui/main.cpp \
+	../qtgui/plaintorich.cpp \
+	../qtgui/rclmain_w.cpp \
+	../qtgui/reslist.cpp \
+        ../qtgui/advsearch_w.cpp \
+	../qtgui/spell_w.cpp \
+        ../qtgui/preview_w.cpp \
+        ../qtgui/sort_w.cpp \
+	../qtgui/searchclause_w.cpp \
+        ../qtgui/ssearch_w.cpp \
+        ../qtgui/uiprefs_w.cpp
 
-RESOURCES += icons.qrc
+FORMS	= \
+	advsearch.ui \
+	spell.ui \
+	preview.ui \
+	rclmain.ui \
+	sort.ui \
+	ssearchb.ui \
+	uiprefs.ui 
+
+RESOURCES = recoll.qrc
 
 unix {
   UI_DIR = .ui
   MOC_DIR = .moc
   OBJECTS_DIR = .obj
 
-  DEFINES += RECOLL_DATADIR=\"@QTRECOLL_DATADIR@\"
+  DEFINES += RECOLL_DATADIR='\\"@QTRECOLL_DATADIR@\\"'
   LIBS += ../lib/librcl.a ../bincimapmime/libmime.a \
             $(BSTATIC) @LIBXAPIAN@ @LIBICONV@ $(BDYNAMIC) \
            -lz
 
-  INCLUDEPATH += ../common ../index ../query ../unac ../utils 
+  INCLUDEPATH += ../common ../index ../internfile ../query ../unac \
+	      ../utils ../aspell ../rcldb ../qt4gui/.ui ../qtgui ../../qtgui
   POST_TARGETDEPS = ../lib/librcl.a
 }
 
@@ -46,7 +60,9 @@ UNAME = $$system(uname -s)
 contains( UNAME, [lL]inux ) {
           LIBS -= -liconv
 }
+contains( UNAME, SunOS ) {
+          LIBS += -ldl
+}
 
 TRANSLATIONS = i18n/recoll_fr.ts i18n/recoll_ru.ts i18n/recoll_uk.ts
-#The following line was inserted by qt3to4
-QT +=  qt3support 
+QT += qt3support 
diff --git a/src/qt4gui/recoll.qrc b/src/qt4gui/recoll.qrc
new file mode 100644
index 00000000..2568c46e
--- /dev/null
+++ b/src/qt4gui/recoll.qrc
@@ -0,0 +1,15 @@
+<!DOCTYPE RCC><RCC version="1.0">
+ <qresource>
+  <file>images/asearch.png</file>
+  <file>images/cancel.png</file>
+  <file>images/close.png</file>
+  <file>images/d_nextpage.png</file>
+  <file>images/d_prevpage.png</file>
+  <file>images/d_spell.png</file>
+  <file>images/history.png</file>
+  <file>images/nextpage.png</file>
+  <file>images/prevpage.png</file>
+  <file>images/sortparms.png</file>
+  <file>images/spell.png</file>
+ </qresource>
+</RCC>
diff --git a/src/qt4gui/uifrom3 b/src/qt4gui/uifrom3
new file mode 100644
index 00000000..f0a91f16
--- /dev/null
+++ b/src/qt4gui/uifrom3
@@ -0,0 +1,5 @@
+#!/bin/sh
+for i in ../qtgui/*.ui ; do
+    echo converting $i
+    uic3 -convert $i > ../qt4gui/`basename $i`
+done