From c88668cc7612939be95d8e75f343b6c5f40b2782 Mon Sep 17 00:00:00 2001 From: Igor Janssen Date: Tue, 16 Apr 2019 15:52:55 +0700 Subject: [PATCH] Icons and linux fixes --- deploy/linux/deploy.txt | 2 +- deploy/linux/metagate.png | Bin 0 -> 8558 bytes deploy/linux/metagate_atemplate.desktop | 10 ++++++++++ deploy/linux/run.sh | 8 +++++--- resources/svg/systemtray.png | Bin 0 -> 8558 bytes resources/svg/systemtray.svg | 20 -------------------- src/mainwindow.cpp | 5 +++-- src/mainwindow.h | 4 ++-- svg1.qrc | 2 +- 9 files changed, 22 insertions(+), 29 deletions(-) create mode 100644 deploy/linux/metagate.png create mode 100644 deploy/linux/metagate_atemplate.desktop create mode 100644 resources/svg/systemtray.png delete mode 100644 resources/svg/systemtray.svg 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 0000000000000000000000000000000000000000..868601b3bbbe3c49fdca778e6fdbbfc0ee511640 GIT binary patch literal 8558 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..868601b3bbbe3c49fdca778e6fdbbfc0ee511640 GIT binary patch literal 8558 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 literal 0 HcmV?d00001 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