Skip to content

Commit

Permalink
+ UI setting window
Browse files Browse the repository at this point in the history
+ spdlog
+ rapidxml
+ UI start window
  • Loading branch information
leexu007 committed Jul 18, 2022
1 parent 963a23e commit bc35f59
Show file tree
Hide file tree
Showing 127 changed files with 29,917 additions and 14 deletions.
12 changes: 11 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@

zenshot.pro.user
zenshot.pro.user*

# vscode workspace file
*.code-workspace
.vs
debug
release
*.vcxproj*
*.sln
ui_*.h
.qmake.*
*.pro.user
*.vcxproj*
logs
17 changes: 14 additions & 3 deletions main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,23 @@
#include <QFontDatabase>
#include <QWidget>

#include "spdlogwrapper.hpp"

#include "widget.h"
#include "StarterUI.h"
#include "starter.h"
#include "core/screeninfo.h"
#include "screen/helper/screengetter.h"
#include "starter.h"
#include "core/gparams.h"

#include <direct.h>

int main(int argc, char *argv[])
{
mkdir("logs");
spdlog::spdlog_init("zenshot", "logs/log.log", 23, 57, 0, 0);
L_TRACE("start");

QApplication a(argc, argv);

//加载并应用语言翻译界面
Expand Down Expand Up @@ -71,9 +79,12 @@ int main(int argc, char *argv[])

a.setQuitOnLastWindowClosed(false);

Starter starter;
starter.init();
StarterUI ui;
ui.show();

//Starter starter;
//starter.init();

int ret = a.exec();

return ret;
Expand Down
1 change: 1 addition & 0 deletions main.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
<file>images/down-arrow.png</file>
<file>images/cross32.png</file>
<file>images/mosaic.png</file>
<file>setting.css</file>
</qresource>
</RCC>
2 changes: 2 additions & 0 deletions msvc_make.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
chcp 65001
"C:\Qt\Qt5.14.2\Tools\QtCreator\bin\jom.exe" %*
Loading

0 comments on commit bc35f59

Please sign in to comment.