mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-29 09:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Sven 2018-08-04 08:29:07 -04:00
commit deff1de2b7
8 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intl/msg_hash_ja.h
View File

@ -3490,6 +3490,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS_TITLE,
"設定")
MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_HELP,
"ヘルプ(&H)")
MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_HELP_ABOUT,
"RetroArchについて")
MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_HELP_DOCUMENTATION,
"ドキュメント")
MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_NAME,
"名前")
MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_LOAD_CUSTOM_CORE,
@ -3572,8 +3576,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_VIEW_TYPE_ICONS,
"アイコン")
MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_VIEW_TYPE_LIST,
"一覧")
MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_HELP_ABOUT,
"RetroArchについて")
MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS,
"オーバーライド")
MSG_HASH(MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS,

6
intl/msg_hash_us.h
View File

@ -3762,6 +3762,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS_TITLE,
"Options")
MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_HELP,
"&Help")
MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_HELP_ABOUT,
"About RetroArch")
MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_HELP_DOCUMENTATION,
"Documentation")
MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_LOAD_CUSTOM_CORE,
"Load Custom Core...")
MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_LOAD_CORE,
@ -3852,8 +3856,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_VIEW_TYPE_ICONS,
"Icons")
MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_VIEW_TYPE_LIST,
"List")
MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_HELP_ABOUT,
"About RetroArch")
MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS,
"Overrides")
MSG_HASH(MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS,

8
managers/cheat_manager.c
View File

@ -489,20 +489,18 @@ void cheat_manager_update(cheat_manager_t *handle, unsigned handle_idx)
void cheat_manager_toggle_index(unsigned i)
{
settings_t *settings = config_get_ptr();
if (!cheat_manager_state.cheats)
return;
cheat_manager_state.cheats[i].state = !cheat_manager_state.cheats[i].state;
cheat_manager_update(&cheat_manager_state, i);
settings_t *settings = config_get_ptr();
if ( !settings )
if (!settings)
return ;
if ( settings->bools.apply_cheats_after_toggle )
if (settings->bools.apply_cheats_after_toggle)
cheat_manager_apply_cheats();
}
void cheat_manager_toggle(void)

10
menu/menu_setting.c
View File

@ -516,15 +516,15 @@ static void setting_get_string_representation_uint_cheat_eqminus(void *data,
static void setting_get_string_representation_uint_cheat_browse_address(void *data,
char *s, size_t len)
{
rarch_setting_t *setting = (rarch_setting_t*)data;
unsigned int address = cheat_manager_state.browse_address;
unsigned int address_mask = 0;
unsigned int prev_val = 0;
unsigned int curr_val = 0 ;
rarch_setting_t *setting = (rarch_setting_t*)data;
if (setting)
snprintf(s, len, msg_hash_to_str(MENU_ENUM_LABEL_CHEAT_SEARCH_EQMINUS_VAL),
*setting->value.target.unsigned_integer, *setting->value.target.unsigned_integer);
unsigned int address = cheat_manager_state.browse_address;
unsigned int address_mask = 0;
unsigned int prev_val = 0;
unsigned int curr_val = 0 ;
cheat_manager_match_action(CHEAT_MATCH_ACTION_TYPE_BROWSE, cheat_manager_state.match_idx, &address, &address_mask, &prev_val, &curr_val) ;
snprintf(s, len, "Prev: %u Curr: %u", prev_val, curr_val) ;

1
msg_hash.h
View File

@ -1967,6 +1967,7 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_QT_COULD_NOT_UPDATE_PLAYLIST_ENTRY,
MENU_ENUM_LABEL_VALUE_QT_PLEASE_FILL_OUT_REQUIRED_FIELDS,
MENU_ENUM_LABEL_VALUE_QT_MENU_HELP_ABOUT,
MENU_ENUM_LABEL_VALUE_QT_MENU_HELP_DOCUMENTATION,
MENU_LABEL(MIDI_INPUT),
MENU_LABEL(MIDI_OUTPUT),

15
ui/drivers/qt/ui_qt_window.cpp
View File

@ -1067,6 +1067,8 @@ MainWindow::MainWindow(QWidget *parent) :
m_coreInfoLabel->setAlignment(Qt::AlignLeft | Qt::AlignTop);
m_coreInfoLabel->setTextFormat(Qt::RichText);
m_coreInfoLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
m_coreInfoLabel->setOpenExternalLinks(true);
m_coreInfoDock->setObjectName("coreInfoDock");
m_coreInfoDock->setProperty("default_area", Qt::RightDockWidgetArea);
@ -1542,6 +1544,7 @@ bool MainWindow::showMessageBox(QString msg, MessageBoxType msgType, Qt::WindowM
msgBox->setWindowModality(modality);
msgBox->setTextFormat(Qt::RichText);
msgBox->setTextInteractionFlags(Qt::TextBrowserInteraction);
if (showDontAsk)
{
@ -4551,13 +4554,18 @@ void MainWindow::showAbout()
{
QScopedPointer<QDialog> dialog(new QDialog());
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok);
QString text = QString("RetroArch ") + PACKAGE_VERSION + "<br><br>" + "<a href=\"http://www.libretro.com/\">http://www.libretro.com</a>";
QString text = QString("RetroArch ") + PACKAGE_VERSION +
"<br><br>" + "<a href=\"http://www.libretro.com/\">www.libretro.com</a>"
"<br><br>" + "<a href=\"http://www.retroarch.com/\">www.retroarch.com</a>";
QLabel *label = new QLabel(text, dialog.data());
QPixmap pix = getInvader();
QLabel *pixLabel = new QLabel();
label->setTextFormat(Qt::RichText);
label->setAlignment(Qt::AlignCenter);
label->setTextInteractionFlags(Qt::TextBrowserInteraction);
label->setOpenExternalLinks(true);
pixLabel->setAlignment(Qt::AlignCenter);
pixLabel->setPixmap(pix);
@ -4577,6 +4585,11 @@ void MainWindow::showAbout()
dialog->exec();
}
void MainWindow::showDocs()
{
QDesktopServices::openUrl(QUrl("http://docs.libretro.com/"));
}
const QPixmap getInvader()
{
QPixmap pix;

1
ui/drivers/ui_qt.cpp
View File

@ -324,6 +324,7 @@ static void* ui_companion_qt_init(void)
viewMenu->addAction(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS), mainwindow->viewOptionsDialog(), SLOT(showDialog()));
helpMenu = menu->addMenu(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_QT_MENU_HELP));
helpMenu->addAction(QString(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_QT_MENU_HELP_DOCUMENTATION)), mainwindow, SLOT(showDocs()));
helpMenu->addAction(QString(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_QT_MENU_HELP_ABOUT)) + "...", mainwindow, SLOT(showAbout()));
helpMenu->addAction("About Qt...", qApp, SLOT(aboutQt()));

1
ui/drivers/ui_qt.h
View File

@ -391,6 +391,7 @@ public slots:
void deleteCurrentPlaylistItem();
void onFileDropWidgetContextMenuRequested(const QPoint &pos);
void showAbout();
void showDocs();
private slots:
void onLoadCoreClicked(const QStringList &extensionFilters = QStringList());