Kvkbd patches

Remove build time colour choices
 Add ColorDialog configuration option to allow default keyboard and key/button colours to be changed
 Add i18n and update .po files
 Add tooltips
 Set initial keyboard position to allow num pad visibility
 Adjust keyboard size to fix non-uniform key spacing
 Update help file
Revise setting LINGUAS variable
Add TQt headers path to qmake.conf
pull/25/head
Ray-V 4 years ago
parent 7a6d6be719
commit f69dbb3f52

@ -0,0 +1,6 @@
There is an option in the configuration menu to change the colours of the keyboard/background and the keys/buttons.
The keyboard colour change is immediate, but a change of key colour requires a restart of Kvkbd after the new colour has been selected.
If you can supply a patch to make the key colour change immediate, please open a pull request, or attach it to an issue.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 11 KiB

@ -104,14 +104,17 @@ To display and select the shift characters, use both &Shift; keys:
<title>The configuration menu</title>
The &kvkbd; configuration menu is accessible by clicking on the configuration button <guiicon><inlinegraphic fileref="config-btn.png"/></guiicon> or by right clicking on the tray icon.
<sbr/><sbr/>Select "<emphasis role="bold">Font ...</emphasis>" to choose the font used to display the characters on the keys.
<mediaobject><imageobject>
<imagedata fileref="config-menu.png" format="PNG" />
</imageobject></mediaobject>
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/>Select "<emphasis role="bold">Keyboard color</emphasis>" to choose a colour for the keyboard [background].
<sbr/><sbr/>Select "<emphasis role="bold">Key color</emphasis>" to choose a colour for the keys/buttons.
<sbr/>&kvkbd; needs to be restarted for the chosen colour to display.
<sbr/><sbr/>Check "<emphasis role="bold">Dock Widget</emphasis>" to display a small dock which can be placed anywhere on screen.
<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>
</sect1>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 14 KiB

@ -36,6 +36,8 @@ untar_fn
## copy the helpfile docs to the build tree
cp -a $SRCDIR/doc .
cp $SRCDIR/dock.png src/
## copy translations
cp $SRCDIR/translations/messages/* translations/messages/
## not in this version - introduced for the later qt4 build
sed -i '/CSS Color themes/d' README
## remove meinproc check - there are a number of validity errors relating to the use of <sbr/> etc.,
@ -174,11 +176,6 @@ EOF
patch -N -p0 << EOF || true
--- src/MainWidget.cpp
+++ src/MainWidget.cpp
@@ -75,3 +75,3 @@
- int stx=15;
+ int stx=16;
int sty=15;
@@ -219,3 +219,3 @@
smcl->setKeyCode ( 47 );
- smcl->move ( stx+ ( R3LEN *35 ) +caps->width() +5,sty+ ( 3*35 ) );
@ -333,14 +330,12 @@ patch -N -p0 << EOF || true
EOF
## kvkbd --background <color> doesn't work, so this is an option
## set keyboard background colour
## User option, set in ./BUILD-TDE.sh
#
BGCOLR=$(cat $TMPVARS/kvkbd-bg)
## kvkbd --background <color> doesn't work, so
## set a default keyboard background colour
## Changeable from configuration menu
#
## for the plastik and keramik styles which have a key boundary within the key 30x30 footprint,
## setting the button/key background colour with the KEYCOLR option will bleed through outside that boundary
## setting the button/key background colour will bleed through outside that boundary
## except for the configuration button and the num pad keys, which follow these two lines.
## Moving these settings to the beginning of MainWidget::MainWidget enables all keys to be displayed correctly.
#
@ -349,7 +344,7 @@ patch -N -p0 << EOF || true
+++ src/MainWidget.cpp
@@ -79,2 +79,5 @@
+ setPaletteBackgroundColor ( TQColor($BGCOLR) );
+ setPaletteBackgroundColor ( TQColor("#cdc0b0") );
+ setFocusPolicy ( TQ_NoFocus );
+
// resize ( 550,235 );
@ -432,22 +427,22 @@ patch -N -p0 << EOF || true
+++ src/MainWidget.cpp
@@ -410 +410 @@
- int padx= 550;
+ int padx= 553;
+ int padx= 554;
#
## move and resize keyboard
--- src/MainWidget.cpp
+++ src/MainWidget.cpp
@@ -593 +593 @@
- int d_width=550;
+ int d_width=552;
+ int d_width=553;
@@ -639,2 +639,2 @@
- sdxs = width() - (width() * (150.0/700.0));
- VButton::pw=700.0;
+ sdxs = width() - (width() * (150.0/702.0));
+ VButton::pw=702.0;
+ sdxs = width() - (width() * (150.0/703.0));
+ VButton::pw=703.0;
@@ -642 +642 @@
- setMinimumSize(700/3,235/3);
+ setMinimumSize(702/3,235/3);
+ setMinimumSize(703/3,235/3);
@@ -646,2 +646,2 @@
- sdxb = width() + (width() * (150.0/550.0));
- VButton::pw=550.0;
@ -722,23 +717,20 @@ patch -N -p0 << EOF || true
VButton::setKeyCode(numlock_code);
EOF
## kvkbd --button <color> doesn't work, so this is an option
## set button background colour which otherwise defaults to system colour
## User option, set in ./BUILD-TDE.sh
KEYCOLR=$(cat $TMPVARS/kvkbd-keycolr)
[[ $KEYCOLR ]] && {
## kvkbd --button <color> doesn't work, so
## set a default button background colour which otherwise defaults to system colour
## Changeable from configuration menu
patch -N -p0 << EOF || true
--- src/VButton.cpp
+++ src/VButton.cpp
@@ -11,2 +11,3 @@
//connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(sendKey()));
+ setPaletteBackgroundColor ( TQColor($KEYCOLR) );
+ setPaletteBackgroundColor ( TQColor("#f0f0f0") );
setFocusPolicy(TQ_NoFocus);
EOF
}
## base auto font size on main board size otherwise when the num pad is brought into view
## the font size immediately increases in proportion, ie by 702/552.
## the font size immediately increases in proportion, ie by 703/552.
## and set a more realistic initial font size
patch -N -p0 << EOF || true
--- src/MainWidget.cpp
@ -747,7 +739,7 @@ patch -N -p0 << EOF || true
//double rs = (100.0/700.0)*width();
- double rp = (8.0/600.0)*width();
+ if (extent_visible) {
+ rp = (11.0/600.0)*width() * (552.0/702.0); }
+ rp = (11.0/600.0)*width() * (552.0/703.0); }
+ else {
+ rp = (11.0/600.0)*width(); }
//fnt.setStretch(rs);
@ -762,6 +754,217 @@ patch -N -p0 << EOF || true
int mnu_dock;
EOF
########### i18n start ###################
patch -N -p0 << EOF || true
--- src/MainWidget.cpp
+++ src/MainWidget.cpp
@@ -519 +519 @@
- m->insertItem ( "Font ...", this, TQT_SLOT ( chooseFont() ) );
+ m->insertItem ( i18n ("Font"), this, TQT_SLOT ( chooseFont() ) );
@@ -521 +521 @@
- mnu_autores = m->insertItem( "Auto resize font",this, TQT_SLOT ( toggleFontAutoRes() ) );
+ mnu_autores = m->insertItem( i18n ("Auto resize font"),this, TQT_SLOT ( toggleFontAutoRes() ) );
@@ -524 +524,0 @@
-
@@ -526 +525 @@
- mnu_dock = m->insertItem ( "Dock widget", this, TQT_SLOT ( showDock() ) );
+ mnu_dock = m->insertItem ( i18n ("Dock widget"), this, TQT_SLOT ( showDock() ) );
@@ -531 +530 @@
- mnu_lock = m->insertItem("Lock on screen", this, TQT_SLOT(toggleLock()));
+ mnu_lock = m->insertItem( i18n ("Lock on screen"), this, TQT_SLOT(toggleLock()));
@@ -537 +536 @@
- m->insertItem ( "Help", h->menu() );
+ m->insertItem ( i18n ("Help"), h->menu() );
@@ -1854 +1853 @@
- TQToolTip::add ( this, "Virtual keyboard" );
+ TQToolTip::add ( this, i18n ("Virtual keyboard") );
EOF
########### i18n end ###################
## it seems that TQColorDialog::getColor() defaults to rrr,ggg,bbb format and
## cfg->readEntry adds double quotes to the string retrieved because
## if the kvkbdrc entry is kbColor=rrr,ggg,bbb, then TQColor(bc) will be invalid [TQColor("rrr,ggg,bbb")] but
## if the kvkbdrc entry is kbColor=#rrggbb then TQColor(bc) will be valid [TQColor("#rrggbb")]
## so name() is used to store the colour in #rrggbb format
## keyboard colour defaults to #cdc0b0
## key/button colour defaults to #f0f0f0
patch -N -p0 << EOF || true
--- src/MainWidget.cpp
+++ src/MainWidget.cpp
@@ -39,4 +39,3 @@
#include <tdeapplication.h>
-
-
+#include <ntqcolordialog.h>
## load any existing chosen colours for the keyboard, otherwise default to #cdc0b0
@@ -79,3 +78,7 @@
- setPaletteBackgroundColor ( TQColor("#cdc0b0") );
+ TDEConfig *cfg = TDEApplication::kApplication()->config();
+// if "kbColor" entry doesn't exist - either because it hasn't been saved
+// or kvkbdrc doesn't exist, default to "#cdc0b0"
+ TQColor bc = cfg->readEntry ("kbColor","#cdc0b0");
+ setPaletteBackgroundColor ( TQColor(bc) );
setFocusPolicy ( TQ_NoFocus );
## new configuration menu entries
@@ -524,2 +527,8 @@
+ m->insertSeparator();
+ m->insertItem ( i18n ("Keyboard color"), this, TQT_SLOT ( Colorb() ) );
+
+ m->insertItem ( i18n ("Key color (restart if changed)"), this, TQT_SLOT ( Colork() ) );
+
+ m->insertSeparator();
mnu_dock = m->insertItem ( i18n ("Dock widget"), this, TQT_SLOT ( showDock() ) );
## open ColorDialog and save chosen colours
@@ -573,3 +582,26 @@
-
+void MainWidget::Colorb() // keyboard colour chosen through the configuration menu
+{
+ TDEConfig *cfg = TDEApplication::kApplication()->config();
+// if "kbColor" entry exists, start with that, otherwise start with the default "#cdc0b0"
+ TQColor bc = cfg->readEntry ("kbColor","#cdc0b0");
+ TQColor b = TQColorDialog::getColor( TQColor( bc ) );
+// if the selection of the new colour is cancelled, b will be invalid
+// otherwise the new value is written to kvkbdrc - this must be in the #rrggbb format
+// and as writeEntry produces rrr,ggg,bbb format, .name() is required to convert to #rrggbb
+ if ( b.isValid() ) {
+ cfg->writeEntry ("kbColor", b.name() );
+ cfg->sync();
+ setPaletteBackgroundColor ( TQColor( b ) ); }
+}
+void MainWidget::Colork() // key/button colour chosen through the configuration menu
+{
+ TDEConfig *cfg = TDEApplication::kApplication()->config();
+ TQColor kc = cfg->readEntry ("keyColor","#f0f0f0");
+ TQColor k = TQColorDialog::getColor( TQColor( kc ) );
+ if ( k.isValid() ) {
+ cfg->writeEntry ("keyColor", k.name() );
+ cfg->sync(); }
+// can't set PaletteBackgroundColor because it's in VButton::VButton - needs restart to read configuration entry
+}
void MainWidget::finishInit()
## set initially 150 from the RH edge of the screen to allow for the num pad
## and set 50 from the bottom edge to allow for the panel
@@ -599,3 +631,3 @@
int d_height=235;
- TQRect dflt_geom(screen_geom.width()-d_width,screen_geom.height()-d_height,d_width,d_height);
+ TQRect dflt_geom(screen_geom.width()-d_width-150,screen_geom.height()-d_height-50,d_width,d_height);
--- src/MainWidget.h
+++ src/MainWidget.h
@@ -70,2 +70,4 @@
void toggleLock();
+ void Colorb();
+ void Colork();
--- src/VButton.cpp
+++ src/VButton.cpp
@@ -3,2 +3,4 @@
#include <tqfont.h>
+#include <tdeconfig.h>
+#include <tdeapplication.h>
## load any existing chosen colours for the keys/buttons, otherwise default to #f0f0f0
@@ -11,4 +13,10 @@
//connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(sendKey()));
- setPaletteBackgroundColor ( TQColor("#f0f0f0") );
+ TDEConfig *cfg = TDEApplication::kApplication()->config();
+// if "keyColor" entry doesn't exist - either because it hasn't been saved
+// or kvkbdrc doesn't exist, default to "#f0f0f0"
+ TQColor kc = cfg->readEntry ("keyColor","#f0f0f0");
+ setPaletteBackgroundColor ( TQColor(kc) );
+
setFocusPolicy(TQ_NoFocus);
+
resize(30,30);
EOF
<<'comment'
The keyboard geometry is saved when either of the Quit options is selected.
If the num pad is visible [extent_visible=true] when Kvkbd is closed down - ie Quit from the configuration menu - then when it is run again, with the default being extent_visible=false, the keyboard will display without the numpad but at an x-axis size which includes the num pad, ie elongated.
To fix this, add the state of extent_visible to the configuration file and start with that when Kvkbd is re-started.
comment
patch -N -p0 << EOF || true
--- src/MainWidget.cpp
+++ src/MainWidget.cpp
@@ -76,5 +76,6 @@
int sty=15;
- extent_visible=false;
TDEConfig *cfg = TDEApplication::kApplication()->config();
+// if the num pad was visible when Kvkbd was 'Quit', the geometry includes it, so start with the num pad in the same state
+ extent_visible = cfg->readBoolEntry("numpad_visible",false);
// if "kbColor" entry doesn't exist - either because it hasn't been saved
@@ -659,2 +660,3 @@
cfg->writeEntry("geometry",geometry());
+ cfg->writeEntry("numpad_visible",extent_visible);
cfg->sync();
EOF
## add tooltips to buttons
patch -N -p0 << EOF || true
--- src/MainWidget.cpp
+++ src/MainWidget.cpp
@@ -398,2 +398,3 @@
quit->setPixmap(TQIconSet(SmallIcon("application-exit")).pixmap());
+ TQToolTip::add( quit, i18n( "Hide keyboard" ) );
quit->res();
@@ -406,2 +407,3 @@
extent->setPixmap(TQIconSet(SmallIcon("media-seek-forward")).pixmap());
+ TQToolTip::add( extent, i18n( "Show num pad" ) );
extent->res();
@@ -571,3 +573,3 @@
popup_menu->setPixmap(TQIconSet(SmallIcon("configure")).pixmap());
-
+ TQToolTip::add( popup_menu, i18n( "Configure" ) );
other_keys.append(popup_menu);
@@ -989,3 +991,3 @@
- TQToolTip::add ( this, "Toggle keyboard visibility" );
+ TQToolTip::add ( this, i18n ("Toggle keyboard visibility") );
}
EOF
## more add tooltips to buttons
## if the num pad was visible, the tooltip continued to show 'Show num pad'
patch -N -p0 << EOF || true
--- src/MainWidget.cpp
+++ src/MainWidget.cpp
@@ -742,2 +742,3 @@
extent->setPixmap(TQIconSet(SmallIcon("media-seek-forward")).pixmap());
+ TQToolTip::add( extent, i18n( "Show num pad" ) );
}
@@ -747,2 +748,3 @@
TQWidget::resize ( (int)sdxb, height() );
+ TQToolTip::add( extent, i18n( "Hide num pad" ) );
}
EOF
## yet more add tooltips to buttons
## if Kvkbd was 'Quit' with the num pad visible, on restart the double arrow was indicating 'Show num pad'
patch -N -p0 << EOF || true
--- src/MainWidget.cpp
+++ src/MainWidget.cpp
@@ -406,4 +406,8 @@
extent->move(526, 85 );
- extent->setPixmap(TQIconSet(SmallIcon("media-seek-forward")).pixmap());
- TQToolTip::add( extent, i18n( "Show num pad" ) );
+ if (extent_visible) {
+ extent->setPixmap(TQIconSet(SmallIcon("media-seek-backward")).pixmap());
+ TQToolTip::add( extent, i18n( "Hide num pad" ) ); }
+ else {
+ extent->setPixmap(TQIconSet(SmallIcon("media-seek-forward")).pixmap());
+ TQToolTip::add( extent, i18n( "Show num pad" ) ); }
extent->res();
EOF
## for slack-desc
langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done

@ -0,0 +1,91 @@
# SOME DESCRIPTIVE TITLE.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2020-05-11 04:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid "_: NAME OF TRANSLATORS\n"
"Your names"
msgstr ""
#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
msgid "_: EMAIL OF TRANSLATORS\n"
"Your emails"
msgstr ""
#: main.cpp:36
msgid "A virtual keyboard for TDE"
msgstr ""
#: main.cpp:42
msgid "Stand alone version for use with TDM or XDM. \n"
"You should Add : HOME=/root kvkbd --loginhelper & to Xsetup to run in xdm/tdm"
msgstr ""
#: main.cpp:186
#. This is the app name, will it be translated?
#, fuzzy
msgid "kvkbd"
msgstr ""
#: MainWidget.cpp:399
msgid "Hide keyboard"
msgstr ""
#: MainWidget.cpp:409 MainWidget.cpp:753
msgid "Hide num pad"
msgstr ""
#: MainWidget.cpp:412 MainWidget.cpp:747
msgid "Show num pad"
msgstr ""
#: MainWidget.cpp:529
msgid "Font"
msgstr ""
#: MainWidget.cpp:531
msgid "Auto resize font"
msgstr ""
#: MainWidget.cpp:536
msgid "Keyboard color"
msgstr ""
#: MainWidget.cpp:538
msgid "Key color (restart if changed)"
msgstr ""
#: MainWidget.cpp:541
msgid "Dock widget"
msgstr ""
#: MainWidget.cpp:546
msgid "Lock on screen"
msgstr ""
#: MainWidget.cpp:552
msgid "Help"
msgstr ""
#: MainWidget.cpp:578
msgid "Configure"
msgstr ""
#: MainWidget.cpp:998
msgid "Toggle keyboard visibility"
msgstr ""
#: MainWidget.cpp:1895
msgid "Virtual keyboard"
msgstr ""

@ -0,0 +1,93 @@
# SOME DESCRIPTIVE TITLE.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2020-05-11 13:18+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
#, ignore-inconsistent
msgid "_: NAME OF TRANSLATORS\n"
"Your names"
msgstr ""
#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
#, ignore-inconsistent
msgid "_: EMAIL OF TRANSLATORS\n"
"Your emails"
msgstr ""
#: main.cpp:36
msgid "A virtual keyboard for TDE"
msgstr ""
#: main.cpp:42
msgid "Stand alone version for use with TDM or XDM. \n"
"You should Add : HOME=/root kvkbd --loginhelper & to Xsetup to run in xdm/tdm"
msgstr ""
#: main.cpp:186
#. This is the app name, will it be translated?
#, fuzzy
msgid "kvkbd"
msgstr ""
#: MainWidget.cpp:399
msgid "Hide keyboard"
msgstr ""
#: MainWidget.cpp:409 MainWidget.cpp:753
msgid "Hide num pad"
msgstr ""
#: MainWidget.cpp:412 MainWidget.cpp:747
msgid "Show num pad"
msgstr ""
#: MainWidget.cpp:529
msgid "Font"
msgstr ""
#: MainWidget.cpp:531
msgid "Auto resize font"
msgstr ""
#: MainWidget.cpp:536
msgid "Keyboard color"
msgstr "Keyboard colour"
#: MainWidget.cpp:538
msgid "Key color (restart if changed)"
msgstr "Key colour (restart if changed)"
#: MainWidget.cpp:541
msgid "Dock widget"
msgstr ""
#: MainWidget.cpp:546
msgid "Lock on screen"
msgstr ""
#: MainWidget.cpp:552
msgid "Help"
msgstr ""
#: MainWidget.cpp:578
msgid "Configure"
msgstr ""
#: MainWidget.cpp:998
msgid "Toggle keyboard visibility"
msgstr ""
#: MainWidget.cpp:1895
msgid "Virtual keyboard"
msgstr ""

@ -0,0 +1,93 @@
# SOME DESCRIPTIVE TITLE.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2020-05-11 13:18+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
#, ignore-inconsistent
msgid "_: NAME OF TRANSLATORS\n"
"Your names"
msgstr ""
#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
#, ignore-inconsistent
msgid "_: EMAIL OF TRANSLATORS\n"
"Your emails"
msgstr ""
#: main.cpp:36
msgid "A virtual keyboard for TDE"
msgstr ""
#: main.cpp:42
msgid "Stand alone version for use with TDM or XDM. \n"
"You should Add : HOME=/root kvkbd --loginhelper & to Xsetup to run in xdm/tdm"
msgstr ""
#: main.cpp:186
#. This is the app name, will it be translated?
#, fuzzy
msgid "kvkbd"
msgstr ""
#: MainWidget.cpp:399
msgid "Hide keyboard"
msgstr ""
#: MainWidget.cpp:409 MainWidget.cpp:753
msgid "Hide num pad"
msgstr ""
#: MainWidget.cpp:412 MainWidget.cpp:747
msgid "Show num pad"
msgstr ""
#: MainWidget.cpp:529
msgid "Font"
msgstr ""
#: MainWidget.cpp:531
msgid "Auto resize font"
msgstr ""
#: MainWidget.cpp:536
msgid "Keyboard color"
msgstr ""
#: MainWidget.cpp:538
msgid "Key color (restart if changed)"
msgstr ""
#: MainWidget.cpp:541
msgid "Dock widget"
msgstr ""
#: MainWidget.cpp:546
msgid "Lock on screen"
msgstr ""
#: MainWidget.cpp:552
msgid "Help"
msgstr ""
#: MainWidget.cpp:578
msgid "Configure"
msgstr ""
#: MainWidget.cpp:998
msgid "Toggle keyboard visibility"
msgstr ""
#: MainWidget.cpp:1895
msgid "Virtual keyboard"
msgstr ""

@ -563,38 +563,6 @@ If they will only be used as alternatively mapped keys using xmodmap, then they
17 75
[[ $? == 0 ]] && 2> $TMPVARS/WinLock
[[ $? == 1 ]] && echo 1 > $TMPVARS/WinLock
dialog --cr-wrap --no-collapse --nocancel --no-shadow --colors --title " Kvkbd background colour " --inputbox \
"
The default background colour for the keyboard is black.
To change it, enter the colour you want in any of these forms, including the double quotes where shown.
These examples are all the same colour:
Named: \Zb\Z6\"antiquewhite3\"\Zn
Hex: \Zb\Z6\"#cdc0b0\"\Zn
RGB: \Zb\Z6 205,192,176\Zn
" \
19 75 "\"black\"" \
2> $TMPVARS/kvkbd-bg
dialog --cr-wrap --no-collapse --nocancel --no-shadow --colors --title " Kvkbd keys/buttons colour " --inputbox \
"
The default colour for the keys and buttons is the system button colour.
To change it, enter the colour you want in any of these forms, including the double quotes where shown.
These examples are all the same colour:
Named: \Zb\Z6\"gray94\"\Zn
Hex: \Zb\Z6\"#f0f0f0\"\Zn
RGB: \Zb\Z6 240,240,240\Zn
Choosing a colour for the keys doesn't work for styles like plastik and keramik which have an outline within the 30x30 key background footprint, but is OK for cde and others.
" \
24 75 \
2> $TMPVARS/kvkbd-keycolr
}
@ -741,7 +709,7 @@ export ARCH=$(cat $TMPVARS/ARCH) # set again for the 'continue' option
export TDE_MIRROR=${TDE_MIRROR:-https://mirror.ppa.trinitydesktop.org/trinity}
export NUMJOBS=$(cat $TMPVARS/NUMJOBS)
export I18N=$(cat $TMPVARS/I18N)
export LINGUAS=$I18N
export LINGUAS="$I18N 1" ## dummy locale as LINGUAS="" builds all translations
export TQT_OPTS=$(cat $TMPVARS/TQT_OPTS)
export EXIT_FAIL=$(cat $TMPVARS/EXIT_FAIL)
export KEEP_BUILD=$(cat $TMPVARS/KEEP_BUILD)

@ -45,6 +45,9 @@ sed -i "s|QMAKE_RPATH.*$|QMAKE_RPATH =|" mkspecs/linux-g++/qmake.conf
## tqt libs might be installed in $([T]QTDIR)/lib64
sed -i "s|QTDIR)/lib|&$LIBDIRSUFFIX|" mkspecs/linux-g++/qmake.conf
## add -headerdir as set in configure
[[ $TDEVERSION == cgit ]] && QTDIR_PFX=T || QTDIR=$TQTDIR
sed -i "s|QMAKE_INCDIR =|& \$(${QTDIR_PFX:-}QTDIR)/include/tqt|" mkspecs/linux-g++/qmake.conf
## allow building with clang
[[ ! $(grep COMPILER mkspecs/linux-g++/qmake.conf) ]] && {
@ -156,8 +159,6 @@ installdocs_fn
mkdir -p $PKG/etc/profile.d
#
[[ $TDEVERSION == cgit ]] && QTDIR_PFX=T
#
echo '#!'"/bin/sh
# Environment path variable for the tQt package.
export ${QTDIR_PFX:-}QTDIR=$TQTDIR

Loading…
Cancel
Save