From c3330919f40899af7107c8677d35cf62c4ffcef4 Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Sun, 27 Oct 2019 15:26:56 -0700
Subject: [PATCH] Add settings button to the status bar

---
 onionshare_gui/gui_common.py  |   2 --
 onionshare_gui/main_window.py |  12 ++++++++++++
 onionshare_gui/tab/tab.py     |  11 -----------
 share/images/settings.png     | Bin 443 -> 1157 bytes
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/onionshare_gui/gui_common.py b/onionshare_gui/gui_common.py
index 4507d998..5008c03a 100644
--- a/onionshare_gui/gui_common.py
+++ b/onionshare_gui/gui_common.py
@@ -73,9 +73,7 @@ class GuiCommon:
                 }""",
             "settings_button": """
                 QPushButton {
-                    background-color: #601f61;
                     border: 0;
-                    border-left: 1px solid #69266b;
                     border-radius: 0;
                 }""",
             "server_status_indicator_label": """
diff --git a/onionshare_gui/main_window.py b/onionshare_gui/main_window.py
index b10333b5..6d8f034d 100644
--- a/onionshare_gui/main_window.py
+++ b/onionshare_gui/main_window.py
@@ -95,6 +95,18 @@ class MainWindow(QtWidgets.QMainWindow):
         )
         self.status_bar.addPermanentWidget(self.status_bar.server_status_indicator)
 
+        # Settings button
+        self.settings_button = QtWidgets.QPushButton()
+        self.settings_button.setDefault(False)
+        self.settings_button.setFixedWidth(40)
+        self.settings_button.setFixedHeight(50)
+        self.settings_button.setIcon(
+            QtGui.QIcon(self.common.get_resource_path("images/settings.png"))
+        )
+        self.settings_button.clicked.connect(self.open_settings)
+        self.settings_button.setStyleSheet(self.common.gui.css["settings_button"])
+        self.status_bar.addPermanentWidget(self.settings_button)
+
         # Tabs
         self.tabs = TabWidget(self.common, self.system_tray, self.status_bar)
 
diff --git a/onionshare_gui/tab/tab.py b/onionshare_gui/tab/tab.py
index b9416bc7..8cdf3afa 100644
--- a/onionshare_gui/tab/tab.py
+++ b/onionshare_gui/tab/tab.py
@@ -103,17 +103,6 @@ class Tab(QtWidgets.QWidget):
         self.new_tab.setLayout(new_tab_outer_layout)
         self.new_tab.show()
 
-        # Settings button, but this is gonna disappear
-        self.settings_button = QtWidgets.QPushButton()
-        self.settings_button.setDefault(False)
-        self.settings_button.setFixedWidth(40)
-        self.settings_button.setFixedHeight(50)
-        self.settings_button.setIcon(
-            QtGui.QIcon(self.common.get_resource_path("images/settings.png"))
-        )
-        # self.settings_button.clicked.connect(self.open_settings)
-        self.settings_button.setStyleSheet(self.common.gui.css["settings_button"])
-
         # Server status indicator icons
         self.status_bar.server_status_image_stopped = QtGui.QImage(
             self.common.get_resource_path("images/server_stopped.png")
diff --git a/share/images/settings.png b/share/images/settings.png
index ec35400a174af4f7117b000982aaf28d78c64263..b6f8fa55a773b20342b78cb6317ec63af8bf158d 100644
GIT binary patch
delta 1092
zcmV-K1iSmY1BD5YBYy(kdQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+U=K7lH({0
zhTl2G9sx-RiQ`}cRda(q{{CRv>7;w6YG>zRA7UyP%R<2a36g~V_m2_&!bL@5NNS!-
z&JkBCsc=QZ<8@tkifPr?L)!1?*&gl}43pq4*JJM6zrwDM4u7`&>3FsWJ9ix4f%c1!
zfHFsBG`64bK*E>(V<MsKel>ks&i;t45V!N|b25n06h`5|T}UG8*^vb^kRo;3P_r0M
zi>`J?9i@D)UAUVs;@zzm?PA?_d6pu?ydCn3M%zyMy>?5XCu)z8pI(^ULwwP0jOJtX
zYjrhcD3!xr)PKiPRtt^?q?FYyqZmGlwyjc797{YQdIQY^<qTAaq3obUjVcZ5>weOS
zDJJd=xtaN7SvH6Kh0g^g%|e3>cv=t#j}z1cX1?b_YuvKNJIOI}BX}|)7@^0P623G3
zPPqe(F;kZ)`mGh_#WMjhjY)3S@B$DTTT@;7t`a`wO@I6ZRzOgf%#H=tcw8Y4rAKbb
z;w<pfm_oeLoviHukO*TdCPM-OF(a`lQ#58Hf{qS86*Ff^e1HI{a-%T7MkE7{^Bfy}
zjFvAeUuGOF0HN3-1~k|}fR&OWe=Iq2sH$iRs+!f*wP?+fQ`Vfb<#|R`6HBI+&CIP>
zb@Alt*?-O5i`T+MaD-{e#X|8?O05{QB6LOX3XfV3KIBM;9{I4tk8;!#>2s!2&wSeH
zXE|%*CJo!a<z}IIE3J0wNTr^-_S~&|FTD=r+K`ckjy!DmD5KugHq~cp^g`~})M!(i
z#M1J!2Q`?@K0?quPINK@F-`>HHVGi1c`}PmDQ)p2H<`u4*c8g3Mmpg%n#4dbbz&WK
zvwM*HCAXmIUvcA~kqZ;upCA_|x=rpYw{NJmy1r3l0h+sTY8qwWV1q;V%3kMp(r@3x
ze+}>s^bYh6^bYh6^bYh6^#2Jo@Z$l0_`*M<nULZ-N6zw*AuxaA3L6$02|)Ii4gdfF
zC`m*?R5;6})ITqTK@bM;AMO$^f=;MtNJvyZ0fm-Crz2`A5^8@6joRrH8u1YnE>u2(
zgoKJH6h!=O_Dy)R@7}qaWQv_U^X$y*GfUdm@tyPKR6=_l!ih+1v=zePNNh-hc7=0{
zpc}`Lb~E2b7sh{afm)tyF_-X|AS=SmW@J5hYk;7hzo62ARm>zt@ru3B)+EXWxH9fx
zK5^?oB(Yk6{lruT8o*Peg;dqQu@7N%e{3!Cl0~+g!*0fOSk}C~=L5YF8T_Z^=b%Y2
z9R?a3bTvYDn0UmEQrL{56<ops_QQDvor%i(p%U6_RoF})7|fXGnpnNO%y#nS)`E|P
z#otPhouV&PbcEYR<!}-qyKdz_yotn;grz!!m$<`MIJe;}mGA>|oT)bzg09d20000<
KMNUMnLSTX)1`)#m

delta 375
zcmV--0f_#E3A+Q3Ba;mSE`Q<#7y>O8AP@3M0003<Nkl<ZILoD!u}XtM5QJw#6eFS*
zf@mSyL@?k(=nGibr4SSgEA0e(MX-srv9qudAHl+)m5(4Oh!%+oDUw3sXW<_R=VkND
zKX7ojH#@MidnY*n_W6r#FDEA-%aPb(7Qux`Y+h*qJOH;q5f}q5>3@$Spa7JBJD?Vd
zZ3YPq1|#IGNs<BMlIoI%l?`o4Q+Y`{1H{^rD#?CNQlSs8AZbIux>MF!#OrDwZU<QD
zl4gL9fY5Rp*bcb$#Jb<HF|#*G$3b4jvEel2nprcP!=Vff`3g&zh>XF1N^SzB?&WG?
zXbjbe*tyfhgS@1o^K1mSfO3y#yOKtn(x(j=mDF(ND=j*b=5l7%l2i^Z-%|*D2Imtq
zd+qh6maL`Z;U79)T?3QAEN}rlr~QGhB4UqO{==t8%oWTJ5WJW4BI!Fho1_~r;RiYe
V;ohxS&<Fqk002ovPDHLkV1fmFq`&|G