diff --git a/.gitignore b/.gitignore index 6732e72..c6f5425 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,5 @@ Makefile* # QtCtreator CMake CMakeLists.txt.user* +msvc_make.bat + diff --git a/NEU-Monitor.pro b/NEU-Monitor.pro index 0cd9985..25741d5 100644 --- a/NEU-Monitor.pro +++ b/NEU-Monitor.pro @@ -39,3 +39,4 @@ RESOURCES += \ resource.qrc RC_ICONS = icons\favicon.ico + diff --git a/main.cpp b/main.cpp index b7cf92e..122288b 100644 --- a/main.cpp +++ b/main.cpp @@ -1,4 +1,4 @@ -#include "maintray.h" +#include "maintray.h" #include #include #include @@ -6,10 +6,7 @@ int main(int argc, char *argv[]) { - QTranslator t; - t.load(QString(":/translations/qt_zh_CN.qm")); QApplication a(argc, argv); - a.installTranslator(&t); a.setQuitOnLastWindowClosed(false); a.setApplicationName(QObject::tr("NEU-Monitor")); a.setWindowIcon(QIcon(QObject::tr(":/icon/favicon.ico"))); diff --git a/maintray.cpp b/maintray.cpp index ab4ca7c..4fdf04b 100644 --- a/maintray.cpp +++ b/maintray.cpp @@ -1,4 +1,5 @@ -#include "maintray.h" +#include "maintray.h" + MainTray::MainTray(QObject *parent) : QSystemTrayIcon(parent), //初始化menu @@ -320,7 +321,8 @@ QString MainTray::getQtVersion() QString MainTray::getGccVersion() { - return QString::number(__GNUC__)+tr(".")+QString::number(__GNUC_MINOR__)+tr(".")+QString::number(__GNUC_PATCHLEVEL__); + return *(new QString()); +// return QString::number(__GNUC__)+tr(".")+QString::number(__GNUC_MINOR__)+tr(".")+QString::number(__GNUC_PATCHLEVEL__); } //void MainTray::openLogFile() diff --git a/maintray.h b/maintray.h index 3a85602..a7846cb 100644 --- a/maintray.h +++ b/maintray.h @@ -1,6 +1,10 @@ -#ifndef MAINTRAY_H +#ifndef MAINTRAY_H #define MAINTRAY_H +#if _MSC_VER >= 1600 +#pragma execution_character_set("utf-8") +#endif + #include #include #include diff --git a/netcontroller.cpp b/netcontroller.cpp index 1a768cf..27e99e3 100644 --- a/netcontroller.cpp +++ b/netcontroller.cpp @@ -1,4 +1,4 @@ -#include "netcontroller.h" +#include "netcontroller.h" NetController::NetController(QByteArray id, QByteArray passwd, QObject *parent) : QObject(parent), username(id), password(passwd), manager(this) diff --git a/netcontroller.h b/netcontroller.h index 8ee5b3f..49ba542 100644 --- a/netcontroller.h +++ b/netcontroller.h @@ -1,4 +1,4 @@ -#ifndef NETCONTROLLER_H +#ifndef NETCONTROLLER_H #define NETCONTROLLER_H #include diff --git a/optionswindow.cpp b/optionswindow.cpp index f35e6c0..0d59a7d 100644 --- a/optionswindow.cpp +++ b/optionswindow.cpp @@ -1,4 +1,4 @@ -#include "optionswindow.h" +#include "optionswindow.h" OptionsWindow::OptionsWindow(QByteArray id, QByteArray pass, int traffic, QWidget *parent) : QMainWindow(parent) { @@ -13,12 +13,14 @@ OptionsWindow::OptionsWindow(QByteArray id, QByteArray pass, int traffic, QWidge idEdit = new QLineEdit(this); idEdit->setText(id); + idEdit->setPlaceholderText(tr("学(工)号")); passwordEdit = new QLineEdit(this); passwordEdit->setEchoMode(QLineEdit::Password); passwordEdit->setContextMenuPolicy(Qt::NoContextMenu); passwordEdit->setText(pass); passwordEdit->setToolTip(tr("密码仅用于登陆")); + passwordEdit->setPlaceholderText(tr("请输入密码")); // mobileCheck = new QCheckBox(tr("作为移动端登陆"), this); // mobileCheck->setChecked(isMobile); diff --git a/optionswindow.h b/optionswindow.h index 8688146..2528d16 100644 --- a/optionswindow.h +++ b/optionswindow.h @@ -1,6 +1,10 @@ -#ifndef OPTIONSWINDOW_H +#ifndef OPTIONSWINDOW_H #define OPTIONSWINDOW_H +#if _MSC_VER >= 1600 +#pragma execution_character_set("utf-8") +#endif + #include #include #include diff --git a/qt/etc/qt.conf b/qt/etc/qt.conf deleted file mode 100644 index 629705c..0000000 --- a/qt/etc/qt.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Paths] -Plugins = /usr/lib/qt/plugins/ diff --git a/resource.qrc b/resource.qrc index e07f256..fdedcf8 100644 --- a/resource.qrc +++ b/resource.qrc @@ -1,10 +1,8 @@ - translations/qt_zh_CN.qm icons/favicon.ico icons/offline.ico resource/SourceHanSansCN-Regular.otf - qt/etc/qt.conf diff --git a/translations/qt_zh_CN.qm b/translations/qt_zh_CN.qm deleted file mode 100644 index d6f3648..0000000 Binary files a/translations/qt_zh_CN.qm and /dev/null differ