diff --git a/deploy/linux/deploy.txt b/deploy/linux/deploy.txt index 8d9e80c..ef14dc5 100644 --- a/deploy/linux/deploy.txt +++ b/deploy/linux/deploy.txt @@ -2,7 +2,7 @@ ./deploy.sh /home/user/qtExamples/MetaGate/MetaGate Копировать каталог startSettings Копировать каталог ~/.metagate/pages/folder + ~/.metagate/pages/lastVersion.txt с заменой в startSettings -Копировать файл metagate_template.desktop и иконку metagate.svg +Копировать файл metagate_template.desktop и иконку metagate.png Скопировать файл run.sh Скопировать файлы из libssl в корневую для приложения папку Запуск ./run.sh diff --git a/deploy/linux/metagate.png b/deploy/linux/metagate.png new file mode 100644 index 0000000..868601b Binary files /dev/null and b/deploy/linux/metagate.png differ diff --git a/deploy/linux/metagate_atemplate.desktop b/deploy/linux/metagate_atemplate.desktop new file mode 100644 index 0000000..52a07cc --- /dev/null +++ b/deploy/linux/metagate_atemplate.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Name=MetaGate +Comment=MetaGate +Exec=sssssss -t %u +Type=Application +Icon=metagate +Terminal=false +MimeType=x-scheme-handler/metapay; +Categories=Network;Qt; diff --git a/deploy/linux/run.sh b/deploy/linux/run.sh index 1ce1268..65d4754 100755 --- a/deploy/linux/run.sh +++ b/deploy/linux/run.sh @@ -2,16 +2,18 @@ MY_PATH="`dirname \"$0\"`" cd ${MY_PATH} -sed "s?sssssss?${PWD}/run.sh?g" < ./metagate_template.desktop > metagate.desktop +#create dirs if them are not exist mkdir -p ~/.local/share/applications/ mkdir -p ~/.config/autostart/ -cp metagate.desktop ~/.local/share/applications/ +sed "s?sssssss?${PWD}/run.sh?g" < ./metagate_template.desktop > metagate.desktop +mv metagate.desktop ~/.local/share/applications/ +sed "s?sssssss?${PWD}/run.sh?g" < ./metagate_atemplate.desktop > metagate.desktop mv metagate.desktop ~/.config/autostart/ if type "xdg-mime" > /dev/null; then xdg-mime default metagate.desktop x-scheme-handler/metapay fi mkdir -p ~/.local/share/icons/ -cp metagate.svg ~/.local/share/icons/ +cp metagate.png ~/.local/share/icons/ echo > ./qt.conf echo [Paths] >> ./qt.conf diff --git a/resources/svg/systemtray.png b/resources/svg/systemtray.png new file mode 100644 index 0000000..868601b Binary files /dev/null and b/resources/svg/systemtray.png differ diff --git a/resources/svg/systemtray.svg b/resources/svg/systemtray.svg deleted file mode 100644 index f6c5edb..0000000 --- a/resources/svg/systemtray.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index d71fae4..5f3f348 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -74,17 +74,18 @@ bool EvFilter::eventFilter(QObject * watched, QEvent * event) { MainWindow::MainWindow(initializer::InitializerJavascript &initializerJs, QWidget *parent) : QMainWindow(parent) , ui(std::make_unique()) - , systemTray(new QSystemTrayIcon(QIcon(":/resources/svg/systemtray.svg"), this)) + , systemTray(new QSystemTrayIcon(QIcon(":/resources/svg/systemtray.png"), this)) , last_htmls(Uploader::getLastHtmlVersion()) , currentUserName(DEFAULT_USERNAME) { ui->setupUi(this); systemTray->setVisible(true); connect(systemTray, &QSystemTrayIcon::activated, [this](QSystemTrayIcon::ActivationReason reason) { - qDebug() << reason; + BEGIN_SLOT_WRAPPER if (reason != QSystemTrayIcon::Trigger && reason != QSystemTrayIcon::DoubleClick) return; this->setVisible(!this->isVisible()); + END_SLOT_WRAPPER }); CHECK(connect(this, &MainWindow::setJavascriptWrapper, this, &MainWindow::onSetJavascriptWrapper), "not connect onSetJavascriptWrapper"); diff --git a/src/mainwindow.h b/src/mainwindow.h index b2d7840..534d98c 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -195,14 +195,14 @@ private slots: void onLogined(bool isInit, const QString &login); private: + std::unique_ptr ui; + QSystemTrayIcon *systemTray; MHUrlSchemeHandler *shemeHandler = nullptr; MHPayUrlSchemeHandler *shemeHandler2 = nullptr; - std::unique_ptr ui; - std::unique_ptr channel; JavascriptWrapper *jsWrapper = nullptr; diff --git a/svg1.qrc b/svg1.qrc index c072920..4739b6b 100644 --- a/svg1.qrc +++ b/svg1.qrc @@ -16,6 +16,6 @@ resources/svg/menu_white.svg resources/svg/user_white.svg resources/svg/arrow.svg - resources/svg/systemtray.svg + resources/svg/systemtray.png