diff --git a/src/calibre/customize/profiles.py b/src/calibre/customize/profiles.py index eec3cd5ba1..6276f4eb3d 100644 --- a/src/calibre/customize/profiles.py +++ b/src/calibre/customize/profiles.py @@ -61,17 +61,22 @@ class SonyReaderInput(InputProfile): fbase = 12 fsizes = [7.5, 9, 10, 12, 15.5, 20, 22, 24] -class SonyReader900Input(InputProfile): +class SonyReader300Input(SonyReaderInput): + + name = 'Sony Reader 300' + short_name = 'sony300' + description = _('This profile is intended for the SONY PRS 300.') + + dpi = 200 + +class SonyReader900Input(SonyReaderInput): author = 'John Schember' name = 'Sony Reader 900' - short_name = 'sony' + short_name = 'sony900' description = _('This profile is intended for the SONY PRS-900.') - screen_size = (600, 1024) - dpi = 167 - fbase = 12 - fsizes = [7.5, 9, 10, 12, 15.5, 20, 22, 24] + screen_size = (584, 978) class MSReaderInput(InputProfile): @@ -99,9 +104,9 @@ class MobipocketInput(InputProfile): class HanlinV3Input(InputProfile): - name = 'Hanlin V3/V5' + name = 'Hanlin V3' short_name = 'hanlinv3' - description = _('This profile is intended for the Hanlin V3/V5 and its clones.') + description = _('This profile is intended for the Hanlin V3 and its clones.') # Screen size is a best guess screen_size = (584, 754) @@ -109,6 +114,16 @@ class HanlinV3Input(InputProfile): fbase = 16 fsizes = [12, 12, 14, 16, 18, 20, 22, 24] +class HanlinV5Input(HanlinV3Input): + + name = 'Hanlin V5' + short_name = 'hanlinv5' + description = _('This profile is intended for the Hanlin V5 and its clones.') + + # Screen size is a best guess + screen_size = (584, 754) + dpi = 200 + class CybookG3Input(InputProfile): name = 'Cybook G3' @@ -184,9 +199,10 @@ class NookInput(InputProfile): fbase = 16 fsizes = [12, 12, 14, 16, 18, 20, 22, 24] -input_profiles = [InputProfile, SonyReaderInput, SonyReader900Input, - MSReaderInput, MobipocketInput, HanlinV3Input, CybookG3Input, - CybookOpusInput, KindleInput, IlliadInput, IRexDR1000Input, NookInput] +input_profiles = [InputProfile, SonyReaderInput, SonyReader300Input, + SonyReader900Input, MSReaderInput, MobipocketInput, HanlinV3Input, + HanlinV5Input, CybookG3Input, CybookOpusInput, KindleInput, IlliadInput, + IRexDR1000Input, NookInput] class OutputProfile(Plugin): @@ -224,17 +240,23 @@ class SonyReaderOutput(OutputProfile): fbase = 12 fsizes = [7.5, 9, 10, 12, 15.5, 20, 22, 24] -class SonyReader900Output(OutputProfile): +class SonyReader300Output(SonyReaderOutput): + + author = 'John Schember' + name = 'Sony Reader 300' + short_name = 'sony300' + description = _('This profile is intended for the SONY PRS-900.') + + dpi = 200 + +class SonyReader900Output(SonyReaderOutput): author = 'John Schember' name = 'Sony Reader 900' - short_name = 'sony' + short_name = 'sony900' description = _('This profile is intended for the SONY PRS-900.') - screen_size = (600, 1024) - dpi = 167 - fbase = 12 - fsizes = [7.5, 9, 10, 12, 15.5, 20, 22, 24] + screen_size = (600, 999) class JetBook5Output(OutputProfile): @@ -245,8 +267,6 @@ class JetBook5Output(OutputProfile): screen_size = (480, 640) dpi = 168.451 - - class SonyReaderLandscapeOutput(SonyReaderOutput): name = 'Sony Reader Landscape' @@ -285,9 +305,9 @@ class MobipocketOutput(OutputProfile): class HanlinV3Output(OutputProfile): - name = 'Hanlin V3/V5' + name = 'Hanlin V3' short_name = 'hanlinv3' - description = _('This profile is intended for the Hanlin V3/V5 and its clones.') + description = _('This profile is intended for the Hanlin V3 and its clones.') # Screen size is a best guess screen_size = (584, 754) @@ -295,6 +315,14 @@ class HanlinV3Output(OutputProfile): fbase = 16 fsizes = [12, 12, 14, 16, 18, 20, 22, 24] +class HanlinV5Output(HanlinV3Output): + + name = 'Hanlin V5' + short_name = 'hanlinv5' + description = _('This profile is intended for the Hanlin V5 and its clones.') + + dpi = 200 + class CybookG3Output(OutputProfile): name = 'Cybook G3' @@ -391,8 +419,8 @@ class NookOutput(OutputProfile): fbase = 16 fsizes = [12, 12, 14, 16, 18, 20, 22, 24] -output_profiles = [OutputProfile, SonyReaderOutput, SonyReader900Output, - MSReaderOutput, MobipocketOutput, HanlinV3Output, CybookG3Output, - CybookOpusOutput, KindleOutput, SonyReaderLandscapeOutput, - KindleDXOutput, IlliadOutput, IRexDR1000Output, JetBook5Output, - NookOutput] +output_profiles = [OutputProfile, SonyReaderOutput, SonyReader300Output, + SonyReader900Output, MSReaderOutput, MobipocketOutput, HanlinV3Output, + HanlinV5Output, CybookG3Output, CybookOpusOutput, KindleOutput, + SonyReaderLandscapeOutput, KindleDXOutput, IlliadOutput, + IRexDR1000Output, JetBook5Output, NookOutput]