diff --git a/assets/icons/OFD.svg b/assets/icons/OFD.svg new file mode 100644 index 0000000..998bcc5 --- /dev/null +++ b/assets/icons/OFD.svg @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ofd.ru + ФНС + + + + + Checks parser + + diff --git a/main.cpp b/main.cpp index 06d6201..0c71376 100644 --- a/main.cpp +++ b/main.cpp @@ -12,6 +12,7 @@ # include using namespace std::filesystem; #endif +#include #include #include #include @@ -19,6 +20,10 @@ #include int main(int argc, char *argv[]) { + QDateTime datetime = QDateTime::fromString("20171112T153500", "yyyyMMddThhmmss"); + std::cout << datetime.toString().toStdString() << std::endl; + return 0; + curl_global_init(CURL_GLOBAL_ALL); std::string program_data_path = get_path_relative_to_home(".local/share/checks_parser"); diff --git a/mainwindow.cpp b/mainwindow.cpp index c398761..e2c8851 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -3,14 +3,11 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent) - , ui(new Ui::MainWindow) -{ + , ui(new Ui::MainWindow) { ui->setupUi(this); } -MainWindow::~MainWindow() -{ +MainWindow::~MainWindow() { delete ui; } - diff --git a/mainwindow.ui b/mainwindow.ui index 7864a56..89f1549 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -6,8 +6,8 @@ 0 0 - 971 - 616 + 1039 + 693 @@ -29,7 +29,17 @@ - PushButton + + + + + :/icons/assets/icons/OFD.svg:/icons/assets/icons/OFD.svg + + + + 128 + 128 + @@ -40,26 +50,6 @@ - - - - Optical Character Recognition - - - - - - - :/icons/assets/icons/OCR.svg:/icons/assets/icons/OCR.svg - - - - 128 - 128 - - - - @@ -78,7 +68,7 @@ - + :/icons/assets/icons/email-text.svg:/icons/assets/icons/email-text.svg @@ -104,8 +94,31 @@ + + + + Optical Character Recognition + + + + + + + :/icons/assets/icons/OCR.svg:/icons/assets/icons/OCR.svg + + + + 128 + 128 + + + + - + + + + diff --git a/media.qrc b/media.qrc index 8f5066a..99e4a07 100644 --- a/media.qrc +++ b/media.qrc @@ -1,6 +1,7 @@ assets/icons/email-text.svg - assets/icons/OCR.svg + assets/icons/OCR.svg + assets/icons/OFD.svg diff --git a/translations/en_US.ts b/translations/en_US.ts index fca89a6..5712fdf 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -169,18 +169,17 @@ - - + PushButton - + Optical Character Recognition - + Text from E-Mail diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index 6f0b667..cb96b68 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -169,18 +169,17 @@ - - + PushButton - + Optical Character Recognition - + Text from E-Mail