From 88d18550ff92ae3ec6b1ae342b771bd0d7ec9730 Mon Sep 17 00:00:00 2001 From: EndrII Date: Sun, 3 Jun 2018 15:37:16 +0300 Subject: [PATCH] qt 5.5 done --- source/CPP/about.cpp | 25 +++++++++++++++++++++++-- source/CPP/about.h | 4 ++-- source/CPP/about.ui | 22 +++++++++++++++++----- source/CPP/mainmanager.cpp | 2 +- source/QtDeployer.pro | 24 ++++++++++++++++-------- source/main.cpp | 32 +++++++++++++++++++++++--------- source/mainwindow.cpp | 21 ++++++++++++++++----- source/mainwindow.h | 2 +- 8 files changed, 99 insertions(+), 33 deletions(-) diff --git a/source/CPP/about.cpp b/source/CPP/about.cpp index 242dd5d..c36147d 100644 --- a/source/CPP/about.cpp +++ b/source/CPP/about.cpp @@ -1,13 +1,34 @@ #include "about.h" #include "ui_about.h" +#include About::About(QWidget *parent) : - QWidget(parent), + QDialog(parent), ui(new Ui::About) { ui->setupUi(this); -} + this->setModal(true); + + ui->logo->setText(""); + QString text = QString("

 

" + "

%0
%1 QtLinuxDeployer

" + "


%2
* %3 %4.
* %5 %6.

" + "

%7

" + "

%8 EndrII
Copyright (C) 12 Mar 2018 - Apr 10, 2018" + " ShahriarSS.
Copyright (C) Apr 10, 2018QuasarApp.

"). + arg( + tr("This application forked by ShahriarSS"), + tr("Page of original soft:"), + tr("Developers of fork:"), + tr("Programmer:"), + tr("Yankovich Andrei"), + tr("Designer:"), + tr("Bakovets Alina"), + tr("This application is distributed under the LGPLv3 license."), + tr("Contact:")); + ui->text->setText(text); +} About::~About() { delete ui; diff --git a/source/CPP/about.h b/source/CPP/about.h index 41298f8..474a0d2 100644 --- a/source/CPP/about.h +++ b/source/CPP/about.h @@ -1,13 +1,13 @@ #ifndef ABOUT_H #define ABOUT_H -#include +#include namespace Ui { class About; } -class About : public QWidget +class About : public QDialog { Q_OBJECT diff --git a/source/CPP/about.ui b/source/CPP/about.ui index 706b751..f3f04ed 100644 --- a/source/CPP/about.ui +++ b/source/CPP/about.ui @@ -1,30 +1,42 @@ About - + 0 0 400 - 244 + 400 + + + 400 + 400 + + + + + 400 + 400 + + - Form + About - 100 + 0 100 - 100 + 99999 100 diff --git a/source/CPP/mainmanager.cpp b/source/CPP/mainmanager.cpp index 295fd92..0c78123 100755 --- a/source/CPP/mainmanager.cpp +++ b/source/CPP/mainmanager.cpp @@ -56,7 +56,7 @@ void MainManager::prepare(const QString &qtdir, const QString &projectdir) void MainManager::deploy(const QStringList& list){ m_cpp->setCppLibraries(list); - start(false); + start(true); } void MainManager::start(bool erase) diff --git a/source/QtDeployer.pro b/source/QtDeployer.pro index 97618c2..a461b15 100755 --- a/source/QtDeployer.pro +++ b/source/QtDeployer.pro @@ -41,13 +41,7 @@ SOURCES += \ CPP/outputmanager.cpp \ CPP/pluginmanager.cpp \ CPP/qmlmanager.cpp \ - CPP/buildmanager.cpp \ - mainwindow.cpp \ - CPP/buildpage.cpp \ - CPP/deploypage.cpp \ - CPP/listmodel.cpp \ - CPP/listviewdelegate.cpp \ - CPP/about.cpp + CPP/buildmanager.cpp HEADERS += \ CPP/baseclass.h \ @@ -56,13 +50,27 @@ HEADERS += \ CPP/outputmanager.h \ CPP/pluginmanager.h \ CPP/qmlmanager.h \ - CPP/buildmanager.h \ + CPP/buildmanager.h + + +lessThan(QT_MINOR_VERSION, 6){ + +SOURCES += \ + mainwindow.cpp \ + CPP/buildpage.cpp \ + CPP/deploypage.cpp \ + CPP/listmodel.cpp \ + CPP/listviewdelegate.cpp \ + CPP/about.cpp + +HEADERS += \ mainwindow.h \ CPP/buildpage.h \ CPP/deploypage.h \ CPP/listmodel.h \ CPP/listviewdelegate.h \ CPP/about.h +} TRANSLATIONS += \ languages/en.ts diff --git a/source/main.cpp b/source/main.cpp index 64c6368..068826e 100755 --- a/source/main.cpp +++ b/source/main.cpp @@ -1,4 +1,6 @@ -#if QT_VERSION > 0x050501 +#include + +#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)) #include #include #include @@ -16,22 +18,24 @@ #include "CPP/pluginmanager.h" #include "CPP/qmlmanager.h" #include "CPP/buildmanager.h" +#include -bool loadTr(QGuiApplication *app){ - QTranslator translator; +bool initLocale(const QString &locale, QGuiApplication& app, QTranslator &translator){ QString defaultLocale = QLocale::system().name(); defaultLocale.truncate(defaultLocale.lastIndexOf('_')); + if(!locale.isEmpty() && translator.load(QString(":/languages/%0").arg(locale))){ + return app.installTranslator(&translator); + } + if(!translator.load(QString(":/languages/%0").arg(defaultLocale))){ return false; } - app->installTranslator(&translator); - - return true; + return app.installTranslator(&translator); } int main(int argc, char *argv[]) @@ -39,7 +43,7 @@ int main(int argc, char *argv[]) QGuiApplication *app;; -#if QT_VERSION > 0x050501 +#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) app = new QGuiApplication(argc, argv); #else app = new QApplication(argc, argv); @@ -49,7 +53,17 @@ int main(int argc, char *argv[]) app->setWindowIcon(QIcon("://icon")); - loadTr(app); + QTranslator translator; + + QString locale = ""; + + if(argc > 1) { + locale = QString::fromLatin1(argv[1]); + } + + if(!initLocale(locale, *app, translator)){ + std::cout << "error load language : " << locale.toStdString() < 0x050501 +#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) QQmlApplicationEngine engine; auto *R = engine.rootContext(); diff --git a/source/mainwindow.cpp b/source/mainwindow.cpp index 08fba32..d6c65d0 100644 --- a/source/mainwindow.cpp +++ b/source/mainwindow.cpp @@ -1,6 +1,7 @@ #include "mainwindow.h" #include "ui_mainwindow.h" #include +#include "CPP/about.h" MainWindow::MainWindow(MainManager * mainManager, QWidget *parent) : QMainWindow(parent), @@ -9,6 +10,7 @@ MainWindow::MainWindow(MainManager * mainManager, QWidget *parent) : _mainManager = mainManager; ui->setupUi(this); + buidlpage = new BuildPage(this); deployPage = new DeployPage(_mainManager->getCpp() ,this); @@ -17,8 +19,8 @@ MainWindow::MainWindow(MainManager * mainManager, QWidget *parent) : ui->stackedWidget->setCurrentIndex(0); + initMenu(); - connect(ui->menubar, SIGNAL(build(QString,QString)), _mainManager, SLOT(prepare(QString,QString))); connect(buidlpage, SIGNAL(build(QString,QString)), _mainManager, SLOT(prepare(QString,QString))); connect(_mainManager->getBuild(), SIGNAL(logChanged(QString)), buidlpage, SLOT(log(QString))); connect(_mainManager->getBuild(), SIGNAL(finished()), this, SLOT(buidlFinisfed())); @@ -32,14 +34,23 @@ void MainWindow::newDeploy(){ } void MainWindow::initMenu(){ - QAction *deploy = new QAction(tr("new deploy")); + + QMenu *file = new QMenu(tr("Qt-Deployer")); + + QAction *deploy = new QAction(tr("new deploy"), this); connect(deploy, SIGNAL(triggered(bool)),SLOT(newDeploy())); - ui->menubar->addAction(deploy); + file->addAction(deploy); - QAction *about = new QAction(tr("about")); + QAction *about = new QAction(tr("about"), this); connect(about, SIGNAL(triggered(bool)),SLOT(about())); - ui->menubar->addAction(about); + file->addAction(about); + ui->menubar->addMenu(file); + +} + +void MainWindow::about(){ + (new About())->show(); } void MainWindow::buidlFinisfed(){ diff --git a/source/mainwindow.h b/source/mainwindow.h index e476bc2..71549c7 100644 --- a/source/mainwindow.h +++ b/source/mainwindow.h @@ -20,7 +20,7 @@ private: BuildPage *buidlpage; DeployPage *deployPage; - initMenu(); + void initMenu(); private slots: void buidlFinisfed();