From 8fd9d0290045bbcc3190c95e89c510518688490e Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Mon, 23 Nov 2020 14:56:46 +0100 Subject: [PATCH] change version to 1.28.x for GUI changes --- packaging/debian/buildppa.sh | 25 +++++++++---------------- packaging/debian/debian/changelog | 9 ++++++++- src/Makefile.am | 1 + src/VERSION | 2 +- src/qtgui/rclm_menus.cpp | 8 ++++---- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/packaging/debian/buildppa.sh b/packaging/debian/buildppa.sh index 5a8a6135..1c7a6898 100644 --- a/packaging/debian/buildppa.sh +++ b/packaging/debian/buildppa.sh @@ -4,11 +4,17 @@ # For the kio: (and kdesdk?) # sudo apt-get install pkg-kde-tools cdbs +# Active series: +# 16.04LTS xenial 2021-04 +# 18.04LTS bionic 2023-04 +# 20.04LTS focal 2025-04 +# 20.10 groovy 2021-07 + PPA_KEYID=7808CE96D38B9201 -RCLVERS=1.27.12 +RCLVERS=1.28.0pre2 SCOPEVERS=1.20.2.4 -GSSPVERS=1.0.0 +GSSPVERS=1.1.0 PPAVERS=1 # @@ -22,7 +28,7 @@ case $RCLVERS in 1.14*) PPANAME=recoll-ppa;; *) PPANAME=recoll15-ppa;; esac -#PPANAME=recollexp-ppa +PPANAME=recollexp-ppa echo "PPA: $PPANAME. Type CR if Ok, else ^C" read rep @@ -45,11 +51,6 @@ check_recoll_orig() ####### QT debdir=debian -# Active series: -# 16.04LTS xenial 2021-04 -# 18.04LTS bionic 2023-04 -# 20.04LTS focal 2025-04 -# 20.10 groovy 2021-07 series="xenial bionic focal groovy" #series= @@ -86,10 +87,6 @@ done ### KIO. -# Active series: -# 16.04LTS xenial 2021-04 -# 18.04LTS bionic 2023-04 -# 20.04LTS focal 2025-04 series="xenial bionic focal groovy" series= @@ -130,10 +127,6 @@ for svers in $series ; do done ### GSSP -# Active series: -# 16.04LTS xenial 2021-04 -# 18.04LTS bionic 2023-04 -# 20.04LTS focal 2025-04 series="xenial bionic focal groovy" series= diff --git a/packaging/debian/debian/changelog b/packaging/debian/debian/changelog index e6fe7dd9..20e2059e 100644 --- a/packaging/debian/debian/changelog +++ b/packaging/debian/debian/changelog @@ -1,8 +1,15 @@ +recoll (1.28.0pre2-1~ppaPPAVERS~SERIES1) SERIES; urgency=low + + * Add preferences options to hide most GUI elements except the result + area and the simple search entry. + + -- Jean-Francois Dockes Mon, 23 Nov 2020 14:55:00 +0100 + recoll (1.27.12-1~ppaPPAVERS~SERIES1) SERIES; urgency=low * Repair python source file indexing and spelling replacements - -- Jean-Francois Dockes Mon, 18 Nov 2020 16:15:00 +0100 + -- Jean-Francois Dockes Wed, 18 Nov 2020 16:15:00 +0100 recoll (1.27.11-1~ppaPPAVERS~SERIES1) SERIES; urgency=low diff --git a/src/Makefile.am b/src/Makefile.am index 9906fa89..0ccb8c2c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -464,6 +464,7 @@ qtgui/ptrans_w.h \ qtgui/rclhelp.cpp \ qtgui/rclhelp.h \ qtgui/rclm_idx.cpp \ +qtgui/rclm_menus.cpp \ qtgui/rclm_preview.cpp \ qtgui/rclm_saveload.cpp \ qtgui/rclm_view.cpp \ diff --git a/src/VERSION b/src/VERSION index f28cb362..be8975ec 100644 --- a/src/VERSION +++ b/src/VERSION @@ -1 +1 @@ -1.27.12 +1.28.0pre2 diff --git a/src/qtgui/rclm_menus.cpp b/src/qtgui/rclm_menus.cpp index 6d7b9b64..8a5e1266 100644 --- a/src/qtgui/rclm_menus.cpp +++ b/src/qtgui/rclm_menus.cpp @@ -85,23 +85,23 @@ void RclMain::buildMenus() queryMenu->addSection(QIcon(), tr("Simple search type")); sstypGroup = new QActionGroup(this); - auto actSSAny = new QAction(tr("Any term")); + auto actSSAny = new QAction(tr("Any term"), this); actSSAny->setData(QVariant(SSearch::SST_ANY)); actSSAny->setCheckable(true); sstypGroup->addAction(actSSAny); queryMenu->addAction(actSSAny); - auto actSSAll = new QAction(tr("All terms")); + auto actSSAll = new QAction(tr("All terms"), this); actSSAll->setData(QVariant(SSearch::SST_ALL)); actSSAll->setCheckable(true); sstypGroup->addAction(actSSAll); queryMenu->addAction(actSSAll); - auto actSSFile = new QAction(tr("File name")); + auto actSSFile = new QAction(tr("File name"), this); actSSFile->setData(QVariant(SSearch::SST_FNM)); actSSFile->setCheckable(true); sstypGroup->addAction(actSSFile); queryMenu->addAction(actSSFile); - auto actSSQuery = new QAction(tr("Query language")); + auto actSSQuery = new QAction(tr("Query language"), this); actSSQuery->setData(QVariant(SSearch::SST_LANG)); actSSQuery->setCheckable(true); sstypGroup->addAction(actSSQuery);