From 609b6125118e4d5f8b1dee99dc4e12f5dac0e1b0 Mon Sep 17 00:00:00 2001
From: Nodir Temirkhodjaev <nodir.temir@gmail.com>
Date: Mon, 8 May 2023 19:06:17 +0300
Subject: [PATCH] UI: Programs: Replace "Options" button with "Menu"

---
 src/ui/form/home/homewindow.cpp     |   2 +-
 src/ui/form/prog/programswindow.cpp |  11 +++++------
 src/ui/form/prog/programswindow.h   |   2 +-
 src/ui/fort_icons.qrc               |   1 +
 src/ui/icons/node-tree.png          | Bin 0 -> 1359 bytes
 5 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 src/ui/icons/node-tree.png

diff --git a/src/ui/form/home/homewindow.cpp b/src/ui/form/home/homewindow.cpp
index 14913259..9b6827a2 100644
--- a/src/ui/form/home/homewindow.cpp
+++ b/src/ui/form/home/homewindow.cpp
@@ -107,7 +107,7 @@ QLayout *HomeWindow::setupHeader()
 {
     auto layout = new QHBoxLayout();
 
-    m_btMenu = ControlUtil::createButton(":/icons/application_double.png");
+    m_btMenu = ControlUtil::createButton(":/icons/node-tree.png");
     m_btMenu->setMenu(windowManager()->trayIcon()->menu());
 
     layout->addWidget(m_btMenu);
diff --git a/src/ui/form/prog/programswindow.cpp b/src/ui/form/prog/programswindow.cpp
index 6e9192d9..b1068175 100644
--- a/src/ui/form/prog/programswindow.cpp
+++ b/src/ui/form/prog/programswindow.cpp
@@ -12,6 +12,7 @@
 #include <form/controls/appinforow.h>
 #include <form/controls/controlutil.h>
 #include <form/controls/tableview.h>
+#include <form/tray/trayicon.h>
 #include <fortsettings.h>
 #include <manager/windowmanager.h>
 #include <model/applistmodel.h>
@@ -134,7 +135,7 @@ void ProgramsWindow::retranslateUi()
     m_btRemoveApp->setText(tr("Remove"));
 
     m_btServices->setText(tr("Services"));
-    m_btOptions->setText(tr("Options"));
+    m_btMenu->setText(tr("Menu"));
 
     appListModel()->refresh();
 
@@ -239,10 +240,8 @@ QLayout *ProgramsWindow::setupHeader()
             &WindowManager::showServicesWindow);
 
     // Options button
-    m_btOptions = ControlUtil::createLinkButton(":/icons/cog.png");
-
-    connect(m_btOptions, &QAbstractButton::clicked, windowManager(),
-            &WindowManager::showOptionsWindow);
+    m_btMenu = ControlUtil::createLinkButton(":/icons/node-tree.png");
+    m_btMenu->setMenu(windowManager()->trayIcon()->menu());
 
     layout->addWidget(m_btEdit);
     layout->addWidget(ControlUtil::createSeparator(Qt::Vertical));
@@ -253,7 +252,7 @@ QLayout *ProgramsWindow::setupHeader()
     layout->addStretch();
     layout->addWidget(m_btServices);
     layout->addWidget(ControlUtil::createSeparator(Qt::Vertical));
-    layout->addWidget(m_btOptions);
+    layout->addWidget(m_btMenu);
 
     return layout;
 }
diff --git a/src/ui/form/prog/programswindow.h b/src/ui/form/prog/programswindow.h
index 9280b980..88938604 100644
--- a/src/ui/form/prog/programswindow.h
+++ b/src/ui/form/prog/programswindow.h
@@ -90,7 +90,7 @@ private:
     QPushButton *m_btRemoveApp = nullptr;
     QPushButton *m_btEdit = nullptr;
     QPushButton *m_btServices = nullptr;
-    QPushButton *m_btOptions = nullptr;
+    QPushButton *m_btMenu = nullptr;
     ProgramEditDialog *m_formAppEdit = nullptr;
     TableView *m_appListView = nullptr;
     AppInfoRow *m_appInfoRow = nullptr;
diff --git a/src/ui/fort_icons.qrc b/src/ui/fort_icons.qrc
index fecfffb4..451e2cec 100644
--- a/src/ui/fort_icons.qrc
+++ b/src/ui/fort_icons.qrc
@@ -37,6 +37,7 @@
     <file>icons/key.png</file>
     <file>icons/lightbulb.png</file>
     <file>icons/lock_open.png</file>
+    <file>icons/node-tree.png</file>
     <file>icons/page_copy.png</file>
     <file>icons/pencil.png</file>
     <file>icons/play.png</file>
diff --git a/src/ui/icons/node-tree.png b/src/ui/icons/node-tree.png
new file mode 100644
index 0000000000000000000000000000000000000000..649c6a94f45f00348d0e3b6ca3dfc847d02de8e8
GIT binary patch
literal 1359
zcmV-V1+e;wP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$@kvBMRCwCFS6yfwMHK#KXYS3dt<|95
zOEE^Nf?_KbLlM0-)Y?i4ZG(s{TB$FJKP^GAYBU#<)F;V(i9fIAp{*~q(uN{}MespH
zgo=VsCRR-mtQC#M+`BvDIWxO^_b=Bp!E7?@&hE@P-+bqsZ{`XBs$Q?3G{*E9qp=c~
z5FRx#IWRD=TTy=%JEso*_;Yqe0Ia=o4QSDQ?3)2pw00|>nYqBoAS}xCBx9&8)3LDz
z4A$PV9-+?)1F){NHrBcH1j@>@cP~VtX=Xs*n}NG80|NaC>nn<eN`98oL#5>5?T@E$
z_S;_w073vj?`_xN>1{Wn;cLqTV>71MNw_BGFf~R{KRqc0!1Fwml)^_}oyXBvcH`Xi
zulD`M8?ME^H%{WvgEu3fMD?V!Y_T!hLcfu5w!<%YrA&3Z<c<OGKuHss1^UO-#W|cl
zcOgug)%KlI0wqY)YD2`1hw7GU=pc%*#<mA`;I&r=(c60;d_O?%)~(P%I-#PR%P}Cr
zxbyIt*#MoLSGnY*XP215I(dC~w15G34}t*0Bcrh+ZX%n}3x<IH2!b_q{`V#-m5QDG
zBR#vw5)A|(@EMSR$<~F5az@8}9=B)!Y~QC@_itQ>GiN@9BHlTk&48$-cLA?bwDLKx
zF!{cKXj>N<1|(4kys+zbyxe~W%H<N?eP<j`KJ^Ud=9_5J%9SV63pTDymwM$GVDjc^
z#Z9v5le53+VUFvcoRp|UnH7-$;L}(x&86x?S_e3>BKDYT<1~O>N+t2;sc)!6f3hOQ
z7dzd)X&s*5c`N3d0TzQnECj%CqHukObP9^SkdAJ4uBhxzfBrp=4em+l!`>q&@Y0?Q
zXlfBVFfH9p$gqiaBIhd$Kv3o;8Q^l{K4);bR7P1+2#EgatUl0peoy*E37ZzE$T7EM
zNeYwG0as+nauK0(u7Y}f3>}gH%Iop-tWN8LaNDbr0?!>hXoaj=-4cq8lVYs{^!Gnx
zfjA#APYwVNikv0olp7m5{NiDXyTP$TM@b(VRv!>*g>jQ@S&omtRltB#NVdcFqJ>2f
zNh@Ii1B~7ed}u1c?RR!za`J2{33uGpP2U~GL7-y*`K{Q*HVcz*AqLz6NsN3SLwkEL
z{MhE!VSzsSRDxUq!l_PfA=$-cL8$DC^Zgd`IDRpJ#5nO^nuqoPtX)bZ=+?%>%`!mu
zj<UkY`(I-6i>Xuy`g*!C`0ys^hQVS4k!>ZBs-!?jA)$p1%aB4KoDL|f2Od87>^mGE
z?8nzXT(s{ubX|i-Mo*x&uLsHxOFto#$^9Y@t?*Jz<+kI9Nc$|4bn#J5V*0m#5;|~&
zV}pRIlA(i&D&D5~NJpED)d5em*^ERhzBbySfE*be!KxAolk7^J6Ic_RJwZaGuz&yK
zmaTiMRob<6ync56#DN2LKPjw&h#q%dZ++yls?}<7|M;`-+1l@jbl_4WK49{FVq&7;
z6pWYwSo>ZoB$+dzNNpD^Aii(xdzRUqn{UF0r#`W&2fGs*?7Dk>JeC13d?1bNv<X3$
zfz}z0zZncYdXH^IB4dnbyYIDhz{>-OoJK3X{GVE!1M)KG#77V;$?0;h$ft5YNaXC;
z*w`AIC@XN0KkG9J)Ya6wsdW|{SpKhz)AJIwDRx+*wwhXbg`?1*_Se4x3;=t<T0C|E
R>wf?M002ovPDHLkV1id`i}U~h

literal 0
HcmV?d00001