Skip to content

Add Randomise Artwork toggle #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oomek wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add Randomise Artwork toggle #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions resources/language/cn.msg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Settings;设置
Global Filter;全局分类
Group Clones;分组克隆
Hide Game Title Brackets;隐藏比赛标题括号
Randomise Artwork;随机化艺术图
Format Game Title;格式化游戏标题
Hide Console;隐藏控制台
Image Cache Size;图像缓存大小
Expand Down Expand Up @@ -501,6 +502,7 @@ _help_misc_exit_message;退出前端的备选消息(例如“关闭系统”)
_help_misc_filter_wrap_mode;设置当“下一个筛选器”或“上一个筛选器”操作到达筛选器集末尾时的行为
_help_misc_group_clones;将同一游戏的所有克隆版本分组到一个列表项下
_help_misc_hide_brackets;显示游戏标题时隐藏括号中的文本
_help_misc_randomise_artwork;当发现多个匹配项时随机选择艺术图。
_help_misc_prefix_modes;将“The”和“Vs.”前缀移动到游戏标题的末尾
_help_misc_hide_console;启动时隐藏控制台。请注意, 此功能仅在从 Windows 图形用户界面启动 Attract-Mode Plus 时有效。如果从现有控制台窗口(例如批处理文件)启动, 则该进程将始终“附加”到现有控制台并向其输出。
_help_misc_image_cache_mbytes;配置Attract-Mode Plus内部图像缓存的最大大小(以兆字节为单位)
Expand Down
2 changes: 2 additions & 0 deletions resources/language/de.msg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Settings;Einstellungen
Global Filter;Globaler Filter
Group Clones;Gruppenklone
Hide Game Title Brackets;Spieltitel-Klammern ausblenden
Randomise Artwork;Artwork zufällig anordnen
Format Game Title;Spieltitel formatieren
Hide Console;Konsole ausblenden
Image Cache Size;Bildcache-Größe
Expand Down Expand Up @@ -501,6 +502,7 @@ _help_misc_exit_message;Alternative Abschiedsnachricht beim Beenden des Programm
_help_misc_filter_wrap_mode;Definiere was passieren soll wenn die "Nächster Filter" oder "Vorheriger Filter" Aktionen das Ende Filterliste erreichen
_help_misc_group_clones;Gruppieren Sie alle Klone eines Spiels unter einem einzigen Listeneintrag
_help_misc_hide_brackets;Verberge bei der Anzeige der Spieletitel den Text in Klammern
_help_misc_randomise_artwork;Zufällige Auswahl des Artworks, wenn mehrere Treffer gefunden werden.
_help_misc_prefix_modes;Verschiebt „The“ und „Vs.“ Präfixe am Ende des Spieltitels
_help_misc_hide_console;Verstecke das Kommandozeilenfenster beim Starten. Bitte beachte, dass dies nur in einer Windows Schaltfläche funktioniert. Wird die Anwendung durch ein Kommandozeilenfenster, wie z.B. einer Batch-Datei, gestartet, wird der Ladevorgang and dieses Fenster gebunden sein
_help_misc_image_cache_mbytes;Konfiguriert die maximale Größe des internen Bildcaches von Attract-Mode Plus (in Megabyte).
Expand Down
2 changes: 2 additions & 0 deletions resources/language/en.msg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Settings;Settings
Global Filter;Global Filter
Group Clones;Group Clones
Hide Game Title Brackets;Hide Game Title Brackets
Randomise Artwork;Randomise Artwork
Format Game Title;Format Game Title
Hide Console;Hide Console
Image Cache Size;Image Cache Size
Expand Down Expand Up @@ -501,6 +502,7 @@ _help_misc_exit_message;Alternate message to exit the frontend [i.e. "Shut Down
_help_misc_filter_wrap_mode;Set what happens when the "Next Filter" or "Previous Filter" actions reach the end of the filter set
_help_misc_group_clones;Group all clones of a game under one single list entry
_help_misc_hide_brackets;Hide text in brackets when showing game titles
_help_misc_randomise_artwork;Randomise artwork when multiple matches are found.
_help_misc_prefix_modes;Move "The" and "Vs." prefixes to the end of the game title
_help_misc_hide_console;Hide console on startup. Note that this only works if starting Attract-Mode Plus from a Windows GUI. If started from an existing console window (e.g. a batch file) then the process will always "attach" to the existing console and output to it
_help_misc_image_cache_mbytes;Configure the maximum size of Attract-Mode Plus's internal image cache (in megabytes)
Expand Down
2 changes: 2 additions & 0 deletions resources/language/es.msg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Settings;Ajustes
Global Filter;Filtro Global
Group Clones;Agrupar Clones
Hide Game Title Brackets;Ocultar corchetes del título del juego
Randomise Artwork;Aleatorizar ilustraciones
Format Game Title;Formato del título del juego
Hide Console;Ocultar consola
Image Cache Size;Tamaño de caché de imágenes
Expand Down Expand Up @@ -501,6 +502,7 @@ _help_misc_exit_message;Mensaje alternativo para salir de la interfaz [ej. "Apag
_help_misc_filter_wrap_mode;Configura que pasa cuando el "Siguiente filtro" o "Filtro previo" alcanza el final del conjunto de filtros
_help_misc_group_clones;Agrupa todos los clones de un juego en una sola entrada de lista.
_help_misc_hide_brackets;Esconde el texto en paréntesis cuando se muestran los títulos de los juegos
_help_misc_randomise_artwork;Aleatoriza las ilustraciones cuando se encuentran varias coincidencias.
_help_misc_prefix_modes;Mueve "The" y "Vs." Prefijos al final del título del juego
_help_misc_hide_console;Ocultar la consola al inicio. Tenga en cuenta que esto solo funciona si inicia Attract-Mode Plus desde una interfaz gráfica de Windows. Si se inicia desde una ventana de consola existente (p. ej., un archivo por lotes), el proceso siempre se conectará a la consola existente y mostrará la salida en ella.
_help_misc_image_cache_mbytes;Configura el tamaño máximo de la caché de imágenes interna de Attract-Mode Plus (en megabytes)
Expand Down
2 changes: 2 additions & 0 deletions resources/language/fr.msg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Settings;Paramètres
Global Filter;Filtre global
Group Clones;Grouper les clones
Hide Game Title Brackets;Masquer les parenthèses du titre du jeu
Randomise Artwork;Mélanger les illustrations
Format Game Title;Format du titre du jeu
Hide Console;Masquer la console
Image Cache Size;Taille du cache d'images
Expand Down Expand Up @@ -501,6 +502,7 @@ _help_misc_exit_message;Message alternatif pour quitter l'interface [ex.: «Arr
_help_misc_filter_wrap_mode;Définit l'action a mener lorsque "Filtre suivant" ou "Filtre précédent" arrivent à une extrémité de la liste de filtre.
_help_misc_group_clones;Regrouper tous les clones d'un jeu sous une seule entrée de liste.
_help_misc_hide_brackets;Cacher le texte entre crochets lors de l'affichage du titre du jeu
_help_misc_randomise_artwork;Mélange les illustrations lorsque plusieurs correspondances sont trouvées.
_help_misc_prefix_modes;Déplacer «The» et «Vs». Préfixe à la fin du titre du jeu
_help_misc_hide_console;Masquer la console au démarrage. Notez que cela fonctionne uniquement si Attract-Mode Plus est lancé depuis une interface graphique Windows. Si le processus est lancé depuis une fenêtre de console existante (par exemple, un fichier batch), il s'y connectera et y affichera sa sortie.
_help_misc_image_cache_mbytes;Configurer la taille maximale du cache d'images interne d'Attract-Mode Plus (en mégaoctets)
Expand Down
2 changes: 2 additions & 0 deletions resources/language/it.msg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Settings;Impostazioni
Global Filter;Filtro globale
Group Clones;Cloni di gruppo
Hide Game Title Brackets;Nascondi le parentesi del titolo del gioco
Randomise Artwork;Mescola le immagini
Format Game Title;Formato titolo gioco
Hide Console;Nascondi console
Image Cache Size;Dimensione cache immagini
Expand Down Expand Up @@ -501,6 +502,7 @@ _help_misc_exit_message;Messaggio alternativo per uscire dal frontend [ad esempi
_help_misc_filter_wrap_mode;Configura cosa succede quando i comandi "Filtro successivo" o "Filtro precedente" raggiungono il termine della lista
_help_misc_group_clones;Raggruppa tutti i cloni di un gioco in un'unica voce dell'elenco
_help_misc_hide_brackets;Nasconde il testo tra parentesi quando viene mostrato il titolo del gioco
_help_misc_randomise_artwork;Mescola le immagini quando vengono trovate più corrispondenze.
_help_misc_prefix_modes;Sposta "The" e "Vs." prefissi alla fine del titolo del gioco
_help_misc_hide_console;Nascondi la console all'avvio. Nota: questo funziona solo se Attract-Mode Plus viene avviato da un'interfaccia utente grafica di Windows. Se avviato da una finestra della console esistente (ad esempio, un file batch), il processo si "collegherà" sempre alla console esistente e vi invierà l'output.
_help_misc_image_cache_mbytes;Configura la dimensione massima della cache immagini interna di Attract-Mode Plus (in megabyte)
Expand Down
2 changes: 2 additions & 0 deletions resources/language/jp.msg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Settings;設定
Global Filter;グローバルフィルターの設定
Group Clones;グループクローン
Hide Game Title Brackets;ゲームタイトルの括弧を非表示にする
Randomise Artwork;アートワークをランダム化
Format Game Title;ゲームタイトルのフォーマット
Hide Console;コンソールを非表示
Image Cache Size;画像キャッシュサイズ
Expand Down Expand Up @@ -501,6 +502,7 @@ _help_misc_exit_message;フロントエンドを終了するための代替メ
_help_misc_filter_wrap_mode;リストの最後のフィルターで"次のフィルター"が押された時, どのように反応するかを設定します.
_help_misc_group_clones;ゲームのクローンをすべて1つのリストエントリにグループ化します。
_help_misc_hide_brackets;ゲームのタイトルを表示する時, ブラケットに囲まれた部分は隠すかを設定します
_help_misc_randomise_artwork;複数の一致が見つかった場合にアートワークをランダム化します
_help_misc_prefix_modes;「The」と「Vs.」を移動しますゲームタイトルの末尾にプレフィックスを付けます
_help_misc_hide_console;起動時にコンソールを非表示にします。これは、Attract-Mode PlusをWindows GUIから起動した場合にのみ機能します。既存のコンソールウィンドウ (例：バッチファイル) から開始された場合、プロセスは常に既存のコンソールに「アタッチ」され、そこに出力されます。
_help_misc_image_cache_mbytes;Attract-Mode Plus の内部イメージキャッシュの最大サイズ (MB単位) を設定します
Expand Down
2 changes: 2 additions & 0 deletions resources/language/kr.msg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Settings;설정
Global Filter;전역 필터 설정
Group Clones;그룹 클론
Hide Game Title Brackets;게임 제목 대괄호 숨기기
Randomise Artwork;아트워크 무작위화
Format Game Title;게임 제목 형식
Hide Console;콘솔 숨기기
Image Cache Size;이미지 캐시 크기
Expand Down Expand Up @@ -501,6 +502,7 @@ _help_misc_exit_message;프런트엔드를 종료하기 위한 대체 메시지
_help_misc_filter_wrap_mode;목록의 마지막 필터에서 '다음 필터' 키가 입력되었을 때 처리 방식을 결정합니다.
_help_misc_group_clones;모든 게임 클론을 하나의 목록 항목으로 그룹화합니다.
_help_misc_hide_brackets;게임 제목을 표시할 때에, 괄호로 둘러싸인 부분은 표시하지 않을 지 여부를 설정합니다
_help_misc_randomise_artwork;여러 개의 일치 항목이 발견되면 아트워크를 무작위로 선택합니다.
_help_misc_prefix_modes;"The"와 "Vs."를 이동합니다. 게임 제목 끝에 접두사 추가
_help_misc_hide_console;콘솔 창을 숨깁니다. 이 옵션은 프로그램을 윈도우 GUI상에서 실행할 때에만 적용됩니다. 이미 띄워진 콘솔 창에서 실행하는 경우 (예: 배치 파일에서 실행하는 경우) Attract-Mode Plus 프로세스는 해당 창에 달라붙을 것입니다.
_help_misc_image_cache_mbytes;Attract-Mode Plus 내부 이미지 캐시의 최대 크기(MB)를 설정합니다.
Expand Down
2 changes: 2 additions & 0 deletions resources/language/tw.msg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Settings;設定
Global Filter;全域過濾
Group Clones;組克隆
Hide Game Title Brackets;隱藏比賽標題括號
Randomise Artwork;隨機化美術圖
Format Game Title;格式化遊戲標題
Hide Console;隱藏控制台
Image Cache Size;影像快取大小
Expand Down Expand Up @@ -501,6 +502,7 @@ _help_misc_exit_message;設定當結束 Attract-Mode Plus 時所要顯示的訊
_help_misc_filter_wrap_mode;設定當使用「下一個遊戲過濾」或「上一個遊戲過濾」切換至底時所要執行的動作
_help_misc_group_clones;將同一遊戲的所有克隆版本分組到一個列表項目下
_help_misc_hide_brackets;顯示遊戲標題時隱藏括號內容
_help_misc_randomise_artwork;找到多個匹配項時隨機選取美術圖。
_help_misc_prefix_modes;移動“The”和“Vs”。遊戲標題末尾的前綴
_help_misc_hide_console;啟動時隱藏主控台視窗 (註: 這僅在從 Windows 介面啟動 Attract-Mode Plus 時能正常運作,若從命令提示字元視窗啟動 (例: 批次檔),這個處理程式將始終附加並輸出到這個命令提示字元視窗)
_help_misc_image_cache_mbytes;設定 Attract-Mode Plus 內部影像快取最大值大小 (以 MB 為單位)
Expand Down
2 changes: 2 additions & 0 deletions src/fe_config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1792,6 +1792,7 @@ void FeMiscMenu::get_options( FeConfigContext &ctx )
ctx.add_opt( Opt::TOGGLE, _( "Confirm Exit" ), ctx.fe_settings.get_info_bool( FeSettings::ConfirmExit ), _( "_help_misc_confirm_exit" ) );
ctx.add_opt( Opt::TOGGLE, _( "Custom Overlay" ), ctx.fe_settings.get_info_bool( FeSettings::CustomOverlay ), _( "_help_misc_custom_overlay" ) );
ctx.add_opt( Opt::TOGGLE, _( "Hide Game Title Brackets" ), ctx.fe_settings.get_info_bool( FeSettings::HideBrackets ), _( "_help_misc_hide_brackets" ) );
ctx.add_opt( Opt::TOGGLE, _( "Randomise Artwork" ), ctx.fe_settings.get_info_bool( FeSettings::RandomiseArtwork ), _( "_help_misc_randomise_artwork" ) );

std::vector<std::string> prefix_modes = _( FeSettings::prefixDispTokens );
std::string prefix_mode = value_at( prefix_modes, ctx.fe_settings.get_prefix_mode() );
Expand Down Expand Up @@ -1865,6 +1866,7 @@ bool FeMiscMenu::save( FeConfigContext &ctx )
ctx.fe_settings.set_info( FeSettings::ConfirmExit, ctx.opt_list[i++].get_bool() );
ctx.fe_settings.set_info( FeSettings::CustomOverlay, ctx.opt_list[i++].get_bool() );
ctx.fe_settings.set_info( FeSettings::HideBrackets, ctx.opt_list[i++].get_bool() );
ctx.fe_settings.set_info( FeSettings::RandomiseArtwork, ctx.opt_list[i++].get_bool() );
ctx.fe_settings.set_info( FeSettings::PrefixMode, FeSettings::prefixTokens[ ctx.opt_list[i++].get_vindex() ] );
ctx.fe_settings.set_info( FeSettings::FilterWrapMode, FeSettings::filterWrapTokens[ ctx.opt_list[i++].get_vindex() ] );

Expand Down
31 changes: 22 additions & 9 deletions src/fe_settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ FeSettings::FeSettings( const std::string &config_path ):
m_custom_languages( false ),
m_displays_menu_exit( true ),
m_hide_brackets( true ),
m_randomise_artwork( true ),
m_group_clones( true ),
m_startup_mode( ShowLastSelection ),
m_prefix_mode( SortAndShowPrefix ),
Expand Down Expand Up @@ -575,6 +576,7 @@ const char *FeSettings::configSettingStrings[] =
"screen_saver_timeout",
"displays_menu_exit",
"hide_brackets",
"randomise_artwork",
"group_clones",
"startup_mode",
"prefix_mode",
Expand Down Expand Up @@ -3477,6 +3479,7 @@ const std::string FeSettings::get_info( int index ) const
case CustomLanguages:
case DisplaysMenuExit:
case HideBrackets:
case RandomiseArtwork:
case GroupClones:
case ConfirmFavourites:
case ConfirmExit:
Expand Down Expand Up @@ -3532,6 +3535,8 @@ bool FeSettings::get_info_bool( int index ) const
return m_displays_menu_exit;
case HideBrackets:
return m_hide_brackets;
case RandomiseArtwork:
return m_randomise_artwork;
case GroupClones:
return m_group_clones;
case ConfirmFavourites:
Expand Down Expand Up @@ -3617,6 +3622,10 @@ bool FeSettings::set_info( int index, const std::string &value )
m_hide_brackets = config_str_to_bool( value );
break;

case RandomiseArtwork:
m_randomise_artwork = config_str_to_bool( value );
break;

case GroupClones:
m_group_clones = config_str_to_bool( value );
break;
Expand Down Expand Up @@ -4459,6 +4468,7 @@ bool gather_artwork_filenames(
std::vector<std::string> &vids,
std::vector<std::string> &images,
bool image_only,
bool randomise_artwork,
FePathCache *path_cache )
{
for ( std::vector< std::string >::const_iterator itr = art_paths.begin();
Expand Down Expand Up @@ -4536,8 +4546,11 @@ bool gather_artwork_filenames(
}
#endif

std::shuffle( vid_contents.begin(), vid_contents.end(), rnd );
std::shuffle( img_contents.begin(), img_contents.end(), rnd );
if ( randomise_artwork )
{
std::shuffle( vid_contents.begin(), vid_contents.end(), rnd );
std::shuffle( img_contents.begin(), img_contents.end(), rnd );
}

images.insert( images.end(), img_contents.begin(), img_contents.end() );
vids.insert( vids.end(), vid_contents.begin(), vid_contents.end() );
Expand Down Expand Up @@ -4640,7 +4653,7 @@ bool FeSettings::internal_get_best_artwork_file(
const std::string &cloneof = rom.get_info( FeRomInfo::Cloneof );

std::vector<std::string> romname_image_list;
if ( gather_artwork_filenames( art_paths, romname, vid_list, romname_image_list, image_only, &m_path_cache ) )
if ( gather_artwork_filenames( art_paths, romname, vid_list, romname_image_list, image_only, m_randomise_artwork, &m_path_cache ) )
{
// test for "romname" specific videos first
if ( !image_only && !vid_list.empty() )
Expand All @@ -4650,7 +4663,7 @@ bool FeSettings::internal_get_best_artwork_file(
bool check_altname = ( !altname.empty() && ( romname.compare( altname ) != 0 ));

std::vector<std::string> altname_image_list;
if ( check_altname && gather_artwork_filenames( art_paths, altname, vid_list, altname_image_list, image_only, &m_path_cache ) )
if ( check_altname && gather_artwork_filenames( art_paths, altname, vid_list, altname_image_list, image_only, m_randomise_artwork, &m_path_cache ) )
{
// test for "altname" specific videos second
if ( !image_only && !vid_list.empty() )
Expand All @@ -4660,7 +4673,7 @@ bool FeSettings::internal_get_best_artwork_file(
bool check_cloneof = ( !cloneof.empty() && (altname.compare( cloneof ) != 0 ));

std::vector<std::string> cloneof_image_list;
if ( check_cloneof && gather_artwork_filenames( art_paths, cloneof, vid_list, cloneof_image_list, image_only, &m_path_cache ) )
if ( check_cloneof && gather_artwork_filenames( art_paths, cloneof, vid_list, cloneof_image_list, image_only, m_randomise_artwork, &m_path_cache ) )
{
// then "cloneof" specific videos
if ( !image_only && !vid_list.empty() )
Expand Down Expand Up @@ -4690,7 +4703,7 @@ bool FeSettings::internal_get_best_artwork_file(

// then "emulator"
if ( !ignore_emu && !emu_name.empty()
&& gather_artwork_filenames( art_paths, emu_name, vid_list, image_list, image_only, &m_path_cache ) )
&& gather_artwork_filenames( art_paths, emu_name, vid_list, image_list, image_only, m_randomise_artwork, &m_path_cache ) )
return true;
}

Expand Down Expand Up @@ -4724,14 +4737,14 @@ void FeSettings::get_best_artwork_file(

// check for "[emulator-[artlabel]" artworks first
if ( gather_artwork_filenames( layout_paths,
emu_name + "-" + art_name, vid_list, image_list, image_only, &m_path_cache ) )
emu_name + "-" + art_name, vid_list, image_list, image_only, m_randomise_artwork, &m_path_cache ) )
{
if ( !image_only && !vid_list.empty() )
return;
}

// then "[artlabel]"
gather_artwork_filenames( layout_paths, art_name, vid_list, image_list, image_only, &m_path_cache );
gather_artwork_filenames( layout_paths, art_name, vid_list, image_list, image_only, m_randomise_artwork, &m_path_cache );

}

Expand Down Expand Up @@ -4789,7 +4802,7 @@ bool FeSettings::get_best_dynamic_image_file(
std::vector< std::string > paths;
paths.push_back( path );

return gather_artwork_filenames( paths, base, vid_list, image_list, false, NULL ); // TODO: image_only variable, or false?
return gather_artwork_filenames( paths, base, vid_list, image_list, false, m_randomise_artwork, NULL ); // TODO: image_only variable, or false?
}

bool FeSettings::update_romlist_after_edit(
Expand Down
2 changes: 2 additions & 0 deletions src/fe_settings.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ class FeSettings : public FeBaseConfigurable
ScreenSaverTimeout,
DisplaysMenuExit,
HideBrackets,
RandomiseArtwork,
GroupClones,
StartupMode,
PrefixMode,
Expand Down Expand Up @@ -253,6 +254,7 @@ class FeSettings : public FeBaseConfigurable
bool m_custom_languages;
bool m_displays_menu_exit;
bool m_hide_brackets;
bool m_randomise_artwork;
bool m_group_clones;
StartupModeType m_startup_mode;
PrefixModeType m_prefix_mode;
Expand Down
Loading