frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed handling color buttons in cMenuEditStrItem

Browse Source
This commit is contained in:
Klaus Schmidinger 2005-09-17 09:42:45 +02:00
parent 5147d8abbc
commit 547310a949
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1483,3 +1483,4 @@ Patrick Rother <krd-vdr@gulu.net>
Alexander Rieger <Alexander.Rieger@inka.de> Alexander Rieger <Alexander.Rieger@inka.de>
for fixing two errors in 'newplugin' for fixing two errors in 'newplugin'
for fixing handling color buttons in cMenuEditStrItem

1
HISTORY
View File

@ -3811,3 +3811,4 @@ Video Disk Recorder Revision History
- Fixed two errors in 'newplugin' (thanks to Alexander Rieger). - Fixed two errors in 'newplugin' (thanks to Alexander Rieger).
- Fixed converting arbitrarily formatted summary.vdr files (thanks to Thomas Günther). - Fixed converting arbitrarily formatted summary.vdr files (thanks to Thomas Günther).
- Fixed handling color buttons in cMenuEditStrItem (thanks to Alexander Rieger).

19
menuitems.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menuitems.c 1.22 2005/03/19 15:33:34 kls Exp $ * $Id: menuitems.c 1.23 2005/09/17 09:36:31 kls Exp $
*/ */
#include "menuitems.h" #include "menuitems.h"
@ -322,10 +322,14 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
{ {
switch (Key) { switch (Key) {
case kRed: // Switch between upper- and lowercase characters case kRed: // Switch between upper- and lowercase characters
if (pos >= 0 && (!insert || !newchar)) { if (pos >= 0) {
if (!insert || !newchar) {
uppercase = !uppercase; uppercase = !uppercase;
value[pos] = uppercase ? toupper(value[pos]) : tolower(value[pos]); value[pos] = uppercase ? toupper(value[pos]) : tolower(value[pos]);
} }
}
else
return osUnknown;
break; break;
case kGreen: // Toggle insert/overwrite modes case kGreen: // Toggle insert/overwrite modes
if (pos >= 0) { if (pos >= 0) {
@ -333,6 +337,8 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
newchar = true; newchar = true;
SetHelpKeys(); SetHelpKeys();
} }
else
return osUnknown;
break; break;
case kYellow|k_Repeat: case kYellow|k_Repeat:
case kYellow: // Remove the character at current position; in insert mode it is the character to the right of cursor case kYellow: // Remove the character at current position; in insert mode it is the character to the right of cursor
@ -350,6 +356,15 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
uppercase = isupper(value[pos]); uppercase = isupper(value[pos]);
newchar = true; newchar = true;
} }
else
return osUnknown;
break;
case kBlue|k_Repeat:
case kBlue: // consume the key only if in edit-mode
if (pos >= 0)
;
else
return osUnknown;
break; break;
case kLeft|k_Repeat: case kLeft|k_Repeat:
case kLeft: if (pos > 0) { case kLeft: if (pos > 0) {