Compare commits
No commits in common. "cb3ea2655357111584a078c6a669b7c7e53454c5" and "e49d7b974379ef5ff4e09e0d23aea10ab7caced8" have entirely different histories.
cb3ea26553
...
e49d7b9743
|
|
@ -1,4 +1,5 @@
|
||||||
#include "logger.h"
|
#include "logger.h"
|
||||||
|
#include "settings.h"
|
||||||
#include "mainwindow.h"
|
#include "mainwindow.h"
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
|
|
@ -12,7 +13,7 @@ int main(int argc, char *argv[])
|
||||||
Logging::setupLogging();
|
Logging::setupLogging();
|
||||||
// qCInfo(Application) << "Application starts 程序启动";
|
// qCInfo(Application) << "Application starts 程序启动";
|
||||||
qCInfo(Application, "Application starts 程序启动");
|
qCInfo(Application, "Application starts 程序启动");
|
||||||
qInfo("Application starts --- 程序启动");
|
Settings::instance();
|
||||||
|
|
||||||
MainWindow w;
|
MainWindow w;
|
||||||
w.show();
|
w.show();
|
||||||
|
|
|
||||||
|
|
@ -44,9 +44,9 @@ QVariant Settings::getDefaultValue(const QString& group, const QString& name)
|
||||||
else if(group == "Log" && name == "backups")
|
else if(group == "Log" && name == "backups")
|
||||||
return 5;
|
return 5;
|
||||||
else if(group == "Log" && name == "consoleOutput")
|
else if(group == "Log" && name == "consoleOutput")
|
||||||
return false;
|
return "true";
|
||||||
else if(group == "Log" && name == "fileOutput")
|
else if(group == "Log" && name == "fileOutput")
|
||||||
return true;
|
return "true";
|
||||||
else
|
else
|
||||||
return QVariant();
|
return QVariant();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,83 +6,25 @@
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>960</width>
|
<width>800</width>
|
||||||
<height>695</height>
|
<height>600</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>MainWindow</string>
|
<string>MainWindow</string>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="centralwidget">
|
<widget class="QWidget" name="centralwidget"/>
|
||||||
<widget class="QSplitter" name="splitter">
|
<widget class="QMenuBar" name="menubar">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>960</width>
|
<width>800</width>
|
||||||
<height>600</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Orientation::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="handleWidth">
|
|
||||||
<number>4</number>
|
|
||||||
</property>
|
|
||||||
<widget class="QWidget" name="widgetViewA" native="true"/>
|
|
||||||
<widget class="QWidget" name="widgetViewB" native="true"/>
|
|
||||||
</widget>
|
|
||||||
</widget>
|
|
||||||
<widget class="QMenuBar" name="menuBar">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>0</x>
|
|
||||||
<y>0</y>
|
|
||||||
<width>960</width>
|
|
||||||
<height>24</height>
|
<height>24</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QMenu" name="menuFile">
|
|
||||||
<property name="title">
|
|
||||||
<string>&File</string>
|
|
||||||
</property>
|
|
||||||
<addaction name="actionAbout"/>
|
|
||||||
<addaction name="separator"/>
|
|
||||||
<addaction name="actionExit"/>
|
|
||||||
</widget>
|
</widget>
|
||||||
<addaction name="menuFile"/>
|
<widget class="QStatusBar" name="statusbar"/>
|
||||||
</widget>
|
|
||||||
<widget class="QStatusBar" name="statusBar"/>
|
|
||||||
<widget class="QToolBar" name="toolBar">
|
|
||||||
<property name="windowTitle">
|
|
||||||
<string>toolBar</string>
|
|
||||||
</property>
|
|
||||||
<attribute name="toolBarArea">
|
|
||||||
<enum>TopToolBarArea</enum>
|
|
||||||
</attribute>
|
|
||||||
<attribute name="toolBarBreak">
|
|
||||||
<bool>false</bool>
|
|
||||||
</attribute>
|
|
||||||
<addaction name="separator"/>
|
|
||||||
<addaction name="actionAbout"/>
|
|
||||||
<addaction name="actionExit"/>
|
|
||||||
</widget>
|
|
||||||
<action name="actionAbout">
|
|
||||||
<property name="icon">
|
|
||||||
<iconset theme="QIcon::ThemeIcon::HelpAbout"/>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>&About</string>
|
|
||||||
</property>
|
|
||||||
</action>
|
|
||||||
<action name="actionExit">
|
|
||||||
<property name="icon">
|
|
||||||
<iconset theme="QIcon::ThemeIcon::WindowClose"/>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>E&xit</string>
|
|
||||||
</property>
|
|
||||||
</action>
|
|
||||||
</widget>
|
</widget>
|
||||||
<resources/>
|
<resources/>
|
||||||
<connections/>
|
<connections/>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue