Added kvkbd Lock on screen

Patches for en_GB translations
Preferred formatting of help files
tqca-tls cmake update

Apps/kvkbd/doc/en/index.docbook

@@ -105,7 +105,8 @@ The &kvkbd; configuration menu is accessible by clicking on the configuration bu
 <sbr/><sbr/>Select "<emphasis role="bold">Font ...</emphasis>" to choose the font used to display the characters on the keys.
 <sbr/><sbr/>Check "<emphasis role="bold">Auto Resize Font</emphasis>" to resize the font when &kvkbd; is resized.
 <sbr/><sbr/>Check "<emphasis role="bold">Dock Widget</emphasis>" to display a small dock which can be placed anywhere on screen.
-<sbr/>Click on it to hide or show the virtual keyboard.
+<sbr/>Click on the dock to hide or show the virtual keyboard.
+<sbr/><sbr/>Check "<emphasis role="bold">Lock on screen</emphasis>" to fix the position and size of the keyboard on the screen.
 <mediaobject><imageobject>
     <imagedata fileref="config-menu.png" format="PNG" />
 </imageobject></mediaobject>

Apps/kvkbd/kvkbd.SlackBuild

@@ -429,6 +429,96 @@ patch -N -p0 << EOF || true
 EOF
 }
 
+## add 'Lock on screen' feature from v0.5
+patch -N -p0 << EOF || true
+--- src/MainWidget.cpp
++++ src/MainWidget.cpp
+@@ -529,4 +529,8 @@
+ 		m->setItemChecked(mnu_dock, show_dock);
+ 		
++		mnu_lock = m->insertItem("Lock on screen", this, TQT_SLOT(toggleLock()));
++		bool is_locked = cfg->readBoolEntry("locked",false);
++		m->setItemChecked(mnu_lock,is_locked);
++		
+ 		//m->insertItem("Configure", this, TQT_SLOT(config()));
+ 		m->insertSeparator();
+@@ -742,2 +746,14 @@
+ }
++void MainWidget::toggleLock()
++{
++	bool c = isLocked();
++
++	tray->contextMenu()->setItemChecked ( mnu_lock, !c );
++	setLocked(!c);
++
++	TDEConfig *cfg = TDEApplication::kApplication()->config();
++	cfg->writeEntry ("locked", !c);
++	cfg->sync();
++
++}
+ void MainWidget::showDock()
+#
+##
+--- src/MainWidget.h
++++ src/MainWidget.h
+@@ -69,2 +69,3 @@
+  	void saveState();
++	void toggleLock();
+ 
+@@ -131,2 +131,3 @@
+ 	int mnu_autores;
++	int mnu_lock;
+ 
+#
+##
+--- src/DragWidget.cpp
++++ src/DragWidget.cpp
+@@ -6,3 +6,3 @@
+ 	drag=false;
+-
++	locked=false;
+ }
+@@ -17,2 +17,3 @@
+ 	gpress=e->globalPos();
++	if (locked)return;
+ 	drag=true;
+@@ -34,2 +35,12 @@
+ }
++
++void DragWidget::setLocked(bool mode)
++{
++	locked=mode;
++}
++
++const bool DragWidget::isLocked() const
++{
++	return locked;
++}
+ 
+#
+##
+--- src/DragWidget.h
++++ src/DragWidget.h
+@@ -14,2 +14,5 @@
+ 
++	void setLocked(bool mode);
++	const bool isLocked() const;
++
+ private:
+@@ -24,2 +27,3 @@
+ 	TQPoint gpress;
++	bool locked;
+ 
+#
+##
+--- src/resizabledragwidget.cpp
++++ src/resizabledragwidget.cpp
+@@ -38,2 +38,3 @@
+ {
++	if (locked)return;
+ 	
+EOF
+
 
 # for 14.0.8, set support for additional language(s) as per I18N variable
 # but only for languages available with this package

Core/tde-i18n/tde-i18n-en_GB-patch

@@ -17,3 +17,94 @@
  msgid "The Trinity Help Center"
 -msgstr "The TDE Control Centre"
 +msgstr "The TDE Help Centre"
+
+## In the Configure Panel|Taskbar window, the Alt-c shortcut is assigned
+## to the Cancel button, which takes priority over 'custom colors'
+## which becomes "Us&e custom colours", so force &Use ..
+--- tde-i18n-en_GB/messages/tdebase/kcmtaskbar.po
++++ tde-i18n-en_GB/messages/tdebase/kcmtaskbar.po
+@@ -378,3 +378,3 @@
+ msgid "Use &custom colors"
+-msgstr ""
++msgstr "&Use custom colours"
+ 
+@@ -383,3 +383,3 @@
+ msgid "Inacti&ve task text color:"
+-msgstr ""
++msgstr "Inacti&ve task text colour:"
+ 
+@@ -388,3 +388,3 @@
+ msgid "Active task te&xt color:"
+-msgstr ""
++msgstr "Active task te&xt colour:"
+ 
+@@ -393,3 +393,3 @@
+ msgid "&Background color:"
+-msgstr ""
++msgstr "&Background colour:"
+ 
+@@ -413,3 +413,3 @@
+ msgid "Right b&utton:"
+-msgstr "Right b&utton:"
++msgstr "&Right button:"
+ 
+
+--- tde-i18n-en_GB/messages/tdebase/tderandr.po
++++ tde-i18n-en_GB/messages/tdebase/tderandr.po
+@@ -188,3 +188,3 @@
+ msgid "Color Profile"
+-msgstr ""
++msgstr "Colour Profile"
+ 
+
+## re-assign shortcut key for System Admin|Monitor & Display|Global Settings|Enable ...
+## otherwise the option toggles with S&earch and
+## the space bar is needed to enable it
+--- /dev/null
++++ tde-i18n-en_GB/messages/tdebase/kcmdisplayconfig.po
+@@ -0,0 +1,5 @@
++msgid "Color Profiles"
++msgstr "Colour Profiles"
++
++msgid "&Enable global display control"
++msgstr "E&nable global display control"
+
+## Control Centre|Peripherals|Colour Profile, Alt-e is assigned to Search,
+## so use Alt-n for "E&nable global colour profile support"
+## and use Alt-u for "Enable &user colour profile support"
+--- /dev/null
++++ tde-i18n-en_GB/messages/tdebase/kcmiccconfig.po
+@@ -0,0 +1,33 @@
++msgid "TDE Color Profile Control Module"
++msgstr "TDE Colour Profile Control Module"
++
++msgid "<b>The global color profile is a system wide setting, and requires "
++"administrator access</b><br>To alter the system's global profile, click on "
++"the \"Administrator Mode\" button below."
++msgstr "<b>The global colour profile is a system wide setting, and requires "
++"administrator access</b><br>To alter the system's global profile, click on "
++"the \"Administrator Mode\" button below."
++
++msgid "Color Profile Configuration"
++msgstr "Colour Profile Configuration"
++
++msgid "<h1>Color Profile Configuration</h1> This module allows you to configure TDE "
++"support for ICC color profiles. This allows you to easily color correct your "
++"monitor for a more lifelike and vibrant image."
++msgstr "<h1>Colour Profile Configuration</h1> This module allows you to configure TDE "
++"support for ICC colour profiles. This allows you to easily colour correct your "
++"monitor for a more lifelike and vibrant image."
++
++msgid "&Enable global color profile support"
++msgstr "E&nable global colour profile support"
++
++msgid "*.icc|ICC Standard Color Profiles (*.icc)\n"
++"*.icm|Windows(R) Color Profiles (*.icm)"
++msgstr "*.icc|ICC Standard Colour Profiles (*.icc)\n"
++"*.icm|Windows(R) Colour Profiles (*.icm)"
++
++msgid "Color Profile"
++msgstr "Colour Profile"
++
++msgid "&Enable user color profile support"
++msgstr "Enable &user colour profile support"

Core/tdebase/tdebase.SlackBuild

@@ -108,6 +108,28 @@ sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" tdm/kfrontend/gentdmconf.c || true
 sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" kcontrol/hwmanager/devicepropsdlg.cpp || true
 sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" tdeioslave/trash/testtrash.cpp || true
 
+[[ $TDEVERSION != 14.0.8 ]] && {
+patch -N -p0 << EOF || true
+--- translations/desktop_files/kcontrol-desktops/en_GB.po
++++ translations/desktop_files/kcontrol-desktops/en_GB.po
+@@ -1355,3 +1355,3 @@
+ msgid "Configure display ICC color profile"
+-msgstr ""
++msgstr "Configure display ICC colour profile"
+ 
+@@ -1360,3 +1360,3 @@
+ msgid "ICC;display;color;profile;"
+-msgstr ""
++msgstr "ICC;display;colour;profile;"
+ 
+@@ -1365,3 +1365,3 @@
+ msgid "Color Profile"
+-msgstr ""
++msgstr "Colour Profile"
+ 
+EOF
+}
+
 listdocs_fn
 
 chown_fn

Core/tdelibs/README

@@ -0,0 +1,6 @@
+Some formatting for help pages has been changed by a patch in the SlackBuild - if it's not wanted, just remove or comment out the patch.
+
+* text in paragraphs left aligned
+* border and colour for keyboard key highlighting
+* lightened menu items highlighting
+ 

Core/tdelibs/tdelibs.SlackBuild

@@ -71,6 +71,49 @@ sed -i "s|trinity|$PLUGIN_INSTALL_DIR|g" $file || true
 done
 sed -i "s|\"trinity\"|\"$PLUGIN_INSTALL_DIR\"|"  tdecore/tdeapplication.cpp || true
 
+## Patching for preferred formatting of help files
+patch -N -p0 << EOF || true
+--- doc/common/tde-docs.css
++++ doc/common/tde-docs.css
+#
+## tone down menu items highlighting
+@@ -176,6 +176,6 @@
+ .guilabel, .interface, .guibutton {
+-    background-color: rgb(220, 220, 220);
++    background-color: #f0f0f0;
+     color: black;
+     border: 1px solid rgb(190, 190, 190);
+-
++    padding:0px 1px;
+     -khtml-border-radius: 3px;
+#
+## for the <keycap> tags
+@@ -199 +199 @@
+-    background-color: #DFDFFF;
++    background-color: #efefef;
+@@ -201 +201,6 @@
+-
++    padding-left: 1px;
++    padding-right: 1px;
++    border-style: solid;
++    border-width: 0px 1px;
++    border-color: lightgray;
++    color:gray;
+@@ -209 +214 @@
+-    border 2px solid gray;
++    border: 2px solid gray;
+#
+## left justify text in the <para> tags in index.docbook
+--- doc/common/tde-default.css
++++ doc/common/tde-default.css
+@@ -211 +211 @@
+-  text-align: justify; 
++  text-align: left; 
+@@ -319 +319 @@
+-  text-align: justify; 
++  text-align: left;
+EOF
+
 listdocs_fn
 
 chown_fn
@@ -83,6 +126,9 @@ cd_builddir_fn
 sed -i 's|TQT_INCLUDE_DIRS}|&\n  ${AVAHI_TQT_INCLUDE_DIRS}|' ../dnssd/CMakeLists.txt
 }
 
+## comment out if setting ASPELL, HSPELL, or ISPELL 'ON'
+sed -i 's|^.*Spell checker selected as default.*$|message( STATUS " ## no spell checker selected ##" )|' ../CMakeLists.txt
+
 cmake \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
@@ -110,6 +156,7 @@ cmake \
     -DWITH_HAL="OFF" \
     -DWITH_HSPELL="OFF" \
     -DWITH_INOTIFY="ON" \
+    -DWITH_ISPELL="OFF" \
     -DWITH_JASPER="OFF" \
     -DWITH_KDE4_MENU_SUFFIX="ON" \
     -DWITH_LIBART="ON" \

Deps/tqca-tls/tqca-tls.SlackBuild

@@ -37,14 +37,14 @@ listdocs_fn
 
 chown_fn
 
+[[ $TDEVERSION == 14.0.8 ]] && {
+
 #cd_builddir_fn - don't use
 
 ## add TQt headers directory to configure search list
 sed -i "s|/usr/include/tqt|$TQTDIR/include/tqt|" configure
 
-## QTDIR is needed for 14.0.? because configure can't find tqmake
-## from its algorithm - ignored for 14.1.0 which needs TQTDIR
-## which has been set as a shell variable in BUILD-TDE.sh
+## QTDIR is needed for 14.0.8 because configure can't find tqmake from its algorithm
 QTDIR=$TQTDIR \
 CXXFLAGS="$SLKRCFLAGS" \
 ./configure
@@ -56,8 +56,28 @@ sed -i "s|-march=.*-mtune=[a-z,0-9,-]*||;s|fvisibility-inlines-hidden|& $SET_mar
 ## set RPATH to ensure tqt libs are prioritized
 sed -i "s|LFLAGS .*$|& -Wl,-rpath,'$INST_RPATH'|" Makefile
 
+} || {
+
+cd_builddir_fn
+
+cmake \
+    -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
+    -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
+    -DCMAKE_C_COMPILER=$COMPILER \
+    -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
+    -DLIB_SUFFIX=$LIBDIRSUFFIX \
+    -DWITH_GCC_VISIBILITY="OFF" \
+    -Wno-dev \
+    ..
+
+}
+
 make ${NUMJOBS:-} || exit 1
-make INSTALL_ROOT=$PKG install || exit 1
+## INSTALL_ROOT is DESTDIR for builds beyond 14.0.8
+[[ $TDEVERSION == 14.0.8 ]] && INSTALL_ROOT=INSTALL_ROOT
+make ${INSTALL_ROOT:-DESTDIR}=$PKG install || exit 1
 
 installdocs_fn
 

README.md

@@ -121,7 +121,7 @@ Includes:
 
 [3] The Misc directory contains SlackBuilds for software that might already be installed from other sources. Please check because any misc builds selected here could overwrite them.
 
-[4] The README for a native build for Raspberry Pi3 [[README-Raspberry-Pi3.md](./README-Raspberry-Pi3.md)] is now rather dated and cross compiling is preferred.
+[4] The README for a native build for Raspberry Pi3 [[README-Raspberry-Pi3.md](./README-Raspberry-Pi3.md)] is now rather dated and cross compiling is a better option.
 
 [5] Building the kalzium equation solver needs ocaml and facile installed. They will be built, packaged, and installed during the tdeedu build if the source archives are pre-downloaded to the 'src' directory.  
 https://github.com/ocaml/ocaml/archive/4.05.0.tar.gz