merge-requests/1/head
Peter Kirchgessner 2003-07-24 18:31:58 +00:00
rodzic d2e8703267
commit 030e0f0722
3 zmienionych plików z 88 dodań i 83 usunięć

Wyświetl plik

@ -2871,10 +2871,10 @@ static const struct hp_option_descriptor_s PREVIEW_MODE[1] = {{
}};
static const struct hp_choice_s _scanmode_choices[] = {
{ HP_SCANMODE_LINEART, "Lineart", 0, 0, 0 },
{ HP_SCANMODE_HALFTONE, "Halftone", 0, 0, 0 },
{ HP_SCANMODE_GRAYSCALE, "Grayscale", 0, 0, 0 },
{ HP_SCANMODE_COLOR, "Color", 0, 0, 0 },
{ HP_SCANMODE_LINEART, SANE_I18N("Lineart"), 0, 0, 0 },
{ HP_SCANMODE_HALFTONE, SANE_I18N("Halftone"), 0, 0, 0 },
{ HP_SCANMODE_GRAYSCALE, SANE_I18N("Grayscale"), 0, 0, 0 },
{ HP_SCANMODE_COLOR, SANE_I18N("Color"), 0, 0, 0 },
{ 0, 0, 0, 0, 0 }
};
static const struct hp_option_descriptor_s SCAN_MODE[1] = {{
@ -2985,12 +2985,12 @@ static const struct hp_option_descriptor_s GAMMA_VECTOR_B[1] = {{
#endif
static const struct hp_choice_s _halftone_choices[] = {
{ HP_DITHER_COARSE, "Coarse", 0, 0, 0 },
{ HP_DITHER_FINE, "Fine", 0, 0, 0 },
{ HP_DITHER_BAYER, "Bayer", 0, 0, 0 },
{ HP_DITHER_VERTICAL, "Vertical", 0, 0, 0 },
{ HP_DITHER_HORIZONTAL, "Horizontal", 0, 1, 0 },
{ HP_DITHER_CUSTOM, "Custom", 0, 0, 0 },
{ HP_DITHER_COARSE, SANE_I18N("Coarse"), 0, 0, 0 },
{ HP_DITHER_FINE, SANE_I18N("Fine"), 0, 0, 0 },
{ HP_DITHER_BAYER, SANE_I18N("Bayer"), 0, 0, 0 },
{ HP_DITHER_VERTICAL, SANE_I18N("Vertical"), 0, 0, 0 },
{ HP_DITHER_HORIZONTAL, SANE_I18N("Horizontal"), 0, 1, 0 },
{ HP_DITHER_CUSTOM, SANE_I18N("Custom"), 0, 0, 0 },
{ 0, 0, 0, 0, 0 }
};
static const struct hp_option_descriptor_s HALFTONE_PATTERN[1] = {{
@ -3031,17 +3031,17 @@ static const struct hp_option_descriptor_s HORIZONTAL_DITHER_8x8[1] = {{
}};
static const struct hp_choice_s _matrix_choices[] = {
{ HP_MATRIX_AUTO, "Auto", 0, 1, 0 },
{ HP_MATRIX_RGB, "NTSC RGB", _cenable_incolor, 0, 0 },
{ HP_MATRIX_XPA_RGB, "XPA RGB", _cenable_incolor, 0, 0 },
{ HP_MATRIX_PASS, "Pass-through", _cenable_incolor, 0, 0 },
{ HP_MATRIX_BW, "NTSC Gray", _cenable_notcolor, 0, 0 },
{ HP_MATRIX_XPA_BW, "XPA Gray", _cenable_notcolor, 0, 0 },
{ HP_MATRIX_RED, "Red", _cenable_notcolor, 0, 0 },
{ HP_MATRIX_GREEN, "Green", _cenable_notcolor, 1, 0 },
{ HP_MATRIX_BLUE, "Blue", _cenable_notcolor, 0, 0 },
{ HP_MATRIX_AUTO, SANE_I18N("Auto"), 0, 1, 0 },
{ HP_MATRIX_RGB, SANE_I18N("NTSC RGB"), _cenable_incolor, 0, 0 },
{ HP_MATRIX_XPA_RGB, SANE_I18N("XPA RGB"), _cenable_incolor, 0, 0 },
{ HP_MATRIX_PASS, SANE_I18N("Pass-through"), _cenable_incolor, 0, 0 },
{ HP_MATRIX_BW, SANE_I18N("NTSC Gray"), _cenable_notcolor, 0, 0 },
{ HP_MATRIX_XPA_BW, SANE_I18N("XPA Gray"), _cenable_notcolor, 0, 0 },
{ HP_MATRIX_RED, SANE_I18N("Red"), _cenable_notcolor, 0, 0 },
{ HP_MATRIX_GREEN, SANE_I18N("Green"), _cenable_notcolor, 1, 0 },
{ HP_MATRIX_BLUE, SANE_I18N("Blue"), _cenable_notcolor, 0, 0 },
#ifdef ENABLE_CUSTOM_MATRIX
{ HP_MATRIX_CUSTOM, "Custom", 0, 0, 0 },
{ HP_MATRIX_CUSTOM, SANE_I18N("Custom"), 0, 0, 0 },
#endif
{ 0, 0, 0, 0, 0 }
};
@ -3087,11 +3087,11 @@ static const struct hp_option_descriptor_s BWMATRIX_GRAY10[1] = {{
#endif
static const struct hp_choice_s _scan_speed_choices[] = {
{ 0, "Auto", 0, 0, 0 },
{ 1, "Slow", 0, 0, 0 },
{ 2, "Normal", 0, 0, 0 },
{ 3, "Fast", 0, 0, 0 },
{ 4, "Extra Fast", 0, 0, 0 },
{ 0, SANE_I18N("Auto"), 0, 0, 0 },
{ 1, SANE_I18N("Slow"), 0, 0, 0 },
{ 2, SANE_I18N("Normal"), 0, 0, 0 },
{ 3, SANE_I18N("Fast"), 0, 0, 0 },
{ 4, SANE_I18N("Extra Fast"), 0, 0, 0 },
{ 0, 0, 0, 0, 0 }
};
static const struct hp_option_descriptor_s SCAN_SPEED[1] = {{
@ -3102,11 +3102,11 @@ static const struct hp_option_descriptor_s SCAN_SPEED[1] = {{
}};
static const struct hp_choice_s _smoothing_choices[] = {
{ 0, "Auto", 0, 0, 0 },
{ 3, "Off", 0, 0, 0 },
{ 1, "2-pixel", 0, 0, 0 },
{ 2, "4-pixel", 0, 0, 0 },
{ 4, "8-pixel", 0, 0, 0 },
{ 0, SANE_I18N("Auto"), 0, 0, 0 },
{ 3, SANE_I18N("Off"), 0, 0, 0 },
{ 1, SANE_I18N("2-pixel"), 0, 0, 0 },
{ 2, SANE_I18N("4-pixel"), 0, 0, 0 },
{ 4, SANE_I18N("8-pixel"), 0, 0, 0 },
{ 0, 0, 0, 0, 0 }
};
static const struct hp_option_descriptor_s SMOOTHING[1] = {{
@ -3117,9 +3117,9 @@ static const struct hp_option_descriptor_s SMOOTHING[1] = {{
}};
static const struct hp_choice_s _media_choices[] = {
{ HP_MEDIA_PRINT, "Print", 0, 0, 0 },
{ HP_MEDIA_SLIDE, "Slide", 0, 0, 0 },
{ HP_MEDIA_NEGATIVE, "Film-strip", 0, 0, 0 },
{ HP_MEDIA_PRINT, SANE_I18N("Print"), 0, 0, 0 },
{ HP_MEDIA_SLIDE, SANE_I18N("Slide"), 0, 0, 0 },
{ HP_MEDIA_NEGATIVE, SANE_I18N("Film-strip"), 0, 0, 0 },
{ 0, 0, 0, 0, 0 }
};
static const struct hp_option_descriptor_s MEDIA[1] = {{
@ -3170,7 +3170,7 @@ static const struct hp_option_descriptor_s OUT8[1] =
/* The 100% setting may cause problems within the scanner */
static const struct hp_choice_s _ps_exposure_times[] = {
/* {0, "100%", 0, 0, 0}, */
{ 0, "Default", 0, 0, 0 },
{ 0, SANE_I18N("Default"), 0, 0, 0 },
{1, "125%", 0, 0, 0},
{2, "150%", 0, 0, 0},
{3, "175%", 0, 0, 0},
@ -3179,7 +3179,7 @@ static const struct hp_choice_s _ps_exposure_times[] = {
{6, "250%", 0, 0, 0},
{7, "275%", 0, 0, 0},
{8, "300%", 0, 0, 0},
{9, "Negative", 0, 0, 0},
{9, SANE_I18N("Negative"), 0, 0, 0},
{0, 0, 0, 0, 0}
};
@ -3196,9 +3196,9 @@ static const struct hp_option_descriptor_s PS_EXPOSURE_TIME[1] = {{
/* global settings. The user should switch to ADF scanning after */
/* placing paper in the ADF. */
static const struct hp_choice_s _scan_types[] = {
{ HP_SCANTYPE_NORMAL, "Normal", 0, 0, 0 },
{ HP_SCANTYPE_ADF, "ADF", 0, 0, 0 },
{ HP_SCANTYPE_XPA, "XPA", 0, 0, 0 },
{ HP_SCANTYPE_NORMAL, SANE_I18N("Normal"), 0, 0, 0 },
{ HP_SCANTYPE_ADF, SANE_I18N("ADF"), 0, 0, 0 },
{ HP_SCANTYPE_XPA, SANE_I18N("XPA"), 0, 0, 0 },
{0, 0, 0, 0, 0 }
};
@ -3270,9 +3270,9 @@ static const struct hp_option_descriptor_s SCAN_BR_Y[1] = {{
}};
static const struct hp_choice_s _mirror_horiz_choices[] = {
{ HP_MIRROR_HORIZ_OFF, "Off", 0, 0, 0 },
{ HP_MIRROR_HORIZ_ON, "On", 0, 0, 0 },
{ HP_MIRROR_HORIZ_CONDITIONAL, "Conditional", 0, 0, 0 },
{ HP_MIRROR_HORIZ_OFF, SANE_I18N("Off"), 0, 0, 0 },
{ HP_MIRROR_HORIZ_ON, SANE_I18N("On"), 0, 0, 0 },
{ HP_MIRROR_HORIZ_CONDITIONAL, SANE_I18N("Conditional"), 0, 0, 0 },
{ 0, 0, 0, 0, 0 }
};
static const struct hp_option_descriptor_s MIRROR_HORIZ[1] = {{
@ -3283,9 +3283,9 @@ static const struct hp_option_descriptor_s MIRROR_HORIZ[1] = {{
}};
static const struct hp_choice_s _mirror_vert_choices[] = {
{ HP_MIRROR_VERT_OFF, "Off", 0, 0, 0 },
{ HP_MIRROR_VERT_ON, "On", 0, 0, 0 },
{ HP_MIRROR_VERT_CONDITIONAL, "Conditional", 0, 0, 0 },
{ HP_MIRROR_VERT_OFF, SANE_I18N("Off"), 0, 0, 0 },
{ HP_MIRROR_VERT_ON, SANE_I18N("On"), 0, 0, 0 },
{ HP_MIRROR_VERT_CONDITIONAL, SANE_I18N("Conditional"), 0, 0, 0 },
{ 0, 0, 0, 0, 0 }
};
static const struct hp_option_descriptor_s MIRROR_VERT[1] = {{

Wyświetl plik

@ -54,118 +54,120 @@
#ifndef SANE_NAME_SHARPENING
# define SANE_NAME_SHARPENING "sharpening"
# define SANE_TITLE_SHARPENING "Sharpening"
# define SANE_DESC_SHARPENING "Set sharpening value."
# define SANE_TITLE_SHARPENING SANE_I18N("Sharpening")
# define SANE_DESC_SHARPENING SANE_I18N("Set sharpening value.")
#endif
#ifndef SANE_NAME_AUTO_THRESHOLD
# define SANE_NAME_AUTO_THRESHOLD "auto-threshold"
# define SANE_TITLE_AUTO_THRESHOLD "Auto Threshold"
# define SANE_TITLE_AUTO_THRESHOLD SANE_I18N("Auto Threshold")
# define SANE_DESC_AUTO_THRESHOLD \
"Enable automatic determination of threshold for line-art scans."
SANE_I18N("Enable automatic determination of threshold for line-art scans.")
#endif
#ifndef SANE_NAME_SMOOTHING
# define SANE_NAME_SMOOTHING "smoothing"
# define SANE_TITLE_SMOOTHING "Smoothing"
# define SANE_DESC_SMOOTHING "Select smoothing filter."
# define SANE_TITLE_SMOOTHING SANE_I18N("Smoothing")
# define SANE_DESC_SMOOTHING SANE_I18N("Select smoothing filter.")
#endif
#ifndef SANE_NAME_UNLOAD_AFTER_SCAN
# define SANE_NAME_UNLOAD_AFTER_SCAN "unload-after-scan"
# define SANE_TITLE_UNLOAD_AFTER_SCAN "Unload media after scan"
# define SANE_DESC_UNLOAD_AFTER_SCAN "Unloads the media after a scan."
# define SANE_TITLE_UNLOAD_AFTER_SCAN SANE_I18N("Unload media after scan")
# define SANE_DESC_UNLOAD_AFTER_SCAN SANE_I18N("Unloads the media after a scan.")
#endif
#ifndef SANE_NAME_CHANGE_DOC
# define SANE_NAME_CHANGE_DOC "change-document"
# define SANE_TITLE_CHANGE_DOC "Change document"
# define SANE_DESC_CHANGE_DOC "Change Document."
# define SANE_TITLE_CHANGE_DOC SANE_I18N("Change document")
# define SANE_DESC_CHANGE_DOC SANE_I18N("Change Document.")
#endif
#ifndef SANE_NAME_UNLOAD
# define SANE_NAME_UNLOAD "unload"
# define SANE_TITLE_UNLOAD "Unload"
# define SANE_DESC_UNLOAD "Unload Document."
# define SANE_TITLE_UNLOAD SANE_I18N("Unload")
# define SANE_DESC_UNLOAD SANE_I18N("Unload Document.")
#endif
#ifndef SANE_NAME_CALIBRATE
# define SANE_NAME_CALIBRATE "calibrate"
# define SANE_TITLE_CALIBRATE "Calibrate"
# define SANE_DESC_CALIBRATE "Start calibration process."
# define SANE_TITLE_CALIBRATE SANE_I18N("Calibrate")
# define SANE_DESC_CALIBRATE SANE_I18N("Start calibration process.")
#endif
#ifndef SANE_NAME_MEDIA
# define SANE_NAME_MEDIA "media-type"
# define SANE_TITLE_MEDIA "Media"
# define SANE_DESC_MEDIA "Set type of media."
# define SANE_TITLE_MEDIA SANE_I18N("Media")
# define SANE_DESC_MEDIA SANE_I18N("Set type of media.")
#endif
#ifndef SANE_NAME_PS_EXPOSURE_TIME
# define SANE_NAME_PS_EXPOSURE_TIME "ps-exposure-time"
# define SANE_TITLE_PS_EXPOSURE_TIME "Exposure time"
# define SANE_DESC_PS_EXPOSURE_TIME "A longer exposure time lets the scanner\
# define SANE_TITLE_PS_EXPOSURE_TIME SANE_I18N("Exposure time")
# define SANE_DESC_PS_EXPOSURE_TIME \
SANE_I18N("A longer exposure time lets the scanner\
collect more light. Suggested use is 175% for prints,\
150% for normal slides and \"Negatives\" for\
negative film. For dark (underexposed) images you can increase this value."
negative film. For dark (underexposed) images you can increase this value.")
#endif
#ifndef SANE_NAME_MATRIX_TYPE
# define SANE_NAME_MATRIX_TYPE "matrix-type"
# define SANE_TITLE_MATRIX_TYPE "Color Matrix"
# define SANE_TITLE_MATRIX_TYPE SANE_I18N("Color Matrix")
/* FIXME: better description */
# define SANE_DESC_MATRIX_TYPE "Set the scanners color matrix."
# define SANE_DESC_MATRIX_TYPE SANE_I18N("Set the scanners color matrix.")
#endif
#ifndef SANE_NAME_MATRIX_RGB
# define SANE_NAME_MATRIX_RGB "matrix-rgb"
# define SANE_TITLE_MATRIX_RGB "Color Matrix"
# define SANE_DESC_MATRIX_RGB "Custom color matrix."
# define SANE_TITLE_MATRIX_RGB SANE_I18N("Color Matrix")
# define SANE_DESC_MATRIX_RGB SANE_I18N("Custom color matrix.")
#endif
#ifndef SANE_NAME_MATRIX_GRAY
# define SANE_NAME_MATRIX_GRAY "matrix-gray"
# define SANE_TITLE_MATRIX_GRAY "Mono Color Matrix"
# define SANE_DESC_MATRIX_GRAY "Custom color matrix for grayscale scans."
# define SANE_TITLE_MATRIX_GRAY SANE_I18N("Mono Color Matrix")
# define SANE_DESC_MATRIX_GRAY SANE_I18N("Custom color matrix for grayscale scans.")
#endif
#ifndef SANE_NAME_MIRROR_HORIZ
# define SANE_NAME_MIRROR_HORIZ "mirror-horizontal"
# define SANE_TITLE_MIRROR_HORIZ "Mirror horizontal"
# define SANE_DESC_MIRROR_HORIZ "Mirror image horizontally."
# define SANE_TITLE_MIRROR_HORIZ SANE_I18N("Mirror horizontal")
# define SANE_DESC_MIRROR_HORIZ SANE_I18N("Mirror image horizontally.")
#endif
#ifndef SANE_NAME_MIRROR_VERT
# define SANE_NAME_MIRROR_VERT "mirror-vertical"
# define SANE_TITLE_MIRROR_VERT "Mirror vertical"
# define SANE_DESC_MIRROR_VERT "Mirror image vertically."
# define SANE_TITLE_MIRROR_VERT SANE_I18N("Mirror vertical")
# define SANE_DESC_MIRROR_VERT SANE_I18N("Mirror image vertically.")
#endif
#ifndef SANE_NAME_UPDATE
# define SANE_NAME_UPDATE "update-options"
# define SANE_TITLE_UPDATE "Update options"
# define SANE_DESC_UPDATE "Update options."
# define SANE_TITLE_UPDATE SANE_I18N("Update options")
# define SANE_DESC_UPDATE SANE_I18N("Update options.")
#endif
#ifndef SANE_NAME_OUTPUT_8BIT
# define SANE_NAME_OUTPUT_8BIT "output-8bit"
# define SANE_TITLE_OUTPUT_8BIT "8 bit output"
# define SANE_DESC_OUTPUT_8BIT "Use bit depth greater eight internally,\
but output only eight bits"
# define SANE_TITLE_OUTPUT_8BIT SANE_I18N("8 bit output")
# define SANE_DESC_OUTPUT_8BIT \
SANE_I18N("Use bit depth greater eight internally,\
but output only eight bits.")
#endif
#ifndef SANE_NAME_BUTTON_WAIT
# define SANE_NAME_BUTTON_WAIT "button-wait"
# define SANE_TITLE_BUTTON_WAIT "Front button wait"
# define SANE_DESC_BUTTON_WAIT "Wait to scan for front-panel button push."
# define SANE_TITLE_BUTTON_WAIT SANE_I18N("Front button wait")
# define SANE_DESC_BUTTON_WAIT SANE_I18N("Wait to scan for front-panel button push.")
# define HP_BUTTON_WAIT_NO 0
# define HP_BUTTON_WAIT_YES 1
#endif
#ifndef SANE_NAME_LAMP_OFF
# define SANE_NAME_LAMP_OFF "lamp-off"
# define SANE_TITLE_LAMP_OFF "Shut off lamp"
# define SANE_DESC_LAMP_OFF "Shut off scanner lamp."
# define SANE_TITLE_LAMP_OFF SANE_I18N("Shut off lamp")
# define SANE_DESC_LAMP_OFF SANE_I18N("Shut off scanner lamp.")
# define HP_LAMP_OFF_NO 0
# define HP_LAMP_OFF_YES 1
#endif

Wyświetl plik

@ -43,9 +43,12 @@
HP Scanner Control Language (SCL).
*/
static char *hp_backend_version = "1.03";
static char *hp_backend_version = "1.04";
/* Changes:
V 1.04, 24-Jul-2003, PK (peter@kirchgessner.net)
- Add internationalization
V 1.03, 14-Apr-2003, PK (peter@kirchgessner.net)
- check valp in call of sane_control_option()