Commit 0ab1dd7a authored by captainwong's avatar captainwong

qt lib add HttpDlg

parent d7094cf5
#include "ErrorCode.h"
#include <QObject>
namespace
{
struct CommonErrorCatagory : public std::error_category
{
const char* name() const noexcept override {
return "Common Error";
}
std::string message(int ev) const override {
switch (static_cast<JLIBQT_NAMESPACE DatabaseErrorCode>(ev)) {
case JLIBQT_NAMESPACE DatabaseErrorCode::OpenDbFailed:
return QObject::tr("Failed to open database").toLocal8Bit().toStdString();
case JLIBQT_NAMESPACE DatabaseErrorCode::CreateDbTableFailed:
return QObject::tr("Failed to create table").toLocal8Bit().toStdString();
case JLIBQT_NAMESPACE DatabaseErrorCode::QueryDbFailed:
return QObject::tr("Failed to query database").toLocal8Bit().toStdString();
default:
return QObject::tr("Unkown Error").toLocal8Bit().toStdString();
}
}
};
static const CommonErrorCatagory theDatabaseErrorCatagory = {};
}
std::error_code std::make_error_code(JLIBQT_NAMESPACE DatabaseErrorCode ec)
{
return { static_cast<int>(ec), theDatabaseErrorCatagory };
}
...@@ -23,7 +23,7 @@ inline QString ecStringWithCategory(const std::error_code& ec) { ...@@ -23,7 +23,7 @@ inline QString ecStringWithCategory(const std::error_code& ec) {
break; \ break; \
} }
enum class CommonErrorCode { enum class DatabaseErrorCode {
OpenDbFailed = 1, OpenDbFailed = 1,
CreateDbTableFailed, CreateDbTableFailed,
QueryDbFailed, QueryDbFailed,
...@@ -32,48 +32,16 @@ enum class CommonErrorCode { ...@@ -32,48 +32,16 @@ enum class CommonErrorCode {
JLIBQT_NAMESPACE_END JLIBQT_NAMESPACE_END
namespace std
{
#define ENABLE_ENUM_AS_ERROR_CODE(type) \ #define ENABLE_ENUM_AS_ERROR_CODE(type) \
namespace std { \
template <> struct is_error_code_enum<type> : true_type {}; \ template <> struct is_error_code_enum<type> : true_type {}; \
std::error_code make_error_code(type); std::error_code make_error_code(type); \
ENABLE_ENUM_AS_ERROR_CODE(JLIBQT_NAMESPACE CommonErrorCode)
} }
namespace ENABLE_ENUM_AS_ERROR_CODE(JLIBQT_NAMESPACE DatabaseErrorCode)
{
struct CommonErrorCatagory : public std::error_category
{
const char* name() const noexcept override {
return "Common Error";
}
std::string message(int ev) const override {
switch (static_cast<JLIBQT_NAMESPACE CommonErrorCode>(ev)) {
case JLIBQT_NAMESPACE CommonErrorCode::OpenDbFailed:
return QObject::tr("Failed to open database").toLocal8Bit().toStdString();
case JLIBQT_NAMESPACE CommonErrorCode::CreateDbTableFailed:
return QObject::tr("Failed to create table").toLocal8Bit().toStdString();
case JLIBQT_NAMESPACE CommonErrorCode::QueryDbFailed:
return QObject::tr("Failed to query database").toLocal8Bit().toStdString();
default:
return QObject::tr("Unkown Error").toLocal8Bit().toStdString();
}
}
};
static const CommonErrorCatagory theCommonErrorCatagory = {};
}
inline std::error_code std::make_error_code(JLIBQT_NAMESPACE CommonErrorCode ec)
{
return { static_cast<int>(ec), theCommonErrorCatagory };
}
std::error_code std::make_error_code(JLIBQT_NAMESPACE DatabaseErrorCode ec);
#include "HttpDlgErrorCode.h"
#include <QString>
#include <QObject>
namespace {
class HttpDlgErrorCategory : public std::error_category
{
public:
const char* name() const noexcept override {
return "HttpClient";
}
std::string message(int ev) const override {
switch (static_cast<JLIBQT_NAMESPACE HttpDlgErrorCode>(ev)) {
case JLIBQT_NAMESPACE HttpDlgErrorCode::Timeout:
return QObject::tr("Timeout").toLocal8Bit().toStdString();
break;
case JLIBQT_NAMESPACE HttpDlgErrorCode::ParseJsonError:
return QObject::tr("Cannot Parse Json").toLocal8Bit().toStdString();
break;
case JLIBQT_NAMESPACE HttpDlgErrorCode::HttpStatusNeq200:
return QObject::tr("HTTP Status Code != 200").toLocal8Bit().toStdString();
break;
default:
return QObject::tr("Unkown Error").toLocal8Bit().toStdString();
break;
}
}
};
const HttpDlgErrorCategory theHttpDlgErrorCategory = {};
}
std::error_code std::make_error_code(JLIBQT_NAMESPACE HttpDlgErrorCode ec)
{
return { static_cast<int>(ec), theHttpDlgErrorCategory };
}
#pragma once
#include <system_error>
#include <QString>
#include "../ErrorCode.h"
JLIBQT_NAMESPACE_BEGIN
enum class HttpDlgErrorCode {
Timeout = 1,
ParseJsonError,
HttpStatusNeq200,
Unknown,
};
JLIBQT_NAMESPACE_END
ENABLE_ENUM_AS_ERROR_CODE(JLIBQT_NAMESPACE HttpDlgErrorCode);
...@@ -2,19 +2,18 @@ ...@@ -2,19 +2,18 @@
#include <qmovie.h> #include <qmovie.h>
#include <qnetworkaccessmanager.h> #include <qnetworkaccessmanager.h>
#include <qnetworkreply.h> #include <qnetworkreply.h>
#include <jlib/qt/QtPathHelper.h> #include "../../QtUtils.h"
#include <jlib/qt/QtUtils.h> #include "../../QtStylesheet.h"
#include <jlib/qt/QtStylesheet.h>
#include "../Model/HttpDlgErrorCode.h" #include "../Model/HttpDlgErrorCode.h"
using namespace jlib::qt; using namespace jlib::qt;
//
//namespace HBVideoPlatform {
//namespace common {
namespace HBVideoPlatform { HttpDlg::HttpDlg(QWidget *parent, HttpDlgGif gif, int timeout)
namespace common {
HttpDlg::HttpDlg(QWidget *parent, HttpDlgViewSize sz, int timeout)
: QDialog(parent) : QDialog(parent)
, sz_(sz) , gif_(gif)
, time_out_sec_(timeout) , time_out_sec_(timeout)
{ {
setWindowModality(Qt::WindowModal); setWindowModality(Qt::WindowModal);
...@@ -23,7 +22,7 @@ HttpDlg::HttpDlg(QWidget *parent, HttpDlgViewSize sz, int timeout) ...@@ -23,7 +22,7 @@ HttpDlg::HttpDlg(QWidget *parent, HttpDlgViewSize sz, int timeout)
setAttribute(Qt::WA_TranslucentBackground); setAttribute(Qt::WA_TranslucentBackground);
} }
if (sz == sz_small) { if (gif == HttpDlgGif::Spinner1s_200px) {
setFixedSize(200, 200); setFixedSize(200, 200);
} else { } else {
setFixedSize(630, 637); setFixedSize(630, 637);
...@@ -34,9 +33,9 @@ HttpDlg::HttpDlg(QWidget *parent, HttpDlgViewSize sz, int timeout) ...@@ -34,9 +33,9 @@ HttpDlg::HttpDlg(QWidget *parent, HttpDlgViewSize sz, int timeout)
label_->move(0, 0); label_->move(0, 0);
elapse_ = new QLabel(this); elapse_ = new QLabel(this);
elapse_->resize(180, 80); elapse_->resize(64, 64);
elapse_->move((width() - elapse_->width()) / 2, (height() - elapse_->height()) / 2); elapse_->move((width() - elapse_->width()) / 2, (height() - elapse_->height()) / 2);
elapse_->setStyleSheet(build_style(Qt::darkYellow, 64)); elapse_->setStyleSheet(build_style(Qt::darkYellow, 12));
elapse_->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); elapse_->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
//elapse_->hide(); //elapse_->hide();
...@@ -50,24 +49,34 @@ HttpDlg::~HttpDlg() ...@@ -50,24 +49,34 @@ HttpDlg::~HttpDlg()
} }
void HttpDlg::get(const QUrl& url) void HttpDlg::get(const QUrl& url)
{
get(QNetworkRequest(url));
}
void HttpDlg::get(const QNetworkRequest& request)
{ {
if (connection_) { if (connection_) {
disconnect(connection_); disconnect(connection_);
} }
connection_ = connect(mgr, &QNetworkAccessManager::finished, this, &HttpDlg::onFinished); connection_ = connect(mgr, &QNetworkAccessManager::finished, this, &HttpDlg::onFinished);
reply_ = mgr->get(QNetworkRequest(url)); reply_ = mgr->get(request);
run(); run();
} }
void HttpDlg::post(const QUrl & url) void HttpDlg::post(const QUrl & url)
{
QNetworkRequest request(url);
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
post(request, QByteArray());
}
void HttpDlg::post(const QNetworkRequest& request)
{ {
if (connection_) { if (connection_) {
disconnect(connection_); disconnect(connection_);
} }
connection_ = connect(mgr, &QNetworkAccessManager::finished, this, &HttpDlg::onFinished); connection_ = connect(mgr, &QNetworkAccessManager::finished, this, &HttpDlg::onFinished);
QNetworkRequest request(url);
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
reply_ = mgr->post(request, QByteArray()); reply_ = mgr->post(request, QByteArray());
run(); run();
...@@ -83,23 +92,34 @@ void HttpDlg::post(const QNetworkRequest & request, const QByteArray & data) ...@@ -83,23 +92,34 @@ void HttpDlg::post(const QNetworkRequest & request, const QByteArray & data)
run(); run();
} }
QString HttpDlg::getGifPath()
{
switch (gif_) {
case HttpDlg::HttpDlgGif::Spinner1s_200px: return ":/jlibqt/Resources/Spinner-1s-200px.gif";
break;
default:
break;
}
return QString();
}
void HttpDlg::run() void HttpDlg::run()
{ {
auto path = PathHelper::program(); auto p = parentWidget();
path += sz_ == sz_small ? "/Skin/gif/ajax-loader-small.gif" : "/Skin/gif/preloader.gif"; if (p) {
p->setEnabled(false);
}
auto path = getGifPath();
auto movie = new QMovie(path); auto movie = new QMovie(path);
label_->setMovie(movie); label_->setMovie(movie);
movie->start(); movie->start();
timer_.start(); timer_.start();
timer_id_ = startTimer(1000);
auto p = parentWidget();
if (p) {
p->setEnabled(false);
}
startTimer(1000);
QDialog::exec(); QDialog::exec();
if (p) { if (p) {
p->setEnabled(true); p->setEnabled(true);
} }
...@@ -115,7 +135,8 @@ void HttpDlg::timerEvent(QTimerEvent * e) ...@@ -115,7 +135,8 @@ void HttpDlg::timerEvent(QTimerEvent * e)
} else { } else {
MYQCRITICAL << "timeout"; MYQCRITICAL << "timeout";
disconnect(connection_); disconnect(connection_);
result_ = HttpDlgErrorCode::NetworkError; killTimer(timer_id_);
result_ = HttpDlgErrorCode::Timeout;
QDialog::reject(); QDialog::reject();
} }
} }
...@@ -125,48 +146,50 @@ void HttpDlg::onFinished(QNetworkReply * reply) ...@@ -125,48 +146,50 @@ void HttpDlg::onFinished(QNetworkReply * reply)
do { do {
if (!reply) { if (!reply) {
MYQCRITICAL << "no reply"; MYQCRITICAL << "no reply";
result_ = HttpDlgErrorCode::NetworkError; result_ = HttpDlgErrorCode::Timeout;
break; break;
} }
if (QNetworkReply::NoError != reply->error()) { if (QNetworkReply::NoError != reply->error()) {
httpReason_ = reply->errorString(); httpReason_ = reply->errorString();
MYQCRITICAL << httpReason_; MYQCRITICAL << httpReason_;
result_ = HttpDlgErrorCode::NetworkError; result_ = HttpDlgErrorCode::Unknown;
break; //break;
} }
QVariant statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute); QVariant statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
if (!statusCode.isValid()) { if (!statusCode.isValid()) {
MYQDEBUG << "statusCode is not valid"; MYQDEBUG << "statusCode is not valid";
result_ = HttpDlgErrorCode::HttpStatusNeq200;
break; break;
} }
httpStatusCode_ = statusCode.toInt(); httpStatusCode_ = statusCode.toInt();
if (httpStatusCode_ != 200) { if (httpStatusCode_ != 200) {
result_ = HttpDlgErrorCode::NetworkError; result_ = HttpDlgErrorCode::HttpStatusNeq200;
httpReason_ = reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString(); httpReason_ = reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString();
MYQCRITICAL << httpStatusCode_ << httpReason_; MYQCRITICAL << httpStatusCode_ << httpReason_;
break; //break;
} }
auto res = reply->readAll(); auto res = reply->readAll();
Json::Reader reader; Json::Reader reader;
root_.clear(); root_.clear();
if (!reader.parse(res.constData(), root_)) { if (!reader.parse(res.constData(), root_)) {
//result_ = HttpDlgErrorCode::ParseJsonError; result_ = HttpDlgErrorCode::ParseJsonError;
//break; break;
} }
MYQDEBUG << reply->url() << "reply:\n" << root_.toStyledString().data(); MYQDEBUG << reply->url() << "reply:\n" << httpStatusCode_ << root_.toStyledString().data();
} while (false); } while (false);
killTimer(timer_id_);
QDialog::accept(); QDialog::accept();
reply->deleteLater(); reply->deleteLater();
} }
//
} //}
} //}
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <QUrl> #include <QUrl>
#include <QNetworkRequest> #include <QNetworkRequest>
#include <QByteArray> #include <QByteArray>
#include "../../Util/jsoncpp/json.h" #include <json/json.h>
class QNetworkAccessManager; class QNetworkAccessManager;
class QNetworkReply; class QNetworkReply;
...@@ -19,16 +19,18 @@ class HttpDlg : public QDialog ...@@ -19,16 +19,18 @@ class HttpDlg : public QDialog
Q_OBJECT Q_OBJECT
public: public:
enum HttpDlgViewSize { enum class HttpDlgGif {
sz_big, Spinner1s_200px,
sz_small,
}; };
HttpDlg(QWidget *parent = nullptr, HttpDlgViewSize sz = sz_small, int timeOut = 10); HttpDlg(QWidget *parent = nullptr, HttpDlgGif gif = HttpDlgGif::Spinner1s_200px, int timeOut = 10);
~HttpDlg(); ~HttpDlg();
void get(const QUrl& url); void get(const QUrl& url);
void get(const QNetworkRequest& request);
void post(const QUrl& url); void post(const QUrl& url);
void post(const QNetworkRequest& request);
void post(const QNetworkRequest& request, const QByteArray& data); void post(const QNetworkRequest& request, const QByteArray& data);
std::error_code get_result() const { return result_; } std::error_code get_result() const { return result_; }
...@@ -78,6 +80,7 @@ if (!JsoncppHelper::safelyGetStringValue(json, #name, name)) { \ ...@@ -78,6 +80,7 @@ if (!JsoncppHelper::safelyGetStringValue(json, #name, name)) { \
} }
protected: protected:
QString getGifPath();
void run(); void run();
virtual void timerEvent(QTimerEvent * e) override; virtual void timerEvent(QTimerEvent * e) override;
...@@ -90,13 +93,14 @@ private: ...@@ -90,13 +93,14 @@ private:
QString httpReason_ = {}; QString httpReason_ = {};
Json::Value root_ = {}; Json::Value root_ = {};
int time_out_sec_ = 10; int time_out_sec_ = 10;
int timer_id_ = 0;
QNetworkAccessManager* mgr = {}; QNetworkAccessManager* mgr = {};
QNetworkReply* reply_ = {}; QNetworkReply* reply_ = {};
QMetaObject::Connection connection_ = {}; QMetaObject::Connection connection_ = {};
QLabel* label_ = {}; QLabel* label_ = {};
QLabel* elapse_ = {}; QLabel* elapse_ = {};
HttpDlgViewSize sz_ = sz_big; HttpDlgGif gif_ = HttpDlgGif::Spinner1s_200px;
QElapsedTimer timer_ = {}; QElapsedTimer timer_ = {};
}; };
......
...@@ -25,6 +25,11 @@ ProgressDialog::~ProgressDialog() ...@@ -25,6 +25,11 @@ ProgressDialog::~ProgressDialog()
delete ui; delete ui;
} }
void ProgressDialog::setMaximum(int val)
{
ui->progressBar->setMaximum(val);
}
void ProgressDialog::timerEvent(QTimerEvent* e) void ProgressDialog::timerEvent(QTimerEvent* e)
{ {
auto secs = timer.elapsed() / 1000; auto secs = timer.elapsed() / 1000;
......
...@@ -16,6 +16,9 @@ public: ...@@ -16,6 +16,9 @@ public:
ProgressDialog(QWidget *parent = Q_NULLPTR, bool enable_close = true); ProgressDialog(QWidget *parent = Q_NULLPTR, bool enable_close = true);
~ProgressDialog(); ~ProgressDialog();
// default 1000
void setMaximum(int val);
// caller call this to update progress or close dialog // caller call this to update progress or close dialog
signals: signals:
void sig_progress(int pos); void sig_progress(int pos);
......
<RCC>
<qresource prefix="/jlibqt">
<file>Resources/Spinner-1s-200px.gif</file>
</qresource>
</RCC>
// Microsoft Visual C++ generated resource script.
//
#include "resource1.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "winres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// Ӣ() resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE 4, 2
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"resource1.h\0"
END
2 TEXTINCLUDE
BEGIN
"#include ""winres.h""\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Ӣ() resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
...@@ -12,8 +12,9 @@ ...@@ -12,8 +12,9 @@
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{B12702AD-ABFB-343A-A199-8E24837244A3}</ProjectGuid> <ProjectGuid>{B12702AD-ABFB-343A-A199-8E24837244A3}</ProjectGuid>
<Keyword>QtVS_v301</Keyword> <Keyword>QtVS_v304</Keyword>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<QtMsBuild Condition="'$(QtMsBuild)'=='' or !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
...@@ -25,17 +26,6 @@ ...@@ -25,17 +26,6 @@
<PlatformToolset>v142</PlatformToolset> <PlatformToolset>v142</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<PropertyGroup Condition="'$(QtMsBuild)'=='' or !Exists('$(QtMsBuild)\qt.targets')">
<QtMsBuild>$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<TargetName>jlibqt</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<TargetName>jlibqt</TargetName>
</PropertyGroup>
<Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')"> <Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
<Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." /> <Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." />
</Target> </Target>
...@@ -51,6 +41,14 @@ ...@@ -51,6 +41,14 @@
<ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')"> <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
<Import Project="$(QtMsBuild)\qt_defaults.props" /> <Import Project="$(QtMsBuild)\qt_defaults.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<TargetName>jlibqt</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<TargetName>jlibqt</TargetName>
</PropertyGroup>
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<QtInstall>5.9.8</QtInstall> <QtInstall>5.9.8</QtInstall>
<QtModules>core;gui;network;widgets</QtModules> <QtModules>core;gui;network;widgets</QtModules>
...@@ -70,7 +68,8 @@ ...@@ -70,7 +68,8 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<PreprocessorDefinitions>QT_LIB;BUILD_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>QT_LIB;BUILD_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\View;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.\GeneratedFiles\$(ConfigurationName);.\GeneratedFiles;.\View;$(DEVLIBS)\json\jsoncpp-1.9.4-install\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
...@@ -85,7 +84,8 @@ ...@@ -85,7 +84,8 @@
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<PreprocessorDefinitions>QT_LIB;BUILD_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>QT_LIB;BUILD_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\View;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.\GeneratedFiles\$(ConfigurationName);.\GeneratedFiles;.\View;$(DEVLIBS)\json\jsoncpp-1.9.4-install\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
...@@ -94,11 +94,14 @@ ...@@ -94,11 +94,14 @@
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="ErrorCode.cpp" />
<ClCompile Include="Model\HttpDlgErrorCode.cpp" />
<ClCompile Include="qt.cpp" /> <ClCompile Include="qt.cpp" />
<ClCompile Include="Util\QRunGuard.cpp" /> <ClCompile Include="Util\QRunGuard.cpp" />
<ClCompile Include="View\BaseScrollView.cpp" /> <ClCompile Include="View\BaseScrollView.cpp" />
<ClCompile Include="View\BgColorBtn.cpp" /> <ClCompile Include="View\BgColorBtn.cpp" />
<ClCompile Include="View\CheckBtn.cpp" /> <ClCompile Include="View\CheckBtn.cpp" />
<ClCompile Include="View\HttpDlg.cpp" />
<ClCompile Include="View\IconBtn.cpp" /> <ClCompile Include="View\IconBtn.cpp" />
<ClCompile Include="View\ProgressDialog.cpp" /> <ClCompile Include="View\ProgressDialog.cpp" />
<ClCompile Include="View\TextMenu.cpp" /> <ClCompile Include="View\TextMenu.cpp" />
...@@ -107,8 +110,11 @@ ...@@ -107,8 +110,11 @@
<ClCompile Include="View\RndButton.cpp" /> <ClCompile Include="View\RndButton.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="Model\HttpDlgErrorCode.h" />
<ClInclude Include="resource.h" /> <ClInclude Include="resource.h" />
<ClInclude Include="resource1.h" />
<ClInclude Include="Util\QRunGuard.h" /> <ClInclude Include="Util\QRunGuard.h" />
<QtMoc Include="View\HttpDlg.h" />
<QtMoc Include="View\ProgressDialog.h" /> <QtMoc Include="View\ProgressDialog.h" />
<QtMoc Include="View\TextMenu.h" /> <QtMoc Include="View\TextMenu.h" />
<QtMoc Include="View\PageView.h" /> <QtMoc Include="View\PageView.h" />
...@@ -132,6 +138,12 @@ ...@@ -132,6 +138,12 @@
<ItemGroup> <ItemGroup>
<QtUic Include="View\ProgressDialog.ui" /> <QtUic Include="View\ProgressDialog.ui" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ResourceCompile Include="qt.rc" />
</ItemGroup>
<ItemGroup>
<QtRcc Include="qt.qrc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')"> <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
<Import Project="$(QtMsBuild)\qt.targets" /> <Import Project="$(QtMsBuild)\qt.targets" />
......
...@@ -71,6 +71,15 @@ ...@@ -71,6 +71,15 @@
<ClCompile Include="Util\QRunGuard.cpp"> <ClCompile Include="Util\QRunGuard.cpp">
<Filter>Util</Filter> <Filter>Util</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="View\HttpDlg.cpp">
<Filter>View</Filter>
</ClCompile>
<ClCompile Include="Model\HttpDlgErrorCode.cpp">
<Filter>Model</Filter>
</ClCompile>
<ClCompile Include="ErrorCode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="qt.h"> <ClInclude Include="qt.h">
...@@ -106,6 +115,12 @@ ...@@ -106,6 +115,12 @@
<ClInclude Include="Util\QRunGuard.h"> <ClInclude Include="Util\QRunGuard.h">
<Filter>Util</Filter> <Filter>Util</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="resource1.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Model\HttpDlgErrorCode.h">
<Filter>Model</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="qt_global.h"> <ClInclude Include="qt_global.h">
...@@ -140,10 +155,23 @@ ...@@ -140,10 +155,23 @@
<QtMoc Include="View\ProgressDialog.h"> <QtMoc Include="View\ProgressDialog.h">
<Filter>View</Filter> <Filter>View</Filter>
</QtMoc> </QtMoc>
<QtMoc Include="View\HttpDlg.h">
<Filter>View</Filter>
</QtMoc>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<QtUic Include="View\ProgressDialog.ui"> <QtUic Include="View\ProgressDialog.ui">
<Filter>Form Files</Filter> <Filter>Form Files</Filter>
</QtUic> </QtUic>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ResourceCompile Include="qt.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<QtRcc Include="qt.qrc">
<Filter>Resource Files</Filter>
</QtRcc>
</ItemGroup>
</Project> </Project>
\ No newline at end of file
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by qt.rc
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment