diff --git a/.hgignore b/.hgignore
index d86c79bc..2868de36 100644
--- a/.hgignore
+++ b/.hgignore
@@ -62,7 +62,6 @@ src/qt4gui/advsearch.ui
src/qt4gui/images
src/qt4gui/preview.ui
src/qt4gui/qrc_recoll.cpp
-src/qt4gui/rclmain.ui
src/qt4gui/recoll
src/qt4gui/recoll.pro
src/qt4gui/sort.ui
diff --git a/src/qt4gui/rclmain.ui b/src/qt4gui/rclmain.ui
new file mode 100644
index 00000000..9b5bd6ff
--- /dev/null
+++ b/src/qt4gui/rclmain.ui
@@ -0,0 +1,336 @@
+
+
+ RclMainBase
+
+
+
+ 0
+ 0
+ 800
+ 600
+
+
+
+ Recoll
+
+
+
+
+ 2
+
+
+ 4
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ 0
+
+
+
+ All
+
+
+
+
+ -
+
+
+
+ 2
+ 0
+
+
+
+
+
+
+
+
+
+ Search tools
+
+
+ TopToolBarArea
+
+
+ false
+
+
+
+
+
+
+
+
+ Result list
+
+
+ TopToolBarArea
+
+
+ false
+
+
+
+
+
+
+
+
+ E&xit
+
+
+ Ctrl+Q
+
+
+ fileExitAction
+
+
+
+
+ Update &index
+
+
+ fileToggleIndexingAction
+
+
+
+
+ &Erase document history
+
+
+ fileEraseDocHistoryAction
+
+
+
+
+ &Show missing helpers
+
+
+ showMissingHelpers_Action
+
+
+
+
+ &About Recoll
+
+
+ helpAbout_RecollAction
+
+
+
+
+ &User manual
+
+
+ userManualAction
+
+
+
+
+ Document &History
+
+
+ Document History
+
+
+ toolsDoc_HistoryAction
+
+
+
+
+ &Advanced Search
+
+
+ Advanced/complex Search
+
+
+ toolsAdvanced_SearchAction
+
+
+
+
+ &Sort parameters
+
+
+ Sort parameters
+
+
+ toolsSort_parametersAction
+
+
+
+
+ Term &explorer
+
+
+ Term explorer tool
+
+
+ toolsSpellAction
+
+
+
+
+ false
+
+
+ Next page
+
+
+ Next page of results
+
+
+ nextPageAction
+
+
+
+
+ false
+
+
+ First page
+
+
+ Go to first page of results
+
+
+ firstPageAction
+
+
+
+
+ false
+
+
+ Previous page
+
+
+ Previous page of results
+
+
+ prevPageAction
+
+
+
+
+ &Indexing configuration
+
+
+ indexConfigAction
+
+
+
+
+ &Query configuration
+
+
+ queryPrefsAction
+
+
+
+
+ External index dialog
+
+
+ External index dialog
+
+
+ extIdxAction
+
+
+
+
+ qPixmapFromMimeSource
+
+
+ SSearch
+ QWidget
+
+
+
+ ResList
+ QWidget
+
+
+
+
+ ssearch_w.h
+ reslist.h
+
+
+
+
diff --git a/src/qt4gui/uifrom3 b/src/qt4gui/uifrom3
index f0014c46..38f936af 100644
--- a/src/qt4gui/uifrom3
+++ b/src/qt4gui/uifrom3
@@ -2,7 +2,7 @@
# by "configure"
# Convert the uic files from qt3 to qt4.
-UIFILES = advsearch.ui preview.ui rclmain.ui sort.ui spell.ui \
+UIFILES = advsearch.ui preview.ui sort.ui spell.ui \
ssearchb.ui uiprefs.ui viewaction.ui
all: always $(UIFILES)
@@ -11,8 +11,6 @@ advsearch.ui : ../qtgui/advsearch.ui
uic3 -convert ../qtgui/advsearch.ui > advsearch.ui
preview.ui : ../qtgui/preview.ui
uic3 -convert ../qtgui/preview.ui > preview.ui
-rclmain.ui : ../qtgui/rclmain.ui
- uic3 -convert ../qtgui/rclmain.ui > rclmain.ui
sort.ui : ../qtgui/sort.ui
uic3 -convert ../qtgui/sort.ui > sort.ui
spell.ui : ../qtgui/spell.ui
diff --git a/src/qtgui/confgui/confguiindex.h b/src/qtgui/confgui/confguiindex.h
index 0f00a0fd..b7c34a91 100644
--- a/src/qtgui/confgui/confguiindex.h
+++ b/src/qtgui/confgui/confguiindex.h
@@ -10,9 +10,11 @@
#include
#include
#if QT_VERSION < 0x040000
+#include
#include
#define QTABDIALOG QTabDialog
#else // Qt4 ->
+#include
#include
#define QTABDIALOG Q3TabDialog
#endif // QT 3/4
@@ -26,7 +28,6 @@ class ConfNull;
class RclConfig;
class ConfParamW;
class ConfParamDNLW;
-class QGroupBox;
namespace confgui {
@@ -54,12 +55,6 @@ public:
ConfTopPanelW(QWidget *parent, ConfNull *config);
};
-#if QT_VERSION < 0x040000
-#include
-#else
-#include
-#endif
-
/**
* A panel for the parameters that can be changed in subdirectories:
*/
diff --git a/src/qtgui/rclmain_w.cpp b/src/qtgui/rclmain_w.cpp
index 17f96cd6..23c77272 100644
--- a/src/qtgui/rclmain_w.cpp
+++ b/src/qtgui/rclmain_w.cpp
@@ -33,18 +33,13 @@ using std::pair;
#include
#include
+#include
#if (QT_VERSION < 0x040000)
#include
#include
#include
#include
-#include
-#else
-#include
-#define QFileDialog Q3FileDialog
-#include
-#define QToolBar Q3ToolBar
#endif
#include
@@ -175,15 +170,29 @@ void RclMain::init()
// Toolbar+combobox version of the category selector
QComboBox *catgCMB = 0;
if (prefs.catgToolBar) {
- catgCMB = new QComboBox(FALSE, new QToolBar(this), "catCMB");
+ QToolBar *catgToolBar = new QToolBar(this);
+ catgCMB = new QComboBox(FALSE, catgToolBar, "catCMB");
catgCMB->insertItem(tr("All"));
#if (QT_VERSION >= 0x040000)
+ catgToolBar->setObjectName(QString::fromUtf8("catgToolBar"));
catgCMB->setToolTip(tr("Document category filter"));
+ catgToolBar->addWidget(catgCMB);
+ this->addToolBar(Qt::TopToolBarArea, catgToolBar);
#endif
}
// Document categories buttons
+#if (QT_VERSION < 0x040000)
catgBGRP->setColumnLayout(1, Qt::Vertical);
+ connect(catgBGRP, SIGNAL(clicked(int)), this, SLOT(catgFilter(int)));
+#else
+ QHBoxLayout *bgrphbox = new QHBoxLayout(catgBGRP);
+ QButtonGroup *bgrp = new QButtonGroup(catgBGRP);
+ bgrphbox->addWidget(allRDB);
+ int bgrpid = 0;
+ bgrp->addButton(allRDB, bgrpid++);
+ connect(bgrp, SIGNAL(buttonClicked(int)), this, SLOT(catgFilter(int)));
+#endif
list cats;
rclconfig->getMimeCategories(cats);
// Text for button 0 is not used. Next statement just avoids unused
@@ -197,8 +206,17 @@ void RclMain::init()
but->setText(tr(catgnm));
if (prefs.catgToolBar && catgCMB)
catgCMB->insertItem(tr(catgnm));
+#if (QT_VERSION >= 0x040000)
+ bgrphbox->addWidget(but);
+ bgrp->addButton(but, bgrpid++);
+#endif
}
+#if (QT_VERSION < 0x040000)
catgBGRP->setButton(0);
+#else
+ catgBGRP->setLayout(bgrphbox);
+#endif
+
if (prefs.catgToolBar)
catgBGRP->hide();
// Connections
@@ -264,7 +282,6 @@ void RclMain::init()
connect(indexConfigAction, SIGNAL(activated()), this, SLOT(showIndexConfig()));
connect(queryPrefsAction, SIGNAL(activated()), this, SLOT(showUIPrefs()));
connect(extIdxAction, SIGNAL(activated()), this, SLOT(showExtIdxDialog()));
- connect(catgBGRP, SIGNAL(clicked(int)), this, SLOT(catgFilter(int)));
if (prefs.catgToolBar && catgCMB)
connect(catgCMB, SIGNAL(activated(int)), this, SLOT(catgFilter(int)));
connect(periodictimer, SIGNAL(timeout()), this, SLOT(periodic100()));
diff --git a/src/qtgui/rclmain_w.h b/src/qtgui/rclmain_w.h
index fb10532f..474dd73d 100644
--- a/src/qtgui/rclmain_w.h
+++ b/src/qtgui/rclmain_w.h
@@ -34,13 +34,8 @@
#if QT_VERSION < 0x040000
#include "rclmain.h"
#else
-#if QT_VERSION >= 0x040601
-// 4.6.1 uic is broken
-#include "ui_rclmain.h-4.5"
-#else
#include "ui_rclmain.h"
#endif
-#endif
//MOC_SKIP_BEGIN
#if QT_VERSION < 0x040000
@@ -50,10 +45,10 @@ class DummyRclMainBase : public RclMainBase
};
#define RCLMAINPARENT QWidget
#else
-class DummyRclMainBase : public Q3MainWindow, public Ui::RclMainBase
+class DummyRclMainBase : public QMainWindow, public Ui::RclMainBase
{
-public: DummyRclMainBase(QWidget *parent) :Q3MainWindow(parent){setupUi(this);}
-#define RCLMAINPARENT Q3MainWindow
+public: DummyRclMainBase(QWidget *parent) :QMainWindow(parent){setupUi(this);}
+#define RCLMAINPARENT QMainWindow
};
#endif
//MOC_SKIP_END