Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3850 from zhaowenlan1779/swkbd

Browse source 
applets/swkbd: Software Keyboard Implementation
This commit is contained in:
James Rowe 2018-07-17 09:02:55 -06:00 • committed by GitHub
commit bf6da61da5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 774 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/citra_qt/main.cpp
View file

@ -16,6 +16,7 @@
#include <QtGui>
#include <QtWidgets>
#include "citra_qt/aboutdialog.h"
#include "citra_qt/applets/swkbd.h"
#include "citra_qt/bootmanager.h"
#include "citra_qt/camera/qt_multimedia_camera.h"
#include "citra_qt/camera/still_image_camera.h"
@ -50,6 +51,7 @@
#include "common/string_util.h"
#include "core/core.h"
#include "core/file_sys/archive_source_sd_savedata.h"
#include "core/frontend/applets/default_applets.h"
#include "core/gdbstub/gdbstub.h"
#include "core/hle/service/fs/archive.h"
#include "core/loader/loader.h"
@ -1468,6 +1470,10 @@ int main(int argc, char* argv[]) {
Camera::RegisterFactory("qt", std::make_unique<Camera::QtMultimediaCameraFactory>());
Camera::QtMultimediaCameraHandler::Init();
// Register frontend applets
Frontend::RegisterDefaultApplets();
Frontend::RegisterSoftwareKeyboard(std::make_shared<QtKeyboard>(main_window));
main_window.show();
return app.exec();
}