1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

feat(importProfile): Add way to import profile

close  #1872
change based on pr #2140 by @agilob
This commit is contained in:
PKEv 2016-04-25 17:46:08 +03:00
parent 6dd1cd0320
commit 9ea25d1fbd
7 changed files with 150 additions and 3 deletions

View File

@ -483,7 +483,8 @@ SOURCES += \
src/widget/about/aboutuser.cpp \ src/widget/about/aboutuser.cpp \
src/persistence/db/rawdatabase.cpp \ src/persistence/db/rawdatabase.cpp \
src/persistence/history.cpp \ src/persistence/history.cpp \
src/widget/form/groupinviteform.cpp src/widget/form/groupinviteform.cpp \
src/widget/tool/profileimporter.cpp
HEADERS += \ HEADERS += \
src/audio/audio.h \ src/audio/audio.h \
@ -540,4 +541,5 @@ HEADERS += \
src/widget/about/aboutuser.h \ src/widget/about/aboutuser.h \
src/persistence/db/rawdatabase.h \ src/persistence/db/rawdatabase.h \
src/persistence/history.h \ src/persistence/history.h \
src/widget/form/groupinviteform.h src/widget/form/groupinviteform.h \
src/widget/tool/profileimporter.h

View File

@ -42,7 +42,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="newPage"> <widget class="QWidget" name="newPage">
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_5">
@ -333,6 +333,13 @@
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_6"> <layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QPushButton" name="importButton">
<property name="text">
<string>Import</string>
</property>
</widget>
</item>
<item> <item>
<spacer name="horizontalSpacer_2"> <spacer name="horizontalSpacer_2">
<property name="orientation"> <property name="orientation">

View File

@ -27,6 +27,7 @@
#include "src/widget/form/setpassworddialog.h" #include "src/widget/form/setpassworddialog.h"
#include "src/widget/translator.h" #include "src/widget/translator.h"
#include "src/widget/style.h" #include "src/widget/style.h"
#include "src/widget/tool/profileimporter.h"
#include <QMessageBox> #include <QMessageBox>
#include <QDebug> #include <QDebug>
@ -54,6 +55,7 @@ LoginScreen::LoginScreen(QWidget *parent) :
connect(ui->newPass, &QLineEdit::textChanged, this, &LoginScreen::onPasswordEdited); connect(ui->newPass, &QLineEdit::textChanged, this, &LoginScreen::onPasswordEdited);
connect(ui->newPassConfirm, &QLineEdit::textChanged, this, &LoginScreen::onPasswordEdited); connect(ui->newPassConfirm, &QLineEdit::textChanged, this, &LoginScreen::onPasswordEdited);
connect(ui->autoLoginCB, &QCheckBox::stateChanged, this, &LoginScreen::onAutoLoginToggled); connect(ui->autoLoginCB, &QCheckBox::stateChanged, this, &LoginScreen::onAutoLoginToggled);
connect(ui->importButton, &QPushButton::clicked, this, &LoginScreen::onImportProfile);
reset(); reset();
this->setStyleSheet(Style::getStylesheet(":/ui/loginScreen/loginScreen.css")); this->setStyleSheet(Style::getStylesheet(":/ui/loginScreen/loginScreen.css"));
@ -255,3 +257,13 @@ void LoginScreen::retranslateUi()
{ {
ui->retranslateUi(this); ui->retranslateUi(this);
} }
void LoginScreen::onImportProfile()
{
ProfileImporter *pi = new ProfileImporter(this);
if(pi->importProfile() == true)
{
reset();
}
delete pi;
}

View File

@ -54,6 +54,7 @@ private slots:
// Buttons to submit form // Buttons to submit form
void onCreateNewProfile(); void onCreateNewProfile();
void onLogin(); void onLogin();
void onImportProfile();
private: private:
void retranslateUi(); void retranslateUi();

View File

@ -0,0 +1,85 @@
/*
Copyright © 2015-2016 by The qTox Project
This file is part of qTox, a Qt-based graphical interface for Tox.
qTox is libre software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
qTox is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with qTox. If not, see <http://www.gnu.org/licenses/>.
*/
#include "profileimporter.h"
#include <QString>
#include <QFile>
#include <QDir>
#include <QFileDialog>
#include <QFileInfo>
#include "src/persistence/settings.h"
#include "src/core/core.h"
#include "src/widget/gui.h"
#include <QDebug>
#include <QMessageBox>
ProfileImporter::ProfileImporter(QWidget *parent) : QWidget(parent)
{
}
bool ProfileImporter::importProfile()
{
QString path = QFileDialog::getOpenFileName( this,
tr("Import profile", "import dialog title"),
QDir::homePath(),
tr("Tox save file (*.tox)", "import dialog filter") );
if (path.isEmpty())
return false;
QFileInfo info(path);
QString profile = info.completeBaseName();
if (info.suffix() != "tox")
{
QMessageBox::warning( this,
tr("Ignoring non-Tox file", "popup title"),
tr("Warning: You have chosen a file that is not a Tox save file; ignoring.", "popup text"),
QMessageBox::Ok);
return false; //ingore importing non-tox file
}
QString profilePath = QDir(Settings::getInstance().getSettingsDirPath()).filePath(profile + Core::TOX_EXT);
if (QFileInfo(profilePath).exists())
{
QMessageBox::StandardButton reply;
reply = QMessageBox::warning( this,
tr("Profile already exists", "import confirm title"),
tr("A profile named \"%1\" already exists. Do you want to erase it?", "import confirm text").arg(profile),
QMessageBox::Yes | QMessageBox::No);
if (reply == QMessageBox::Yes)
{
QFile::copy(path, profilePath);
return true; //import successfull
}
else
{
return false; //import canelled
}
}
else
{
QFile::copy(path, profilePath);
return true; //import successfull
}
}

View File

@ -0,0 +1,38 @@
/*
Copyright © 2015-2016 by The qTox Project
This file is part of qTox, a Qt-based graphical interface for Tox.
qTox is libre software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
qTox is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with qTox. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PROFILEIMPORTER_H
#define PROFILEIMPORTER_H
#include <QWidget>
class ProfileImporter : public QWidget
{
Q_OBJECT
public:
explicit ProfileImporter(QWidget *parent = 0);
bool importProfile();
signals:
public slots:
};
#endif // PROFILEIMPORTER_H

View File

@ -36,6 +36,7 @@ QStackedWidget QPushButton
} }
#loginButton, #loginButton,
#importButton,
#createAccountButton { #createAccountButton {
border-radius:5px; border-radius:5px;
padding:5px; padding:5px;
@ -43,6 +44,7 @@ QStackedWidget QPushButton
} }
#loginButton:hover, #loginButton:hover,
#importButton:hover,
#createAccountButton:hover { #createAccountButton:hover {
background: #0c530d; background: #0c530d;
} }