diff --git a/resources/images/help.svg b/resources/images/help.svg index be41385b7d..8d02701898 100644 --- a/resources/images/help.svg +++ b/resources/images/help.svg @@ -1,234 +1,176 @@ - + + image/svg+xml + id="feGaussianBlur5127" + stdDeviation="1.91024" /> + id="feGaussianBlur3096" + stdDeviation="4" /> + id="feGaussianBlur3099" + stdDeviation="2" /> + id="XMLID_12_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,-0.1823,0,134.8566)"> + id="stop3102" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + id="stop3104" + style="stop-color:#000000;stop-opacity:0" + offset="1" /> + r="58" + transform="matrix(1.0859375,0,0,1.0859375,-3.9093733,-8.2531233)" + id="circle5091" + style="opacity:0.7;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter5097)" /> + id="stop3113" + style="stop-color:#eeeeee;stop-opacity:1" + offset="0.61540002" /> + id="stop3115" + style="stop-color:#dddddd;stop-opacity:1" + offset="0.82249999" /> + id="stop3117" + style="stop-color:#ffffff;stop-opacity:1" + offset="1" /> + style="fill:url(#XMLID_13_)" /> + id="stop3122" + style="stop-color:#2a94ec;stop-opacity:1" + offset="0" /> + id="stop3124" + style="stop-color:#0057ae;stop-opacity:1" + offset="1" /> + style="opacity:0.3;filter:url(#filter3547)"> + id="stop3132" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + id="stop3134" + style="stop-color:#ffffff;stop-opacity:0" + offset="1" /> + transform="matrix(1.0859375,0,0,1.0859375,-3.9093733,-8.2531233)" + id="g3137"> + d="m 27.6,69.6 c 0,23.159 18.841,42 42,42 23.159,0 42,-18.841 42,-42 0,-23.159 -18.841,-42 -42,-42 -23.159,0 -42,18.841 -42,42 z" + id="XMLID_10_" /> + height="139" + xlink:href="#XMLID_10_" /> @@ -240,30 +182,22 @@ transform="matrix(1.0859375,0,0,1.1113796,-3.201342,-9.3177223)" id="g5119" style="fill:#00316e;filter:url(#filter5125)"> \ No newline at end of file diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py index 3156542a92..618fc27545 100644 --- a/src/calibre/devices/apple/driver.py +++ b/src/calibre/devices/apple/driver.py @@ -2586,14 +2586,20 @@ class ITUNES(DriverBase): if metadata.series and self.settings().read_metadata: if DEBUG: self.log.info(" using Series name as Genre") + + # Format the index as a sort key + index = metadata.series_index + integer = int(index) + fraction = index-integer + series_index = '%04d%s' % (integer, str('%0.4f' % fraction).lstrip('0')) if lb_added: - lb_added.sort_name.set("%s %04f" % (metadata.series, metadata.series_index)) + lb_added.sort_name.set("%s %s" % (metadata.series, series_index)) lb_added.genre.set(metadata.series) lb_added.episode_ID.set(metadata.series) lb_added.episode_number.set(metadata.series_index) if db_added: - db_added.sort_name.set("%s %04f" % (metadata.series, metadata.series_index)) + db_added.sort_name.set("%s %s" % (metadata.series, series_index)) db_added.genre.set(metadata.series) db_added.episode_ID.set(metadata.series) db_added.episode_number.set(metadata.series_index) @@ -2658,8 +2664,13 @@ class ITUNES(DriverBase): if metadata.series and self.settings().read_metadata: if DEBUG: self.log.info(" using Series name as Genre") + # Format the index as a sort key + index = metadata.series_index + integer = int(index) + fraction = index-integer + series_index = '%04d%%s' % (integer, str('%0.4f' % fraction).lstrip('0')) if lb_added: - lb_added.SortName = "%s %04f" % (metadata.series, metadata.series_index) + lb_added.SortName = "%s %s" % (metadata.series, series_index) lb_added.Genre = metadata.series lb_added.EpisodeID = metadata.series try: @@ -2667,7 +2678,7 @@ class ITUNES(DriverBase): except: pass if db_added: - db_added.SortName = "%s %04f" % (metadata.series, metadata.series_index) + db_added.SortName = "%s %s" % (metadata.series, series_index) db_added.Genre = metadata.series db_added.EpisodeID = metadata.series try: