diff --git a/pop-fe-psp.py b/pop-fe-psp.py index 97f65eb..4674871 100755 --- a/pop-fe-psp.py +++ b/pop-fe-psp.py @@ -84,6 +84,7 @@ def __init__(self, master=None): self.pic1_tk = None self.pkgdir = None self.watermark = 'on' + self.nopstitleimg = 'off' self.cdda = 'off' self.pic0_disabled = 'off' self.pic1_disabled = 'off' @@ -107,6 +108,7 @@ def __init__(self, master=None): 'on_path_changed': self.on_path_changed, 'on_dir_changed': self.on_dir_changed, 'on_watermark': self.on_watermark, + 'on_nopstitleimg': self.on_nopstitleimg, 'on_youtube_audio': self.on_youtube_audio, 'on_create_eboot': self.on_create_eboot, 'on_reset': self.on_reset, @@ -168,6 +170,7 @@ def init_data(self): self.pic1_tk = None self.preview_tk = None self.configs = [] + self.builder.get_variable('nopstitleimg_variable').set(self.nopstitleimg) self.builder.get_variable('watermark_variable').set(self.watermark) self.builder.get_variable('cdda_variable').set(self.cdda) for idx in range(1,6): @@ -393,6 +396,9 @@ def has_transparency(img): c.create_image(0, 0, image=self.preview_tk, anchor='nw') + def on_nopstitleimg(self): + self.nopstitleimg = self.builder.get_variable('nopstitleimg_variable').get() + def on_watermark(self): self.watermark = self.builder.get_variable('watermark_variable').get() @@ -560,6 +566,7 @@ def on_create_eboot(self): self.pic1 if self.pic1_disabled =='off' else None, self.cue_files, self.cu2_files, self.img_files, [], aea_files, magic_word, subdir=self.subdir, snd0=snd0, + no_pstitleimg=True if self.nopstitleimg=='on' else False, watermark=True if self.watermark=='on' else False, subchannels=subchannels, manual=manual, configs=self.configs, diff --git a/pop-fe-psp.ui b/pop-fe-psp.ui index b4453cd..bd1bd7f 100644 --- a/pop-fe-psp.ui +++ b/pop-fe-psp.ui @@ -9,84 +9,111 @@ nsew - - 200 - 200 + 0 + 1 10 5 - 0 + 3 nsew - - disabled - string:disc1_variable - d1 - file - + + Output Directory 0 - 1 + 0 + ew - - disabled - string:disc2_variable - d2 - file - + + string:pkgdir_variable + directory + - 0 - 2 + 1 + 0 + w + + + + + 200 + 200 + + 0 + 3 + 10 + 5 + 5 + ew + - - disabled - string:disc3_variable - d3 - file - - - 0 - 3 + + on_create_eboot + Create EBOOT.PBP + + right - - disabled - string:disc4_variable - d4 - file - - - 0 - 4 + + on_reset + Clear + + left + + + + + horizontal + + 0 + 3 + 5 + 2 + ew + + + + + + + 1 + 10 + 3 + - - disabled - string:disc5_variable - d5 - file - + + on_watermark + off + on + Watermark in PIC1 + string:watermark_variable - 0 - 5 + 1 + 0 + w - - Discs: + + on_pic0_disabled + off + on + Disable PIC0 + string:pic0_disabled_variable 0 0 @@ -95,173 +122,221 @@ - - horizontal + + on_snd0_disabled + off + on + Disable SND0 + string:snd0_disabled_variable 0 - 2 - 5 - 6 - ew + 2 + w - - string:discid1_variable - 10 + + on_cdda + off + on + Use CDDA, not ATRAC3 + string:cdda_variable 1 1 + w - - string:discid2_variable - 10 + + on_force_ntsc + off + on + Force NTSC + string:force_ntsc_variable 1 2 + w - - string:discid3_variable - 10 - - 1 - 3 - - - - - - string:discid4_variable - 10 + + on_pic1_disabled + off + on + Disable PIC1 + string:pic1_disabled_variable - 1 - 4 + 0 + 1 + w - - string:discid5_variable - 10 + + on_nopstitleimg + off + on + Disable PSTITLEIMG + string:nopstitleimg_variable - 1 - 5 + 2 + 0 + w - + 200 200 1 - 10 - 5 0 - 2 - nsew - + 200 + 20 200 - 0 + 1 0 + n - - white - 1 - 80 - 80 - + + Preview: 0 - 1 + 0 - - ICON0 + + white + 1 + 216 + 384 0 - 0 + 1 + n - + 200 200 0 - 1 + 0 - - white - 1 - 80 - 128 - - - 0 - 1 - - - - - - PIC0 + + 200 + 200 0 0 + + + white + 1 + 80 + 80 + + + 0 + 1 + + + + + + ICON0 + + 0 + 0 + + + - - - - - 200 - 200 - - 0 - 2 - - - white - 1 - 80 - 128 - + + 200 + 200 0 1 + + + white + 1 + 80 + 128 + + + 0 + 1 + + + + + + PIC0 + + 0 + 0 + + + - - PIC1 + + 200 + 200 0 - 0 + 2 + + + white + 1 + 80 + 128 + + + 0 + 1 + + + + + + PIC1 + + 0 + 0 + + + @@ -269,391 +344,330 @@ - - horizontal - - 0 - 3 - 4 - ew - - - - - + 200 200 0 - 1 - 10 - 5 - 1 - nsew + 0 - + 200 200 - - 0 - 2 - 5 - nsew - + - - Theme: + + disabled + string:disc1_variable + d1 + file + 0 - 0 + 1 - - + + disabled + string:disc2_variable + d2 + file + - 1 - 0 + 0 + 2 - - - - - 200 - 200 - - 0 - 1 - ew - - - Title: + + disabled + string:disc3_variable + d3 + file + 0 - 0 + 3 - - string:title_variable + + disabled + string:disc4_variable + d4 + file + - 1 - 0 + 0 + 4 - - - - - 200 - 200 - - 0 - 4 - ew - - - SND0: + + disabled + string:disc5_variable + d5 + file + 0 - 0 + 5 - - string:snd0_variable - file + + Discs: - 1 + 0 0 + w - - on_youtube_audio - Try to find Audio on YouTube + + horizontal - 1 + 0 2 - 3 + 5 + 6 ew - - - - - 200 - 200 - - 0 - 2 - - - Manual: + + string:discid1_variable + 10 - 0 - 0 + 1 + 1 - - string:manual_variable - file + + string:discid2_variable + 10 1 - 0 + 2 - - - - - 200 - 200 - - 0 - 3 - ew - - - Logo: + + string:discid3_variable + 10 - 0 - 0 + 1 + 3 - - - - - - - - 0 - 1 - 10 - 5 - 3 - nsew - - - - Output Directory - - 0 - 0 - ew - - - - - - string:pkgdir_variable - directory - - - 1 - 0 - w - - - - - - - - 200 - 200 - - 0 - 3 - 10 - 5 - 5 - ew - - - - on_create_eboot - Create EBOOT.PBP - - right - - - - - - on_reset - Clear - - left - - - - - - - - horizontal - - 0 - 3 - 2 - ew - - - - - - 200 - 200 - - 2 - 10 - 10 - 0 - 2 - nsew - - - - Preview: - - 0 - 0 - - - - - - white - 1 - 216 - 384 - - 0 - 1 - - - - - - - - - 1 - 10 - 3 - - - - on_watermark - off - on - Watermark in PIC1 - string:watermark_variable - - 1 - 0 - w - - - - - - on_pic0_disabled - off - on - Disable PIC0 - string:pic0_disabled_variable - - 0 - 0 - w - - - - - - on_snd0_disabled - off - on - Disable SND0 - string:snd0_disabled_variable - - 0 - 2 - w - - - - - - on_cdda - off - on - Use CDDA, not ATRAC3 - string:cdda_variable - - 1 - 1 - w - - - on_force_ntsc - off - on - Force NTSC - string:force_ntsc_variable - - 1 - 2 - w - + + horizontal + - - on_pic1_disabled - off - on - Disable PIC1 - string:pic1_disabled_variable - - 0 - 1 - w - + + 200 + 200 + + + + 200 + 200 + + 0 + 2 + 5 + w + + + + Theme: + + 0 + 0 + w + + + + + + + + 1 + 0 + + + + + + + + 200 + 200 + + 0 + 1 + ew + + + + Title: + + 0 + 0 + w + + + + + + string:title_variable + + 1 + 0 + + + + + + + + 200 + 200 + + 0 + 4 + ew + + + + SND0: + + 0 + 0 + + + + + + string:snd0_variable + file + + 1 + 0 + + + + + + on_youtube_audio + Try to find Audio on YouTube + + 1 + 2 + 3 + ew + + + + + + + + 200 + 200 + + 0 + 2 + + + + Manual: + + 0 + 0 + + + + + + string:manual_variable + file + + 1 + 0 + + + + + + + + 200 + 200 + + 0 + 3 + ew + + + + Logo: + + 0 + 0 + + + + + + + + diff --git a/pop-fe.py b/pop-fe.py index 2acd810..ce4eb10 100755 --- a/pop-fe.py +++ b/pop-fe.py @@ -2774,7 +2774,7 @@ def generate_pbp(dest_file, disc_ids, game_title, icon0, pic0, pic1, cue_files, True -def create_psp(dest, disc_ids, game_title, icon0, pic0, pic1, cue_files, cu2_files, img_files, mem_cards, aea_files, magic_word, subdir = './', snd0=None, watermark=False, subchannels=[], manual=None, configs=None, use_cdda=False, logo=None): +def create_psp(dest, disc_ids, game_title, icon0, pic0, pic1, cue_files, cu2_files, img_files, mem_cards, aea_files, magic_word, subdir = './', snd0=None, no_pstitleimg=False, watermark=False, subchannels=[], manual=None, configs=None, use_cdda=False, logo=None): # Convert LOGO to a file object if logo: image = logo @@ -2868,8 +2868,9 @@ def create_psp(dest, disc_ids, game_title, icon0, pic0, pic1, cue_files, cu2_fil whole_disk = True for i in range(len(magic_word)): magic_word[i] = magic_word[i] & 0x72D0EE59 + if len(disc_ids) > 1: + no_pstitleimg = False - no_pstitleimg = True if len(disc_ids) == 1 else False generate_pbp(dest_file, disc_ids, game_title, icon0, pic0, pic1, cue_files, cu2_files, img_files, aea_files, magic_word, snd0=snd0_data, whole_disk=whole_disk, subchannels=subchannels, configs=configs, logo=logo, no_pstitleimg=no_pstitleimg) if manual: @@ -4129,9 +4130,6 @@ def process_disk_file(cue_file, idx, temp_files, subdir='./'): write_cue(cue, tmpcue) cue_file = tmpcue - # we didn't actually have a CUE file to start with so just - # replace the "real" cue filename with our temporary one - real_cue_files[-1] = cue_file if cue_file[-3:] != 'cue': print('%s is not a CUE file. Skipping' % cue_file) if verbose else None