mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Improved enhanced string editing
This commit is contained in:
parent
4a698e3fe4
commit
3554e3acad
3
MANUAL
3
MANUAL
@ -60,7 +60,8 @@ Video Disk Recorder User's Manual
|
||||
"Left" and "Right", and changing the character with the "Up" and "Down"
|
||||
keys. "Ok" then confirms the changes. The "Red" key toggles between
|
||||
upper- and lowercase characters, while the "Green" key switches between
|
||||
insert and overwrite mode. The "Yellow" key deletes the current character.
|
||||
insert and overwrite mode. The "Yellow" key deletes the current character
|
||||
(or the one to the right of the cursor in insert mode).
|
||||
|
||||
The "Red", "Green", "Yellow" and "Blue" buttons have special meanings
|
||||
in various menus and are listed at the bottom of the on-screen-display.
|
||||
|
15
i18n.c
15
i18n.c
@ -4,7 +4,7 @@
|
||||
* See the main source file 'vdr.c' for copyright information and
|
||||
* how to reach the author.
|
||||
*
|
||||
* $Id: i18n.c 1.80 2002/04/13 10:42:48 kls Exp $
|
||||
* $Id: i18n.c 1.81 2002/04/16 16:02:49 kls Exp $
|
||||
*
|
||||
* Slovenian translations provided by Miha Setina <mihasetina@softhome.net> and Matjaz Thaler <matjaz.thaler@guest.arnes.si>
|
||||
* Italian translations provided by Alberto Carraro <bertocar@tin.it>
|
||||
@ -1638,6 +1638,19 @@ const tPhrase Phrases[] = {
|
||||
"PonWtoSroCzwPiaSobNie",
|
||||
"LunMarMieJueVieSabDom",
|
||||
},
|
||||
// The allowed characters in strings:
|
||||
{ " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
|
||||
" aäbcdefghijklmnoöpqrstuüvwxyz0123456789-.#~",
|
||||
"",// TODO
|
||||
"",// TODO
|
||||
"",// TODO
|
||||
"",// TODO
|
||||
"",// TODO
|
||||
"",// TODO
|
||||
"",// TODO
|
||||
"",// TODO
|
||||
" aábcdeéfghiíjklmnñoópqrstuúvwxyz0123456789-.#~",
|
||||
},
|
||||
// Learning keys:
|
||||
{ "Learning Remote Control Keys",
|
||||
"Fernbedienungs-Codes lernen",
|
||||
|
17
menu.c
17
menu.c
@ -4,7 +4,7 @@
|
||||
* See the main source file 'vdr.c' for copyright information and
|
||||
* how to reach the author.
|
||||
*
|
||||
* $Id: menu.c 1.183 2002/04/13 10:38:03 kls Exp $
|
||||
* $Id: menu.c 1.184 2002/04/16 16:11:40 kls Exp $
|
||||
*/
|
||||
|
||||
#include "menu.h"
|
||||
@ -647,18 +647,19 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
|
||||
case kRight|k_Repeat:
|
||||
case kRight: if (pos < length && pos < int(strlen(value)) ) {
|
||||
if (++pos >= int(strlen(value))) {
|
||||
if (pos == 0 || value[pos - 1] != ' ') {
|
||||
if (pos >= 2 && value[pos - 1] == ' ' && value[pos - 2] == ' ')
|
||||
pos--; // allow only two blanks at the end
|
||||
else {
|
||||
value[pos] = ' ';
|
||||
value[pos + 1] = 0;
|
||||
}
|
||||
else
|
||||
pos--; // allow only blank at the end
|
||||
}
|
||||
}
|
||||
newchar = true;
|
||||
if (!insert && isalpha(value[pos]))
|
||||
uppercase = isupper(value[pos]);
|
||||
SetHelpKeys();
|
||||
if (pos == 0)
|
||||
SetHelpKeys();
|
||||
break;
|
||||
case kUp|k_Repeat:
|
||||
case kUp:
|
||||
@ -788,7 +789,7 @@ cMenuEditChannel::cMenuEditChannel(int Index)
|
||||
channel = Channels.Get(Index);
|
||||
if (channel) {
|
||||
data = *channel;
|
||||
Add(new cMenuEditStrItem( tr("Name"), data.name, sizeof(data.name), FileNameChars));
|
||||
Add(new cMenuEditStrItem( tr("Name"), data.name, sizeof(data.name), tr(FileNameChars)));
|
||||
Add(new cMenuEditIntItem( tr("Frequency"), &data.frequency));
|
||||
Add(new cMenuEditChrItem( tr("Polarization"), &data.polarization, "hv"));
|
||||
Add(new cMenuEditIntItem( tr("DiSEqC"), &data.diseqc, 0, 10)); //TODO exact limits???
|
||||
@ -1175,7 +1176,7 @@ cMenuEditTimer::cMenuEditTimer(int Index, bool New)
|
||||
//TODO VPS???
|
||||
Add(new cMenuEditIntItem( tr("Priority"), &data.priority, 0, MAXPRIORITY));
|
||||
Add(new cMenuEditIntItem( tr("Lifetime"), &data.lifetime, 0, MAXLIFETIME));
|
||||
Add(new cMenuEditStrItem( tr("File"), data.file, sizeof(data.file), FileNameChars));
|
||||
Add(new cMenuEditStrItem( tr("File"), data.file, sizeof(data.file), tr(FileNameChars)));
|
||||
SetFirstDayItem();
|
||||
}
|
||||
}
|
||||
@ -2193,7 +2194,7 @@ void cMenuSetupRecord::Set(void)
|
||||
Add(new cMenuEditIntItem( tr("Setup.Recording$Default lifetime (d)"), &data.DefaultLifetime, 0, MAXLIFETIME));
|
||||
Add(new cMenuEditBoolItem(tr("Setup.Recording$Use episode name"), &data.UseSubtitle));
|
||||
Add(new cMenuEditBoolItem(tr("Setup.Recording$Mark instant recording"), &data.MarkInstantRecord));
|
||||
Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"), data.NameInstantRecord, sizeof(data.NameInstantRecord), FileNameChars));
|
||||
Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"), data.NameInstantRecord, sizeof(data.NameInstantRecord), tr(FileNameChars)));
|
||||
Add(new cMenuEditBoolItem(tr("Setup.Recording$Record Dolby Digital"), &data.RecordDolbyDigital));
|
||||
Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size (MB)"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE));
|
||||
Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"), &data.SplitEditedFiles));
|
||||
|
Loading…
Reference in New Issue
Block a user