1. 设置界面代码上传

fmp_settings.cpp

@@ -3,8 +3,12 @@
 #include <fmp_logger_i.h>
 #include <ctkServiceReference.h>
 #include <ctkPluginContext.h>
+#include "ui/window.h"
 #include <QDebug>
 
+#ifdef Q_OS_WIN
+#undef StartService
+#endif
 
 /**
  * @brief The FMPSettings class
@@ -72,6 +76,10 @@ int FMPSettingsPrivate::Init()
     if (!_sets) {
         _sets = new QSettings(_ctx->getProperty(FMP_PROPKEY_CFG).toString(), QSettings::IniFormat);
     }
+    else {
+        FMPSettingsWindow * set_dlg = new FMPSettingsWindow;
+        set_dlg->show();
+    }
 
     return FMP_SUCCESS;
 }

fmp_settings.pro

@@ -4,16 +4,18 @@
 #
 #-------------------------------------------------
 
-QT       -= gui
+QT       += widgets
 TEMPLATE = lib
 
 SOURCES += fmp_settings.cpp \
-    fmp_settings_plugin.cpp
+    fmp_settings_plugin.cpp \
+    ui/window.cpp
 
 HEADERS += fmp_settings.h \
     fmp_settings_i.h \
     fmp_settings_plugin_p.h \
-    fmp_settings_def.h
+    fmp_settings_def.h \
+    ui/window.h
 
 unix {
     target.path = /usr/lib
@@ -28,6 +30,7 @@ TARGET = $${TARGET}_$${VER}
 #Header path
 INCLUDEPATH += $$PWD/../include/ctk \
             += $$PWD/../include/interface \
+            += $$PWD/../include/window
 
 #Library path
 LIBS += -L$$PWD/../lib
@@ -44,12 +47,18 @@ CONFIG(debug, debug|release) {
 
 #
 RESOURCES += \
-    res/$${ORIGIN_TARGET}.qrc
+    res/$${ORIGIN_TARGET}.qrc \
+    res/images.qrc
 
 win32 {
     RC_FILE += res/$${ORIGIN_TARGET}.rc
     system($$PWD/../fmprc.bat $$PWD/version.h $$ORIGIN_TARGET)
+
+    LIBS += -luser32
 }
 else {
     system($$PWD/../fmprc.sh $$PWD/version.h $$ORIGIN_TARGET)
 }
+
+FORMS += \
+    ui/window.ui

res/images.qrc

+<RCC>
+    <qresource prefix="/">
+        <file>images/arrow_down.png</file>
+    </qresource>
+</RCC>

ui/window.cpp

+#include "window.h"
+#include "ui_window.h"
+
+FMPSettingsWindow::FMPSettingsWindow(QWidget *parent) :
+    FMPWindow(parent),
+    ui(new Ui::FMPSettingsWindow)
+{
+    ui->setupUi(this);
+    connect(ui->btn_close, SIGNAL(clicked(bool)), SLOT(close()));
+}
+
+FMPSettingsWindow::~FMPSettingsWindow()
+{
+    delete ui;
+}

ui/window.h

+#ifndef FMP_SETS_DLG_H
+#define FMP_SETS_DLG_H
+
+#include <fmp_window.hpp>
+#include <QWidget>
+
+namespace Ui {
+class FMPSettingsWindow;
+}
+
+class FMPSettingsWindow : public FMPWindow
+{
+    Q_OBJECT
+
+public:
+    explicit FMPSettingsWindow(QWidget *parent = 0);
+    ~FMPSettingsWindow();
+
+private:
+    Ui::FMPSettingsWindow *ui;
+};
+
+#endif // FMP_SETS_DLG_H

version.h

@@ -5,7 +5,7 @@
 #define VER_MINOR 1
 #define VER_REVISION 0
 
-#define VER_BUILD 5
+#define VER_BUILD 6
 
 //! Convert version numbers to string
 #define _STR(S)  #S