diff -Nru fs-uae-launcher-2.9.12~dev/debian/changelog fs-uae-launcher-3.0.0/debian/changelog --- fs-uae-launcher-2.9.12~dev/debian/changelog 2012-04-23 21:49:01.000000000 +0000 +++ fs-uae-launcher-3.0.0/debian/changelog 2012-04-23 21:49:01.000000000 +0000 @@ -1,4 +1,4 @@ -fs-uae-launcher (2.9.12~dev-0xenial) xenial; urgency=low +fs-uae-launcher (3.0.0-0xenial) xenial; urgency=low * Dummy changelog entry diff -Nru fs-uae-launcher-2.9.12~dev/dist/macos/Info.plist fs-uae-launcher-3.0.0/dist/macos/Info.plist --- fs-uae-launcher-2.9.12~dev/dist/macos/Info.plist 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/dist/macos/Info.plist 2019-06-21 16:49:52.000000000 +0000 @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.9.12 + 3.0.0 CFBundleSignature ???? CFBundleVersion - 2.9.12 + 3.0.0 LSHasLocalizedDisplayName LSMinimumSystemVersion diff -Nru fs-uae-launcher-2.9.12~dev/fsgs/drivers/mednafendriver.py fs-uae-launcher-3.0.0/fsgs/drivers/mednafendriver.py --- fs-uae-launcher-2.9.12~dev/fsgs/drivers/mednafendriver.py 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/fsgs/drivers/mednafendriver.py 2019-06-21 16:49:53.000000000 +0000 @@ -367,7 +367,6 @@ self.emulator.args.extend( ["-{}.shader.goat.slen".format(pfx), "1"] ) - # self.emulator.args.extend(["-{}.tblur".format(pfx), "1"]) special = "none" video_scale = 2 min_video_scale = 2 @@ -406,6 +405,14 @@ window_w, window_h ) + deinterlacer = self.options[Option.MEDNAFEN_DEINTERLACER] + if deinterlacer: + self.emulator.args.extend(["-video.deinterlacer", deinterlacer]) + + temporal_blur = self.options[Option.MEDNAFEN_TEMPORAL_BLUR] == "1" + if temporal_blur: + self.emulator.args.extend(["-{}.tblur".format(pfx), "1"]) + self.emulator.args.extend(["-{}.special".format(pfx), special]) self.emulator.args.extend(self.mednafen_extra_graphics_options()) diff -Nru fs-uae-launcher-2.9.12~dev/fsgs/FSGameSystemContext.py fs-uae-launcher-3.0.0/fsgs/FSGameSystemContext.py --- fs-uae-launcher-2.9.12~dev/fsgs/FSGameSystemContext.py 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/fsgs/FSGameSystemContext.py 2019-06-21 16:49:53.000000000 +0000 @@ -433,7 +433,14 @@ except LookupError: return False - values = self.game.set_from_variant_uuid(database_name, variant_uuid) + try: + values = self.game.set_from_variant_uuid( + database_name, variant_uuid + ) + except KeyError: + # It is possible that the variant is found without game entry, + # which raises a KeyError. + return False if not values: return False diff -Nru fs-uae-launcher-2.9.12~dev/fsgs/ogd/GameDatabaseSynchronizer.py fs-uae-launcher-3.0.0/fsgs/ogd/GameDatabaseSynchronizer.py --- fs-uae-launcher-2.9.12~dev/fsgs/ogd/GameDatabaseSynchronizer.py 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/fsgs/ogd/GameDatabaseSynchronizer.py 2019-06-21 16:49:53.000000000 +0000 @@ -71,11 +71,12 @@ self.database.commit() print("done") - if os.environ.get("FSGS_WRITE_DAT_FILE", "") == "1": + if os.environ.get("FSGS_WRITE_DAT_FILES", "") == "1": self.write_dat_file() def write_dat_file(self): games = {} + descriptions = {} for uuid in self.database.get_all_uuids(): values = self.database.get_game_values_for_uuid( @@ -89,9 +90,18 @@ # print(file_list) if entry["name"].endswith("/"): continue - game = entry["sha1"][:3].upper() - games.setdefault(game, {})[entry["sha1"]] = { - "name": entry["sha1"], + # game = entry["sha1"][:3].upper() + # game = uuid[:8] + "/" + values["game_name"] + # games.setdefault(game, {})[entry["sha1"]] = { + # "name": entry["sha1"], + # "sha1": entry["sha1"], + # "size": entry["size"], + # } + game = uuid + description = values.get("x_name", "") + descriptions[game] = description + games.setdefault(game, {})[entry["name"]] = { + "name": entry["name"], "sha1": entry["sha1"], "size": entry["size"], } @@ -135,7 +145,7 @@ description_node = ElementTree.Element("description") game_node.append(description_node) - description_node.text = game_name + description_node.text = descriptions[game_name] description_node.tail = "\n\t\t" for i, rom_name in enumerate(sorted(game.keys())): diff -Nru fs-uae-launcher-2.9.12~dev/fsgs/option.py fs-uae-launcher-3.0.0/fsgs/option.py --- fs-uae-launcher-2.9.12~dev/fsgs/option.py 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/fsgs/option.py 2019-06-21 16:49:53.000000000 +0000 @@ -282,6 +282,8 @@ MAME_ARTWORK = "mame_artwork" MEDNAFEN_AUDIO_BUFFER = "mednafen_audio_buffer" MEDNAFEN_AUDIO_DRIVER = "mednafen_audio_driver" + MEDNAFEN_DEINTERLACER = "mednafen_deinterlacer" + MEDNAFEN_TEMPORAL_BLUR = "mednafen_temporal_blur" MIDDLE_CLICK_UNGRAB = "middle_click_ungrab" MIN_FIRST_LINE_NTSC = "min_first_line_ntsc" MIN_FIRST_LINE_PAL = "min_first_line_pal" diff -Nru fs-uae-launcher-2.9.12~dev/fsgs/res/input/030000004c0500006802000011810000.fs-uae-controller fs-uae-launcher-3.0.0/fsgs/res/input/030000004c0500006802000011810000.fs-uae-controller --- fs-uae-launcher-2.9.12~dev/fsgs/res/input/030000004c0500006802000011810000.fs-uae-controller 1970-01-01 00:00:00.000000000 +0000 +++ fs-uae-launcher-3.0.0/fsgs/res/input/030000004c0500006802000011810000.fs-uae-controller 2019-06-21 16:49:53.000000000 +0000 @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = Sony PLAYSTATION(R)3 Controller +platform = linux + +[device] +make = Sony +model = DualShock 3 +type = gamepad + +[sdl] +guid = 030000004c0500006802000011810000 +buttons = 17 +hats = 0 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = left_trigger +axis_3_neg = rstick_left +axis_3_pos = rstick_right +axis_4_neg = rstick_up +axis_4_pos = rstick_down +axis_5_pos = right_trigger +button_0 = south_button +button_1 = east_button +button_10 = menu_button +button_11 = lstick_button +button_12 = rstick_button +button_13 = dpad_up +button_14 = dpad_down +button_15 = dpad_left +button_16 = dpad_right +button_2 = north_button +button_3 = west_button +button_4 = left_shoulder +button_5 = right_shoulder +button_8 = select_button +button_9 = start_button diff -Nru fs-uae-launcher-2.9.12~dev/fsgs/res/input/030000004c050000cc09000011810000.fs-uae-controller fs-uae-launcher-3.0.0/fsgs/res/input/030000004c050000cc09000011810000.fs-uae-controller --- fs-uae-launcher-2.9.12~dev/fsgs/res/input/030000004c050000cc09000011810000.fs-uae-controller 1970-01-01 00:00:00.000000000 +0000 +++ fs-uae-launcher-3.0.0/fsgs/res/input/030000004c050000cc09000011810000.fs-uae-controller 2019-06-21 16:49:53.000000000 +0000 @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = Sony Interactive Entertainment Wireless Controller +platform = linux + +[device] +make = Sony +model = DualShock 4 v2 +type = gamepad + +[sdl] +guid = 030000004c050000cc09000011810000 +buttons = 13 +hats = 1 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_3_neg = rstick_left +axis_3_pos = rstick_right +axis_4_neg = rstick_up +axis_4_pos = rstick_down +button_0 = south_button +button_1 = east_button +button_10 = menu_button +button_11 = lstick_button +button_12 = rstick_button +button_2 = north_button +button_3 = west_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = left_trigger +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff -Nru fs-uae-launcher-2.9.12~dev/fsgs/res/input/030000005e040000a102000000010000.fs-uae-controller fs-uae-launcher-3.0.0/fsgs/res/input/030000005e040000a102000000010000.fs-uae-controller --- fs-uae-launcher-2.9.12~dev/fsgs/res/input/030000005e040000a102000000010000.fs-uae-controller 1970-01-01 00:00:00.000000000 +0000 +++ fs-uae-launcher-3.0.0/fsgs/res/input/030000005e040000a102000000010000.fs-uae-controller 2019-06-21 16:49:53.000000000 +0000 @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = Xbox 360 Wireless Receiver +platform = linux + +[device] +make = Microsoft +model = Xbox 360 Controller +type = gamepad + +[sdl] +guid = 030000005e040000a102000000010000 +buttons = 15 +hats = 1 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_pos = left_trigger +axis_3_neg = rstick_left +axis_3_pos = rstick_right +axis_4_neg = rstick_up +axis_4_pos = rstick_down +axis_5_pos = right_trigger +button_0 = south_button +button_1 = east_button +button_10 = rstick_button +button_11 = dpad_left +button_12 = dpad_right +button_13 = dpad_up +button_14 = dpad_down +button_2 = west_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = select_button +button_7 = start_button +button_8 = menu_button +button_9 = lstick_button diff -Nru fs-uae-launcher-2.9.12~dev/fsgs/res/input/030000005e040000d102000001010000.fs-uae-controller fs-uae-launcher-3.0.0/fsgs/res/input/030000005e040000d102000001010000.fs-uae-controller --- fs-uae-launcher-2.9.12~dev/fsgs/res/input/030000005e040000d102000001010000.fs-uae-controller 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/fsgs/res/input/030000005e040000d102000001010000.fs-uae-controller 2019-06-21 16:49:53.000000000 +0000 @@ -4,7 +4,7 @@ [device] make = Microsoft -model = Xbox One Pad +model = Xbox One Controller type = gamepad [sdl] diff -Nru fs-uae-launcher-2.9.12~dev/fsgs/res/input/050000004c0500006802000000800000.fs-uae-controller fs-uae-launcher-3.0.0/fsgs/res/input/050000004c0500006802000000800000.fs-uae-controller --- fs-uae-launcher-2.9.12~dev/fsgs/res/input/050000004c0500006802000000800000.fs-uae-controller 1970-01-01 00:00:00.000000000 +0000 +++ fs-uae-launcher-3.0.0/fsgs/res/input/050000004c0500006802000000800000.fs-uae-controller 2019-06-21 16:49:53.000000000 +0000 @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = Sony PLAYSTATION(R)3 Controller +platform = linux + +[device] +make = Sony +model = DualShock 3 +type = gamepad + +[sdl] +guid = 050000004c0500006802000000800000 +buttons = 17 +hats = 0 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = left_trigger +axis_3_neg = rstick_left +axis_3_pos = rstick_right +axis_4_neg = rstick_up +axis_4_pos = rstick_down +axis_5_pos = right_trigger +button_0 = south_button +button_1 = east_button +button_10 = menu_button +button_11 = lstick_button +button_12 = rstick_button +button_13 = dpad_up +button_14 = dpad_down +button_15 = dpad_left +button_16 = dpad_right +button_2 = north_button +button_3 = west_button +button_4 = left_shoulder +button_5 = right_shoulder +button_8 = select_button +button_9 = start_button diff -Nru fs-uae-launcher-2.9.12~dev/fsgs/res/input/050000004c050000cc09000000810000.fs-uae-controller fs-uae-launcher-3.0.0/fsgs/res/input/050000004c050000cc09000000810000.fs-uae-controller --- fs-uae-launcher-2.9.12~dev/fsgs/res/input/050000004c050000cc09000000810000.fs-uae-controller 1970-01-01 00:00:00.000000000 +0000 +++ fs-uae-launcher-3.0.0/fsgs/res/input/050000004c050000cc09000000810000.fs-uae-controller 2019-06-21 16:49:53.000000000 +0000 @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = Wireless Controller +platform = linux + +[device] +make = Sony +model = DualShock 4 v2 +type = gamepad + +[sdl] +guid = 050000004c050000cc09000000810000 +buttons = 13 +hats = 1 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_3_neg = rstick_left +axis_3_pos = rstick_right +axis_4_neg = rstick_up +axis_4_pos = rstick_down +button_0 = south_button +button_1 = east_button +button_10 = menu_button +button_11 = lstick_button +button_12 = rstick_button +button_2 = north_button +button_3 = west_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = left_trigger +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff -Nru fs-uae-launcher-2.9.12~dev/fsgs/res/input/manifest.txt fs-uae-launcher-3.0.0/fsgs/res/input/manifest.txt --- fs-uae-launcher-2.9.12~dev/fsgs/res/input/manifest.txt 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/fsgs/res/input/manifest.txt 2019-06-21 16:49:53.000000000 +0000 @@ -7,8 +7,10 @@ 030000004c0500006802000011010000.fs-uae-controller 030000004c0500006802000011010000/names.txt 030000004c0500006802000011010000/sony_playstation_r_3_controller_19_27_0_0_linux.conf +030000004c0500006802000011810000.fs-uae-controller 030000004c050000c405000011010000.fs-uae-controller 030000004c050000c405000011810000.fs-uae-controller +030000004c050000cc09000011810000.fs-uae-controller 030000004f04000015b3000010010000.fs-uae-controller 030000004f04000020b3000010010000.fs-uae-controller 030000004f04000020b3000010010000/names.txt @@ -22,6 +24,7 @@ 030000005e0400008e02000020010000.fs-uae-controller 030000005e0400008e02000020200000.fs-uae-controller 030000005e0400008e02000070050000.fs-uae-controller +030000005e040000a102000000010000.fs-uae-controller 030000005e040000d102000001010000.fs-uae-controller 030000006d04000019c2000011010000.fs-uae-controller 030000006d04000019c2000011010000/logitech_logitech_cordless_rumblepad_2_12_4_1_0_linux.conf @@ -53,7 +56,9 @@ 03000000c82d000021ab000010010000.fs-uae-controller 03000000f025000021c1000010010000.fs-uae-controller 03000000f0250000c383000010010000.fs-uae-controller +050000004c0500006802000000800000.fs-uae-controller 050000004c050000c405000000010000.fs-uae-controller +050000004c050000cc09000000810000.fs-uae-controller 050000005e040000e002000003090000.fs-uae-controller 05000000a00500003232000009010000.fs-uae-controller 05000000c82d00000161000000010000.fs-uae-controller @@ -206,6 +211,7 @@ playstation_r_3_controller_00_24_33_3d_1f_9c_17_29_0_0_linux.conf playstation_r_3_controller_19_4_0_0_macos.conf playstation_r_3_controller_19_4_0_0_macosx.conf +powera_pro_ex_11_6_1_0_linux.conf ps3_usb_corded_gamepad_13_4_1_0_macos.conf ps3_usb_cordless_gamepad_13_4_1_0_linux.conf ps3_usb_cordless_gamepad_13_4_1_0_macos.conf @@ -227,6 +233,8 @@ sony/playstation_r_3_inputdevice.ini sony_computer_entertainment_wireless_controller_13_6_1_0_linux.conf sony_computer_entertainment_wireless_controller_14_10_1_0_linux.conf +sony_interactive_entertainment_wireless_controller_13_6_1_0_linux.conf +sony_playstation_r_3_controller_17_6_0_0_linux.conf sony_playstation_r_3_controller_19_27_0_0_linux.conf speed_link_competition_pro_4_2_0_0_macos.conf speed_link_competition_pro_4_2_0_0_windows.conf @@ -248,6 +256,7 @@ usb_2_axis_8_button_gamepad_8_2_0_0_windows.conf usb_gamepad_10_2_0_0_linux.conf wireless_360_controller_15_6_0_0_macos.conf +wireless_controller_13_6_1_0_linux.conf wireless_controller_14_16_1_0_linux.conf wireless_controller_14_6_1_0_macos.conf wireless_controller_14_6_1_0_windows.conf diff -Nru fs-uae-launcher-2.9.12~dev/fsgs/res/input/microsoft_x_box_one_pad_11_6_1_0_linux.conf fs-uae-launcher-3.0.0/fsgs/res/input/microsoft_x_box_one_pad_11_6_1_0_linux.conf --- fs-uae-launcher-2.9.12~dev/fsgs/res/input/microsoft_x_box_one_pad_11_6_1_0_linux.conf 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/fsgs/res/input/microsoft_x_box_one_pad_11_6_1_0_linux.conf 2019-06-21 16:49:53.000000000 +0000 @@ -4,7 +4,7 @@ [device] make = Microsoft -model = Xbox One Pad +model = Xbox One Controller type = gamepad [sdl] diff -Nru fs-uae-launcher-2.9.12~dev/fsgs/res/input/powera_pro_ex_11_6_1_0_linux.conf fs-uae-launcher-3.0.0/fsgs/res/input/powera_pro_ex_11_6_1_0_linux.conf --- fs-uae-launcher-2.9.12~dev/fsgs/res/input/powera_pro_ex_11_6_1_0_linux.conf 1970-01-01 00:00:00.000000000 +0000 +++ fs-uae-launcher-3.0.0/fsgs/res/input/powera_pro_ex_11_6_1_0_linux.conf 2019-06-21 16:49:53.000000000 +0000 @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = PowerA Pro Ex +platform = linux + +[device] +make = PowerA +model = Mini Pro EX +type = gamepad + +[sdl] +guid = 03000000c62400001a53000000010000 +buttons = 11 +hats = 1 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_pos = left_trigger +axis_3_neg = rstick_left +axis_3_pos = rstick_right +axis_4_neg = rstick_up +axis_4_pos = rstick_down +axis_5_pos = right_trigger +button_0 = south_button +button_1 = east_button +button_10 = rstick_button +button_2 = west_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = select_button +button_7 = start_button +button_8 = menu_button +button_9 = lstick_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff -Nru fs-uae-launcher-2.9.12~dev/fsgs/res/input/sony_interactive_entertainment_wireless_controller_13_6_1_0_linux.conf fs-uae-launcher-3.0.0/fsgs/res/input/sony_interactive_entertainment_wireless_controller_13_6_1_0_linux.conf --- fs-uae-launcher-2.9.12~dev/fsgs/res/input/sony_interactive_entertainment_wireless_controller_13_6_1_0_linux.conf 1970-01-01 00:00:00.000000000 +0000 +++ fs-uae-launcher-3.0.0/fsgs/res/input/sony_interactive_entertainment_wireless_controller_13_6_1_0_linux.conf 2019-06-21 16:49:53.000000000 +0000 @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = Sony Interactive Entertainment Wireless Controller +platform = linux + +[device] +make = Sony +model = DualShock 4 v2 +type = gamepad + +[sdl] +guid = 030000004c050000cc09000011810000 +buttons = 13 +hats = 1 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_3_neg = rstick_left +axis_3_pos = rstick_right +axis_4_neg = rstick_up +axis_4_pos = rstick_down +button_0 = south_button +button_1 = east_button +button_10 = menu_button +button_11 = lstick_button +button_12 = rstick_button +button_2 = north_button +button_3 = west_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = left_trigger +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff -Nru fs-uae-launcher-2.9.12~dev/fsgs/res/input/sony_playstation_r_3_controller_17_6_0_0_linux.conf fs-uae-launcher-3.0.0/fsgs/res/input/sony_playstation_r_3_controller_17_6_0_0_linux.conf --- fs-uae-launcher-2.9.12~dev/fsgs/res/input/sony_playstation_r_3_controller_17_6_0_0_linux.conf 1970-01-01 00:00:00.000000000 +0000 +++ fs-uae-launcher-3.0.0/fsgs/res/input/sony_playstation_r_3_controller_17_6_0_0_linux.conf 2019-06-21 16:49:53.000000000 +0000 @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = Sony PLAYSTATION(R)3 Controller +platform = linux + +[device] +make = Sony +model = DualShock 3 +type = gamepad + +[sdl] +guid = 050000004c0500006802000000800000 +buttons = 17 +hats = 0 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = left_trigger +axis_3_neg = rstick_left +axis_3_pos = rstick_right +axis_4_neg = rstick_up +axis_4_pos = rstick_down +axis_5_pos = right_trigger +button_0 = south_button +button_1 = east_button +button_10 = menu_button +button_11 = lstick_button +button_12 = rstick_button +button_13 = dpad_up +button_14 = dpad_down +button_15 = dpad_left +button_16 = dpad_right +button_2 = north_button +button_3 = west_button +button_4 = left_shoulder +button_5 = right_shoulder +button_8 = select_button +button_9 = start_button diff -Nru fs-uae-launcher-2.9.12~dev/fsgs/res/input/wireless_controller_13_6_1_0_linux.conf fs-uae-launcher-3.0.0/fsgs/res/input/wireless_controller_13_6_1_0_linux.conf --- fs-uae-launcher-2.9.12~dev/fsgs/res/input/wireless_controller_13_6_1_0_linux.conf 1970-01-01 00:00:00.000000000 +0000 +++ fs-uae-launcher-3.0.0/fsgs/res/input/wireless_controller_13_6_1_0_linux.conf 2019-06-21 16:49:53.000000000 +0000 @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = Wireless Controller +platform = linux + +[device] +make = Sony +model = DualShock 4 v2 +type = gamepad + +[sdl] +guid = 050000004c050000cc09000000810000 +buttons = 13 +hats = 1 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_3_neg = rstick_left +axis_3_pos = rstick_right +axis_4_neg = rstick_up +axis_4_pos = rstick_down +button_0 = south_button +button_1 = east_button +button_10 = menu_button +button_11 = lstick_button +button_12 = rstick_button +button_2 = north_button +button_3 = west_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = left_trigger +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff -Nru fs-uae-launcher-2.9.12~dev/fsgs/res/input/xbox_360_wireless_receiver_15_6_1_0_linux.conf fs-uae-launcher-3.0.0/fsgs/res/input/xbox_360_wireless_receiver_15_6_1_0_linux.conf --- fs-uae-launcher-2.9.12~dev/fsgs/res/input/xbox_360_wireless_receiver_15_6_1_0_linux.conf 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/fsgs/res/input/xbox_360_wireless_receiver_15_6_1_0_linux.conf 2019-06-21 16:49:53.000000000 +0000 @@ -4,11 +4,11 @@ [device] make = Microsoft -model = Xbox 360 Pad +model = Xbox 360 Controller type = gamepad [sdl] -guid = 030000005e0400001907000000010000 +guid = 030000005e040000a102000000010000 buttons = 15 hats = 1 axes = 6 diff -Nru fs-uae-launcher-2.9.12~dev/fsgs/util/datfile.py fs-uae-launcher-3.0.0/fsgs/util/datfile.py --- fs-uae-launcher-2.9.12~dev/fsgs/util/datfile.py 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/fsgs/util/datfile.py 2019-06-21 16:49:53.000000000 +0000 @@ -36,32 +36,50 @@ else: self._load_dat(data) + def _add_game_rom(self, game, rom_node): + # print(rom_node.attrib) + rom = { + "name": rom_node.attrib["name"], + "size": int(rom_node.attrib["size"]), + } + if "crc" in rom_node.attrib: + rom["crc32"] = rom_node.attrib["crc"].lower() + if "md5" in rom_node.attrib: + rom["md5"] = rom_node.attrib["md5"].lower() + if "sha1" in rom_node.attrib: + rom["sha1"] = rom_node.attrib["sha1"].lower() + game["files"].append(rom) + def _add_game(self, node): game = {"name": node.attrib["name"], "files": []} for rom_node in node.findall("rom"): - rom = { - "name": rom_node.attrib["name"], - "size": int(rom_node.attrib["size"]), - } - if "crc" in rom_node.attrib: - rom["crc32"] = rom_node.attrib["crc"].lower() - if "md5" in rom_node.attrib: - rom["md5"] = rom_node.attrib["md5"].lower() - if "sha1" in rom_node.attrib: - rom["sha1"] = rom_node.attrib["sha1"].lower() - game["files"].append(rom) + self._add_game_rom(game, rom_node) self.games.append(game) def _load_mame(self, root): for machine_node in root.findall("machine"): self._add_game(machine_node) + def _load_softwarelists(self, root): + for softwarelist_node in root.findall("softwarelist"): + # FIXME: software list name + for software_node in softwarelist_node.findall("software"): + # FIXME: software list name + software name? + name = software_node.attrib["name"] + game = {"name": name, "files": []} + for rom_node in software_node.iter("rom"): + if rom_node.attrib.get("name", ""): + self._add_game_rom(game, rom_node) + self.games.append(game) + def _load_xml(self, data): self.reset() root = ElementTree.fromstring(data) if root.tag == "mame": return self._load_mame(root) + if root.tag == "softwarelists": + return self._load_softwarelists(root) header_node = root.find("header") description_node = header_node.find("description") if description_node is not None: diff -Nru fs-uae-launcher-2.9.12~dev/fs-uae-launcher.spec fs-uae-launcher-3.0.0/fs-uae-launcher.spec --- fs-uae-launcher-2.9.12~dev/fs-uae-launcher.spec 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/fs-uae-launcher.spec 2019-06-21 16:49:53.000000000 +0000 @@ -14,8 +14,8 @@ # along with this program. If not, see . %define name fs-uae-launcher -%define version 2.9.12dev -%define unmangled_version 2.9.12dev +%define version 3.0.0 +%define unmangled_version 3.0.0 %define release 1%{?dist} Summary: Graphical configuration frontend and launcher for FS-UAE diff -Nru fs-uae-launcher-2.9.12~dev/fsui/qt/qt.py fs-uae-launcher-3.0.0/fsui/qt/qt.py --- fs-uae-launcher-2.9.12~dev/fsui/qt/qt.py 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/fsui/qt/qt.py 2019-06-21 16:49:52.000000000 +0000 @@ -128,13 +128,20 @@ qapplication.setStyle(QStyleFactory.create("Fusion")) if fusion_variant == "adwaita": pa = QPalette() - pa.setColor(QPalette.Window, QColor(232, 232, 231)) - pa.setColor(QPalette.AlternateBase, QColor(232, 232, 231)) - pa.setColor(QPalette.Button, QColor(232, 232, 231)) + # background = QColor("#f6f5f4") + background = QColor("#eae7e5") + pa.setColor(QPalette.Window, background) + pa.setColor(QPalette.AlternateBase, background) + pa.setColor(QPalette.Button, background) # pa.setColor(QPalette.Base, QColor(255, 255, 255)) pa.setColor( QPalette.Disabled, QPalette.Base, QColor(241, 241, 241) ) + + # pa.setColor(QPalette.Window, QColor("#aeaeae")) + # pa.setColor(QPalette.AlternateBase, QColor("#aeaeae")) + # pa.setColor(QPalette.Button, QColor("#aeaeae")) + qapplication.setPalette(pa) elif fusion_variant == "fws" or fusion_variant == "windows10": pa = QPalette() diff -Nru fs-uae-launcher-2.9.12~dev/launcher/option.py fs-uae-launcher-3.0.0/launcher/option.py --- fs-uae-launcher-2.9.12~dev/launcher/option.py 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/launcher/option.py 2019-06-21 16:49:52.000000000 +0000 @@ -852,14 +852,14 @@ }, Option.MEDNAFEN_AUDIO_BUFFER: { "default": "40", - "description": ("Mednafen Audio Buffer"), + "description": ("Mednafen audio buffer"), "type": "Integer", "min": 0, "max": 1000, }, Option.MEDNAFEN_AUDIO_DRIVER: { "default": "auto", - "description": ("Mednafen Audio Driver"), + "description": ("Mednafen audio driver"), "type": "Choice", "values": [ ("auto", "Auto"), @@ -868,6 +868,23 @@ ("mednafen", "Mednafen Default"), ], }, + Option.MEDNAFEN_DEINTERLACER: { + "default": "weave", + "description": ("Mednafen deinterlacer"), + "type": "Choice", + "values": [ + ("weave", "weave"), + ("bob", "bob"), + ("bob_offset", "bob_offset"), + ("blend", "blend"), + ("blend_rg", "blend_rg"), + ], + }, + Option.MEDNAFEN_TEMPORAL_BLUR: { + "default": "0", + "description": ("Mednafen temporal blur"), + "type": "Boolean", + }, Option.MIDDLE_CLICK_UNGRAB: { "default": "1", "description": N_("Ungrab Input on Middle Mouse Button"), diff -Nru fs-uae-launcher-2.9.12~dev/launcher/settings/platformsettingsdialog.py fs-uae-launcher-3.0.0/launcher/settings/platformsettingsdialog.py --- fs-uae-launcher-2.9.12~dev/launcher/settings/platformsettingsdialog.py 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/launcher/settings/platformsettingsdialog.py 2019-06-21 16:49:52.000000000 +0000 @@ -66,6 +66,8 @@ # options.append(Option.PSX_DATABASE) options.append(Option.PSX_PRELOAD) options.extend(mednafen_options) + options.append(Option.MEDNAFEN_DEINTERLACER) + options.append(Option.MEDNAFEN_TEMPORAL_BLUR) elif platform == Platform.SMD: # options.append(Option.SMD_DATABASE) options.append(Option.SMD_EMULATOR) diff -Nru fs-uae-launcher-2.9.12~dev/launcher/ui/skin.py fs-uae-launcher-3.0.0/launcher/ui/skin.py --- fs-uae-launcher-2.9.12~dev/launcher/ui/skin.py 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/launcher/ui/skin.py 2019-06-21 16:49:52.000000000 +0000 @@ -128,6 +128,10 @@ return fsui.theme == "fusion" and fsui.theme_variant == "windows10" @classmethod + def adwaita(cls): + return fsui.theme == "fusion" and fsui.theme_variant == "adwaita" + + @classmethod def fws(cls): if cls._fws is None: if fsboot.get("fws") == "1": diff -Nru fs-uae-launcher-2.9.12~dev/launcher/ui/TabPanel.py fs-uae-launcher-3.0.0/launcher/ui/TabPanel.py --- fs-uae-launcher-2.9.12~dev/launcher/ui/TabPanel.py 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/launcher/ui/TabPanel.py 2019-06-21 16:49:52.000000000 +0000 @@ -168,6 +168,9 @@ else: color_1 = fsui.Color(0xA7, 0xA7, 0xA7) color_2 = fsui.Color(0xC0, 0xC0, 0xC0) + # elif Skin.adwaita(): + # color_1 = fsui.Color(0xea, 0xe7, 0xe5) + # color_2 = fsui.Color(0xea, 0xe7, 0xe5) elif color_1 is not None: if selected: color_2 = color_1 diff -Nru fs-uae-launcher-2.9.12~dev/launcher/version.py fs-uae-launcher-3.0.0/launcher/version.py --- fs-uae-launcher-2.9.12~dev/launcher/version.py 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/launcher/version.py 2019-06-21 16:49:52.000000000 +0000 @@ -1 +1 @@ -VERSION = "2.9.12dev" +VERSION = "3.0.0" diff -Nru fs-uae-launcher-2.9.12~dev/po/cs.po fs-uae-launcher-3.0.0/po/cs.po --- fs-uae-launcher-2.9.12~dev/po/cs.po 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/po/cs.po 2019-06-21 16:49:52.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2019-05-25 13:30+0200\n" -"PO-Revision-Date: 2019-05-25 11:31\n" +"POT-Creation-Date: 2019-05-27 23:21+0200\n" +"PO-Revision-Date: 2019-06-21 16:09\n" "Last-Translator: Frode Solheim (FrodeSolheim)\n" "Language-Team: Czech\n" "Language: cs_CZ\n" @@ -1472,3 +1472,30 @@ msgid "{} ROM files were imported" msgstr "{} ROM soubory byly importovány" +msgid "Finding files eligible for OpenRetro Locker" +msgstr "" + +msgid "Locker upload task completed successfully" +msgstr "" + +msgid "Log In to Your OpenRetro Account" +msgstr "" + +msgid "Log Out from Your OpenRetro Account" +msgstr "" + +msgid "OpenRetro Locker Uploader" +msgstr "" + +msgid "OpenRetro Locker is not enabled for your user. It may be available only to a few select beta users." +msgstr "" + +msgid "Upload recognized Amiga files to your OpenRetro locker" +msgstr "" + +msgid "Use GameMode to optimize performance" +msgstr "" + +msgid "Warn when CPU governor is not 'performance'" +msgstr "" + diff -Nru fs-uae-launcher-2.9.12~dev/po/da.po fs-uae-launcher-3.0.0/po/da.po --- fs-uae-launcher-2.9.12~dev/po/da.po 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/po/da.po 2019-06-21 16:49:52.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2019-05-25 13:30+0200\n" -"PO-Revision-Date: 2019-05-25 11:31\n" +"POT-Creation-Date: 2019-05-27 23:21+0200\n" +"PO-Revision-Date: 2019-06-21 16:09\n" "Last-Translator: Frode Solheim (FrodeSolheim)\n" "Language-Team: Danish\n" "Language: da_DK\n" @@ -1472,3 +1472,30 @@ msgid "{} ROM files were imported" msgstr "{} ROM filer blev importeret" +msgid "Finding files eligible for OpenRetro Locker" +msgstr "" + +msgid "Locker upload task completed successfully" +msgstr "" + +msgid "Log In to Your OpenRetro Account" +msgstr "" + +msgid "Log Out from Your OpenRetro Account" +msgstr "" + +msgid "OpenRetro Locker Uploader" +msgstr "" + +msgid "OpenRetro Locker is not enabled for your user. It may be available only to a few select beta users." +msgstr "" + +msgid "Upload recognized Amiga files to your OpenRetro locker" +msgstr "" + +msgid "Use GameMode to optimize performance" +msgstr "" + +msgid "Warn when CPU governor is not 'performance'" +msgstr "" + diff -Nru fs-uae-launcher-2.9.12~dev/po/de.po fs-uae-launcher-3.0.0/po/de.po --- fs-uae-launcher-2.9.12~dev/po/de.po 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/po/de.po 2019-06-21 16:49:52.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2019-05-25 13:30+0200\n" -"PO-Revision-Date: 2019-05-25 11:31\n" +"POT-Creation-Date: 2019-05-27 23:21+0200\n" +"PO-Revision-Date: 2019-06-21 16:09\n" "Last-Translator: Frode Solheim (FrodeSolheim)\n" "Language-Team: German\n" "Language: de_DE\n" @@ -1472,3 +1472,30 @@ msgid "{} ROM files were imported" msgstr "{} ROM-Dateien wurden importiert" +msgid "Finding files eligible for OpenRetro Locker" +msgstr "" + +msgid "Locker upload task completed successfully" +msgstr "" + +msgid "Log In to Your OpenRetro Account" +msgstr "" + +msgid "Log Out from Your OpenRetro Account" +msgstr "" + +msgid "OpenRetro Locker Uploader" +msgstr "" + +msgid "OpenRetro Locker is not enabled for your user. It may be available only to a few select beta users." +msgstr "" + +msgid "Upload recognized Amiga files to your OpenRetro locker" +msgstr "" + +msgid "Use GameMode to optimize performance" +msgstr "" + +msgid "Warn when CPU governor is not 'performance'" +msgstr "" + diff -Nru fs-uae-launcher-2.9.12~dev/po/el.po fs-uae-launcher-3.0.0/po/el.po --- fs-uae-launcher-2.9.12~dev/po/el.po 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/po/el.po 2019-06-21 16:49:52.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2019-05-25 13:30+0200\n" -"PO-Revision-Date: 2019-05-25 11:31\n" +"POT-Creation-Date: 2019-05-27 23:21+0200\n" +"PO-Revision-Date: 2019-06-21 16:09\n" "Last-Translator: Frode Solheim (FrodeSolheim)\n" "Language-Team: Greek\n" "Language: el_GR\n" @@ -1472,3 +1472,30 @@ msgid "{} ROM files were imported" msgstr "{} ROM αρχεία προστέθηκαν" +msgid "Finding files eligible for OpenRetro Locker" +msgstr "" + +msgid "Locker upload task completed successfully" +msgstr "" + +msgid "Log In to Your OpenRetro Account" +msgstr "" + +msgid "Log Out from Your OpenRetro Account" +msgstr "" + +msgid "OpenRetro Locker Uploader" +msgstr "" + +msgid "OpenRetro Locker is not enabled for your user. It may be available only to a few select beta users." +msgstr "" + +msgid "Upload recognized Amiga files to your OpenRetro locker" +msgstr "" + +msgid "Use GameMode to optimize performance" +msgstr "" + +msgid "Warn when CPU governor is not 'performance'" +msgstr "" + diff -Nru fs-uae-launcher-2.9.12~dev/po/eo.po fs-uae-launcher-3.0.0/po/eo.po --- fs-uae-launcher-2.9.12~dev/po/eo.po 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/po/eo.po 2019-06-21 16:49:52.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2019-05-25 13:30+0200\n" -"PO-Revision-Date: 2019-05-25 11:31\n" +"POT-Creation-Date: 2019-05-27 23:21+0200\n" +"PO-Revision-Date: 2019-06-21 16:09\n" "Last-Translator: Frode Solheim (FrodeSolheim)\n" "Language-Team: Esperanto\n" "Language: eo_UY\n" @@ -1472,3 +1472,30 @@ msgid "{} ROM files were imported" msgstr "" +msgid "Finding files eligible for OpenRetro Locker" +msgstr "" + +msgid "Locker upload task completed successfully" +msgstr "" + +msgid "Log In to Your OpenRetro Account" +msgstr "" + +msgid "Log Out from Your OpenRetro Account" +msgstr "" + +msgid "OpenRetro Locker Uploader" +msgstr "" + +msgid "OpenRetro Locker is not enabled for your user. It may be available only to a few select beta users." +msgstr "" + +msgid "Upload recognized Amiga files to your OpenRetro locker" +msgstr "" + +msgid "Use GameMode to optimize performance" +msgstr "" + +msgid "Warn when CPU governor is not 'performance'" +msgstr "" + diff -Nru fs-uae-launcher-2.9.12~dev/po/es.po fs-uae-launcher-3.0.0/po/es.po --- fs-uae-launcher-2.9.12~dev/po/es.po 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/po/es.po 2019-06-21 16:49:52.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2019-05-25 13:30+0200\n" -"PO-Revision-Date: 2019-05-25 11:31\n" +"POT-Creation-Date: 2019-05-27 23:21+0200\n" +"PO-Revision-Date: 2019-06-21 16:09\n" "Last-Translator: Frode Solheim (FrodeSolheim)\n" "Language-Team: Spanish\n" "Language: es_ES\n" @@ -1472,3 +1472,30 @@ msgid "{} ROM files were imported" msgstr "Se han importando {} archivos de ROM" +msgid "Finding files eligible for OpenRetro Locker" +msgstr "" + +msgid "Locker upload task completed successfully" +msgstr "" + +msgid "Log In to Your OpenRetro Account" +msgstr "" + +msgid "Log Out from Your OpenRetro Account" +msgstr "" + +msgid "OpenRetro Locker Uploader" +msgstr "" + +msgid "OpenRetro Locker is not enabled for your user. It may be available only to a few select beta users." +msgstr "" + +msgid "Upload recognized Amiga files to your OpenRetro locker" +msgstr "" + +msgid "Use GameMode to optimize performance" +msgstr "" + +msgid "Warn when CPU governor is not 'performance'" +msgstr "" + diff -Nru fs-uae-launcher-2.9.12~dev/po/fi.po fs-uae-launcher-3.0.0/po/fi.po --- fs-uae-launcher-2.9.12~dev/po/fi.po 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/po/fi.po 2019-06-21 16:49:52.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2019-05-25 13:30+0200\n" -"PO-Revision-Date: 2019-05-25 11:31\n" +"POT-Creation-Date: 2019-05-27 23:21+0200\n" +"PO-Revision-Date: 2019-06-21 16:09\n" "Last-Translator: Frode Solheim (FrodeSolheim)\n" "Language-Team: Finnish\n" "Language: fi_FI\n" @@ -1472,3 +1472,30 @@ msgid "{} ROM files were imported" msgstr "{} ROM tiedostoa tuotiin" +msgid "Finding files eligible for OpenRetro Locker" +msgstr "" + +msgid "Locker upload task completed successfully" +msgstr "" + +msgid "Log In to Your OpenRetro Account" +msgstr "" + +msgid "Log Out from Your OpenRetro Account" +msgstr "" + +msgid "OpenRetro Locker Uploader" +msgstr "" + +msgid "OpenRetro Locker is not enabled for your user. It may be available only to a few select beta users." +msgstr "" + +msgid "Upload recognized Amiga files to your OpenRetro locker" +msgstr "" + +msgid "Use GameMode to optimize performance" +msgstr "" + +msgid "Warn when CPU governor is not 'performance'" +msgstr "" + diff -Nru fs-uae-launcher-2.9.12~dev/po/fr.po fs-uae-launcher-3.0.0/po/fr.po --- fs-uae-launcher-2.9.12~dev/po/fr.po 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/po/fr.po 2019-06-21 16:49:52.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2019-05-25 13:30+0200\n" -"PO-Revision-Date: 2019-05-25 11:31\n" +"POT-Creation-Date: 2019-05-27 23:21+0200\n" +"PO-Revision-Date: 2019-06-21 16:09\n" "Last-Translator: Frode Solheim (FrodeSolheim)\n" "Language-Team: French\n" "Language: fr_FR\n" @@ -1472,3 +1472,30 @@ msgid "{} ROM files were imported" msgstr "{} Fichiers ROM ont été importés" +msgid "Finding files eligible for OpenRetro Locker" +msgstr "" + +msgid "Locker upload task completed successfully" +msgstr "" + +msgid "Log In to Your OpenRetro Account" +msgstr "" + +msgid "Log Out from Your OpenRetro Account" +msgstr "" + +msgid "OpenRetro Locker Uploader" +msgstr "" + +msgid "OpenRetro Locker is not enabled for your user. It may be available only to a few select beta users." +msgstr "" + +msgid "Upload recognized Amiga files to your OpenRetro locker" +msgstr "" + +msgid "Use GameMode to optimize performance" +msgstr "" + +msgid "Warn when CPU governor is not 'performance'" +msgstr "" + diff -Nru fs-uae-launcher-2.9.12~dev/po/hu.po fs-uae-launcher-3.0.0/po/hu.po --- fs-uae-launcher-2.9.12~dev/po/hu.po 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/po/hu.po 2019-06-21 16:49:52.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2019-05-25 13:30+0200\n" -"PO-Revision-Date: 2019-05-25 11:31\n" +"POT-Creation-Date: 2019-05-27 23:21+0200\n" +"PO-Revision-Date: 2019-06-21 16:09\n" "Last-Translator: Frode Solheim (FrodeSolheim)\n" "Language-Team: Hungarian\n" "Language: hu_HU\n" @@ -1472,3 +1472,30 @@ msgid "{} ROM files were imported" msgstr "" +msgid "Finding files eligible for OpenRetro Locker" +msgstr "" + +msgid "Locker upload task completed successfully" +msgstr "" + +msgid "Log In to Your OpenRetro Account" +msgstr "" + +msgid "Log Out from Your OpenRetro Account" +msgstr "" + +msgid "OpenRetro Locker Uploader" +msgstr "" + +msgid "OpenRetro Locker is not enabled for your user. It may be available only to a few select beta users." +msgstr "" + +msgid "Upload recognized Amiga files to your OpenRetro locker" +msgstr "" + +msgid "Use GameMode to optimize performance" +msgstr "" + +msgid "Warn when CPU governor is not 'performance'" +msgstr "" + diff -Nru fs-uae-launcher-2.9.12~dev/po/it.po fs-uae-launcher-3.0.0/po/it.po --- fs-uae-launcher-2.9.12~dev/po/it.po 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/po/it.po 2019-06-21 16:49:52.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2019-05-25 13:30+0200\n" -"PO-Revision-Date: 2019-05-25 11:31\n" +"POT-Creation-Date: 2019-05-27 23:21+0200\n" +"PO-Revision-Date: 2019-06-21 16:09\n" "Last-Translator: Frode Solheim (FrodeSolheim)\n" "Language-Team: Italian\n" "Language: it_IT\n" @@ -1215,7 +1215,7 @@ msgstr "Mescola" msgid "Six Button Control Pad" -msgstr "" +msgstr "Controller a sei pulsanti" msgid "Size:" msgstr "Dimensione:" @@ -1472,3 +1472,30 @@ msgid "{} ROM files were imported" msgstr "Sono stati importati {} file ROM" +msgid "Finding files eligible for OpenRetro Locker" +msgstr "" + +msgid "Locker upload task completed successfully" +msgstr "" + +msgid "Log In to Your OpenRetro Account" +msgstr "" + +msgid "Log Out from Your OpenRetro Account" +msgstr "" + +msgid "OpenRetro Locker Uploader" +msgstr "" + +msgid "OpenRetro Locker is not enabled for your user. It may be available only to a few select beta users." +msgstr "" + +msgid "Upload recognized Amiga files to your OpenRetro locker" +msgstr "" + +msgid "Use GameMode to optimize performance" +msgstr "" + +msgid "Warn when CPU governor is not 'performance'" +msgstr "" + diff -Nru fs-uae-launcher-2.9.12~dev/po/nb.po fs-uae-launcher-3.0.0/po/nb.po --- fs-uae-launcher-2.9.12~dev/po/nb.po 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/po/nb.po 2019-06-21 16:49:52.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2019-05-25 13:30+0200\n" -"PO-Revision-Date: 2019-05-25 11:31\n" +"POT-Creation-Date: 2019-05-27 23:21+0200\n" +"PO-Revision-Date: 2019-06-21 16:10\n" "Last-Translator: Frode Solheim (FrodeSolheim)\n" "Language-Team: Norwegian Bokmal\n" "Language: nb_NO\n" @@ -1215,7 +1215,7 @@ msgstr "Bland" msgid "Six Button Control Pad" -msgstr "" +msgstr "Kontroller med 6 knapper" msgid "Size:" msgstr "Størrelse:" @@ -1472,3 +1472,30 @@ msgid "{} ROM files were imported" msgstr "{} ROM-filer ble importert" +msgid "Finding files eligible for OpenRetro Locker" +msgstr "Finner filer som kan lagres i OpenRetro Locker" + +msgid "Locker upload task completed successfully" +msgstr "Opplastingsjobb for OpenRetro Locker fullført" + +msgid "Log In to Your OpenRetro Account" +msgstr "Logg inn med din OpenRetro-konto" + +msgid "Log Out from Your OpenRetro Account" +msgstr "Logg ut fra din OpenRetro-konto" + +msgid "OpenRetro Locker Uploader" +msgstr "Opplaster for OpenRetro Locker" + +msgid "OpenRetro Locker is not enabled for your user. It may be available only to a few select beta users." +msgstr "OpenRetro Locker er ikke aktivert for brukeren din. Det kan vere bare tilgjengelig for utvalgte betabrukere." + +msgid "Upload recognized Amiga files to your OpenRetro locker" +msgstr "Last opp gjenkjente filer til OpenRetro Locker-en din" + +msgid "Use GameMode to optimize performance" +msgstr "Bruk GameMode for å øke ytelsen" + +msgid "Warn when CPU governor is not 'performance'" +msgstr "Advar når CPU-guvernør ikke er 'performance'" + diff -Nru fs-uae-launcher-2.9.12~dev/po/nl.po fs-uae-launcher-3.0.0/po/nl.po --- fs-uae-launcher-2.9.12~dev/po/nl.po 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/po/nl.po 2019-06-21 16:49:52.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2019-05-25 13:30+0200\n" -"PO-Revision-Date: 2019-05-25 11:31\n" +"POT-Creation-Date: 2019-05-27 23:21+0200\n" +"PO-Revision-Date: 2019-06-21 16:09\n" "Last-Translator: Frode Solheim (FrodeSolheim)\n" "Language-Team: Dutch\n" "Language: nl_NL\n" @@ -1472,3 +1472,30 @@ msgid "{} ROM files were imported" msgstr "{} ROM-bestanden zijn geïmporteerd" +msgid "Finding files eligible for OpenRetro Locker" +msgstr "" + +msgid "Locker upload task completed successfully" +msgstr "" + +msgid "Log In to Your OpenRetro Account" +msgstr "" + +msgid "Log Out from Your OpenRetro Account" +msgstr "" + +msgid "OpenRetro Locker Uploader" +msgstr "" + +msgid "OpenRetro Locker is not enabled for your user. It may be available only to a few select beta users." +msgstr "" + +msgid "Upload recognized Amiga files to your OpenRetro locker" +msgstr "" + +msgid "Use GameMode to optimize performance" +msgstr "" + +msgid "Warn when CPU governor is not 'performance'" +msgstr "" + diff -Nru fs-uae-launcher-2.9.12~dev/po/pl.po fs-uae-launcher-3.0.0/po/pl.po --- fs-uae-launcher-2.9.12~dev/po/pl.po 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/po/pl.po 2019-06-21 16:49:52.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2019-05-25 13:30+0200\n" -"PO-Revision-Date: 2019-05-25 11:31\n" +"POT-Creation-Date: 2019-05-27 23:21+0200\n" +"PO-Revision-Date: 2019-06-21 16:09\n" "Last-Translator: Frode Solheim (FrodeSolheim)\n" "Language-Team: Polish\n" "Language: pl_PL\n" @@ -1215,7 +1215,7 @@ msgstr "Losowo" msgid "Six Button Control Pad" -msgstr "" +msgstr "6-przyciskowy pad" msgid "Size:" msgstr "Rozmiar:" @@ -1472,3 +1472,30 @@ msgid "{} ROM files were imported" msgstr "{} pliki ROM zaimportowane" +msgid "Finding files eligible for OpenRetro Locker" +msgstr "Szukanie plików nadających się do schowka OpenRetro" + +msgid "Locker upload task completed successfully" +msgstr "Przesyłanie do schowka zakończone pomyślnie" + +msgid "Log In to Your OpenRetro Account" +msgstr "Zaloguj się do swojego konta OpenRetro" + +msgid "Log Out from Your OpenRetro Account" +msgstr "Wyloguj się ze swojego konta OpenRetro" + +msgid "OpenRetro Locker Uploader" +msgstr "Uploader schowka OpenRetro" + +msgid "OpenRetro Locker is not enabled for your user. It may be available only to a few select beta users." +msgstr "Schowek OpenRetro jest niedostępny dla tego użytkownika. Może być dostępny tylko dla kilku wybranych użytkowników beta." + +msgid "Upload recognized Amiga files to your OpenRetro locker" +msgstr "Prześlij rozpoznane pliki Amigi do swojego schowka w OpenRetro" + +msgid "Use GameMode to optimize performance" +msgstr "Użyj GameMode dla poprawy wydajności" + +msgid "Warn when CPU governor is not 'performance'" +msgstr "Ostrzegaj gdy CPU nie działa w trybie 'performance'" + diff -Nru fs-uae-launcher-2.9.12~dev/po/pt_BR.po fs-uae-launcher-3.0.0/po/pt_BR.po --- fs-uae-launcher-2.9.12~dev/po/pt_BR.po 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/po/pt_BR.po 2019-06-21 16:49:52.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2019-05-25 13:30+0200\n" -"PO-Revision-Date: 2019-05-25 11:31\n" +"POT-Creation-Date: 2019-05-27 23:21+0200\n" +"PO-Revision-Date: 2019-06-21 16:09\n" "Last-Translator: Frode Solheim (FrodeSolheim)\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" @@ -1215,7 +1215,7 @@ msgstr "Aleatório" msgid "Six Button Control Pad" -msgstr "" +msgstr "Controle de Seis Botões" msgid "Size:" msgstr "Tamanho:" @@ -1472,3 +1472,30 @@ msgid "{} ROM files were imported" msgstr "{} arquivos de ROM foram importados" +msgid "Finding files eligible for OpenRetro Locker" +msgstr "Localizando arquivos elegíveis para a Estante OpenRetro" + +msgid "Locker upload task completed successfully" +msgstr "Tarefa de carregamento da estante concluída com sucesso" + +msgid "Log In to Your OpenRetro Account" +msgstr "Iniciar sessão na sua conta OpenRetro" + +msgid "Log Out from Your OpenRetro Account" +msgstr "Sair da sua conta OpenRetro" + +msgid "OpenRetro Locker Uploader" +msgstr "Carregador da Estante OpenRetro" + +msgid "OpenRetro Locker is not enabled for your user. It may be available only to a few select beta users." +msgstr "A Estante OpenRetro não está habilitada para o seu usuário. Pode estar disponível apenas para alguns usuários beta selecionados." + +msgid "Upload recognized Amiga files to your OpenRetro locker" +msgstr "Carregar arquivos Amiga reconhecidos para a sua estante OpenRetro" + +msgid "Use GameMode to optimize performance" +msgstr "Usar o Modo Jogo para otimizar o desempenho" + +msgid "Warn when CPU governor is not 'performance'" +msgstr "Avisar quando o regulador da CPU não for 'desempenho'" + diff -Nru fs-uae-launcher-2.9.12~dev/po/pt.po fs-uae-launcher-3.0.0/po/pt.po --- fs-uae-launcher-2.9.12~dev/po/pt.po 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/po/pt.po 2019-06-21 16:49:52.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2019-05-25 13:30+0200\n" -"PO-Revision-Date: 2019-05-25 11:31\n" +"POT-Creation-Date: 2019-05-27 23:21+0200\n" +"PO-Revision-Date: 2019-06-21 16:09\n" "Last-Translator: Frode Solheim (FrodeSolheim)\n" "Language-Team: Portuguese\n" "Language: pt_PT\n" @@ -1472,3 +1472,30 @@ msgid "{} ROM files were imported" msgstr "{} ficheiros de ROM foram importados" +msgid "Finding files eligible for OpenRetro Locker" +msgstr "" + +msgid "Locker upload task completed successfully" +msgstr "" + +msgid "Log In to Your OpenRetro Account" +msgstr "" + +msgid "Log Out from Your OpenRetro Account" +msgstr "" + +msgid "OpenRetro Locker Uploader" +msgstr "" + +msgid "OpenRetro Locker is not enabled for your user. It may be available only to a few select beta users." +msgstr "" + +msgid "Upload recognized Amiga files to your OpenRetro locker" +msgstr "" + +msgid "Use GameMode to optimize performance" +msgstr "" + +msgid "Warn when CPU governor is not 'performance'" +msgstr "" + diff -Nru fs-uae-launcher-2.9.12~dev/po/ru.po fs-uae-launcher-3.0.0/po/ru.po --- fs-uae-launcher-2.9.12~dev/po/ru.po 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/po/ru.po 2019-06-21 16:49:52.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2019-05-25 13:30+0200\n" -"PO-Revision-Date: 2019-05-25 11:31\n" +"POT-Creation-Date: 2019-05-27 23:21+0200\n" +"PO-Revision-Date: 2019-06-21 16:09\n" "Last-Translator: Frode Solheim (FrodeSolheim)\n" "Language-Team: Russian\n" "Language: ru_RU\n" @@ -1472,3 +1472,30 @@ msgid "{} ROM files were imported" msgstr "" +msgid "Finding files eligible for OpenRetro Locker" +msgstr "" + +msgid "Locker upload task completed successfully" +msgstr "" + +msgid "Log In to Your OpenRetro Account" +msgstr "" + +msgid "Log Out from Your OpenRetro Account" +msgstr "" + +msgid "OpenRetro Locker Uploader" +msgstr "" + +msgid "OpenRetro Locker is not enabled for your user. It may be available only to a few select beta users." +msgstr "" + +msgid "Upload recognized Amiga files to your OpenRetro locker" +msgstr "" + +msgid "Use GameMode to optimize performance" +msgstr "" + +msgid "Warn when CPU governor is not 'performance'" +msgstr "" + diff -Nru fs-uae-launcher-2.9.12~dev/po/sr.po fs-uae-launcher-3.0.0/po/sr.po --- fs-uae-launcher-2.9.12~dev/po/sr.po 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/po/sr.po 2019-06-21 16:49:52.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2019-05-25 13:30+0200\n" -"PO-Revision-Date: 2019-05-25 11:31\n" +"POT-Creation-Date: 2019-05-27 23:21+0200\n" +"PO-Revision-Date: 2019-06-21 16:10\n" "Last-Translator: Frode Solheim (FrodeSolheim)\n" "Language-Team: Serbian (Latin)\n" "Language: sr_CS\n" @@ -1472,3 +1472,30 @@ msgid "{} ROM files were imported" msgstr "" +msgid "Finding files eligible for OpenRetro Locker" +msgstr "" + +msgid "Locker upload task completed successfully" +msgstr "" + +msgid "Log In to Your OpenRetro Account" +msgstr "" + +msgid "Log Out from Your OpenRetro Account" +msgstr "" + +msgid "OpenRetro Locker Uploader" +msgstr "" + +msgid "OpenRetro Locker is not enabled for your user. It may be available only to a few select beta users." +msgstr "" + +msgid "Upload recognized Amiga files to your OpenRetro locker" +msgstr "" + +msgid "Use GameMode to optimize performance" +msgstr "" + +msgid "Warn when CPU governor is not 'performance'" +msgstr "" + diff -Nru fs-uae-launcher-2.9.12~dev/po/sv.po fs-uae-launcher-3.0.0/po/sv.po --- fs-uae-launcher-2.9.12~dev/po/sv.po 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/po/sv.po 2019-06-21 16:49:52.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2019-05-25 13:30+0200\n" -"PO-Revision-Date: 2019-05-25 11:31\n" +"POT-Creation-Date: 2019-05-27 23:21+0200\n" +"PO-Revision-Date: 2019-06-21 16:09\n" "Last-Translator: Frode Solheim (FrodeSolheim)\n" "Language-Team: Swedish\n" "Language: sv_SE\n" @@ -1471,3 +1471,30 @@ msgid "{} ROM files were imported" msgstr "" +msgid "Finding files eligible for OpenRetro Locker" +msgstr "" + +msgid "Locker upload task completed successfully" +msgstr "" + +msgid "Log In to Your OpenRetro Account" +msgstr "" + +msgid "Log Out from Your OpenRetro Account" +msgstr "" + +msgid "OpenRetro Locker Uploader" +msgstr "" + +msgid "OpenRetro Locker is not enabled for your user. It may be available only to a few select beta users." +msgstr "" + +msgid "Upload recognized Amiga files to your OpenRetro locker" +msgstr "" + +msgid "Use GameMode to optimize performance" +msgstr "" + +msgid "Warn when CPU governor is not 'performance'" +msgstr "" + diff -Nru fs-uae-launcher-2.9.12~dev/po/tr.po fs-uae-launcher-3.0.0/po/tr.po --- fs-uae-launcher-2.9.12~dev/po/tr.po 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/po/tr.po 2019-06-21 16:49:52.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2019-05-25 13:30+0200\n" -"PO-Revision-Date: 2019-05-25 11:31\n" +"POT-Creation-Date: 2019-05-27 23:21+0200\n" +"PO-Revision-Date: 2019-06-21 16:09\n" "Last-Translator: Frode Solheim (FrodeSolheim)\n" "Language-Team: Turkish\n" "Language: tr_TR\n" @@ -1472,3 +1472,30 @@ msgid "{} ROM files were imported" msgstr "{} ROM dosyası yüklendi" +msgid "Finding files eligible for OpenRetro Locker" +msgstr "" + +msgid "Locker upload task completed successfully" +msgstr "" + +msgid "Log In to Your OpenRetro Account" +msgstr "" + +msgid "Log Out from Your OpenRetro Account" +msgstr "" + +msgid "OpenRetro Locker Uploader" +msgstr "" + +msgid "OpenRetro Locker is not enabled for your user. It may be available only to a few select beta users." +msgstr "" + +msgid "Upload recognized Amiga files to your OpenRetro locker" +msgstr "" + +msgid "Use GameMode to optimize performance" +msgstr "" + +msgid "Warn when CPU governor is not 'performance'" +msgstr "" + diff -Nru fs-uae-launcher-2.9.12~dev/setup.py fs-uae-launcher-3.0.0/setup.py --- fs-uae-launcher-2.9.12~dev/setup.py 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/setup.py 2019-06-21 16:49:53.000000000 +0000 @@ -20,7 +20,7 @@ name = "fs-uae-launcher" py_name = "fs_uae_launcher" tar_name = "fs-uae-launcher" -version = "2.9.12dev" +version = "3.0.0" author = "Frode Solheim" author_email = "frode@fs-uae.net" package_map = { @@ -129,7 +129,7 @@ else: setup_kwargs["executables"] = [Executable(s) for s in scripts] - setup_kwargs["version"] = "2.9.12" + setup_kwargs["version"] = "3.0.0" build_exe_options = { "includes": [ # "ctypes", @@ -182,7 +182,7 @@ if sys.platform == "darwin": setup_kwargs["name"] = title - setup_kwargs["version"] = "2.9.12" + setup_kwargs["version"] = "3.0.0" else: setup_kwargs["scripts"] = scripts diff -Nru fs-uae-launcher-2.9.12~dev/VERSION fs-uae-launcher-3.0.0/VERSION --- fs-uae-launcher-2.9.12~dev/VERSION 2019-05-29 23:31:22.000000000 +0000 +++ fs-uae-launcher-3.0.0/VERSION 2019-06-21 16:49:53.000000000 +0000 @@ -1 +1 @@ -2.9.12dev +3.0.0