Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address Issue 1063: Compatibility azerty

Browse Source 
It's dynamic, no need to relog!
Look under input preferences for "Use azerty layout instead of qwerty layout"
This commit is contained in:
Inusaito Sayori
2014-06-11 20:02:34 -04:00
parent 3cff5cd1a8
commit 973a90a34d
7 changed files with 399 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llappviewer.cpp
View File

@@ -588,6 +588,18 @@ public:
}
};
void load_default_bindings(bool zqsd)
{
gViewerKeyboard.unloadBindings();
const std::string keys(zqsd ? "keysZQSD.ini" : "keys.ini");
if (!gViewerKeyboard.loadBindings(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, keys)))
{
LL_ERRS("InitInfo") << "Unable to open " << keys << LL_ENDL;
}
// Load Custom bindings (override defaults)
gViewerKeyboard.loadBindings(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"custom_keys.ini"));
}
bool LLAppViewer::init()
{
setupErrorHandling();
@@ -872,12 +884,7 @@ bool LLAppViewer::init()
bind_keyboard_functions();
// Load Default bindings
if (!gViewerKeyboard.loadBindings(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"keys.ini")))
{
LL_ERRS("InitInfo") << "Unable to open keys.ini" << LL_ENDL;
}
// Load Custom bindings (override defaults)
gViewerKeyboard.loadBindings(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"custom_keys.ini"));
load_default_bindings(gSavedSettings.getBOOL("LiruUseZQSDKeys"));
// If we don't have the right GL requirements, exit.
if (!gGLManager.mHasRequirements && !gNoRender)