thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port registration to Qml

Browse source
This commit is contained in:
Nicolas Werner 2022-01-28 15:24:56 +01:00
parent 573624a490
commit f28013dc18
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
12 changed files with 444 additions and 443 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/MainWindow.cpp
View file

@ -85,24 +85,10 @@ MainWindow::MainWindow(QWindow *parent)
setColor(Theme::paletteFromTheme(userSettings_->theme()).window().color());
setSource(QUrl(QStringLiteral("qrc:///qml/Root.qml")));
// modal_ = new OverlayModal(this);
// QFont font;
// font.setStyleStrategy(QFont::PreferAntialias);
// setFont(font);
trayIcon_ = new TrayIcon(QStringLiteral(":/logos/nheko.svg"), this);
// welcome_page_ = new WelcomePage(this);
// register_page_ = new RegisterPage(this);
//// Initialize sliding widget manager.
// connect(welcome_page_, SIGNAL(userRegister()), this, SLOT(showRegisterPage()));
connect(chat_page_, &ChatPage::closing, this, [this] { switchToLoginPage(""); });
// connect(
// chat_page_, &ChatPage::showOverlayProgressBar, this, &MainWindow::showOverlayProgressBar);
connect(chat_page_, &ChatPage::unreadMessages, this, &MainWindow::setWindowTitle);
connect(chat_page_, SIGNAL(unreadMessages(int)), trayIcon_, SLOT(setUnreadCount(int)));
connect(chat_page_, &ChatPage::showLoginPage, this, [this](const QString &msg) {
@ -117,13 +103,6 @@ MainWindow::MainWindow(QWindow *parent)
connect(chat_page_, SIGNAL(contentLoaded()), this, SLOT(removeOverlayProgressBar()));
// connect(login_page_, &LoginPage::loginOk, this, [this](const mtx::responses::Login &res) {
// http::client()->set_user(res.user_id);
// showChatPage();
// });
// connect(register_page_, &RegisterPage::registerOk, this, &MainWindow::showChatPage);
trayIcon_->setVisible(userSettings_->tray());
// load cache on event loop
@ -198,6 +177,7 @@ MainWindow::registerQmlTypes()
qmlRegisterType<MxcMediaProxy>("im.nheko", 1, 0, "MxcMedia");
qmlRegisterType<RoomDirectoryModel>("im.nheko", 1, 0, "RoomDirectoryModel");
qmlRegisterType<LoginPage>("im.nheko", 1, 0, "Login");
qmlRegisterType<RegisterPage>("im.nheko", 1, 0, "Registration");
qmlRegisterUncreatableType<DeviceVerificationFlow>(
"im.nheko",
1,
@ -460,7 +440,3 @@ MainWindow::showDialog(QWidget *dialog)
dialog->raise();
dialog->show();
}
void
MainWindow::showRegisterPage()
{}