From 2653042327023395a8ba467fba27e93636b6f6fd Mon Sep 17 00:00:00 2001
From: Et0h <boldly@gmail.com>
Date: Sat, 2 Jul 2016 21:04:02 +0100
Subject: [PATCH] Add icon for 'Set Trusted Domains' menu item + tweak wording

---
 buildPy2exe.py            |   1 +
 resources/shield_edit.png | Bin 0 -> 773 bytes
 syncplay/ui/gui.py        |   9 ++++-----
 3 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 resources/shield_edit.png

diff --git a/buildPy2exe.py b/buildPy2exe.py
index 5c4468d..403bd4a 100644
--- a/buildPy2exe.py
+++ b/buildPy2exe.py
@@ -656,6 +656,7 @@ guiIcons = ['resources/accept.png', 'resources/arrow_undo.png', 'resources/clock
      'resources/world_explore.png', 'resources/application_get.png', 'resources/cog.png', 'resources/arrow_switch.png',
      'resources/film_go.png', 'resources/world_go.png', 'resources/arrow_refresh.png', 'resources/bullet_right_grey.png',
      'resources/film_folder_edit.png',
+     'resources/shield_edit.png',
      'resources/world_add.png', 'resources/film_add.png', 'resources/delete.png', 'resources/spinner.mng'
     ]
 resources = ["resources/icon.ico", "resources/syncplay.png"]
diff --git a/resources/shield_edit.png b/resources/shield_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4e00c2798ddcdb3e8c4be9513f99879327ae65c
GIT binary patch
literal 773
zcmV+g1N!`lP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB9600009a7bBm000id000id0mpBsWB>pF8gxZibW?9;ba!ELWdKlNX>N2bPDNB8
zb~7$DE-^4L^m3s900MzYL_t(IPqmUsXj4%bh2PeN3&E9Z7lkf#<wjgc>rjxcS|}DR
zScD3?)M{0vNKq@LLlQb@Dpu@Z5^0*mq|K<dgd`-*JWr-dnueH|ki3K#kMF)-C>86@
z19$Or|L@#$?|+&9s<pK>pGKnrEf1E-WP;IXgu!4qrPu4bv|8;e4u;q3g~#K8QmKSO
zp;(d2<u{g>mruxKva&=X*)t|^C=`OlVu91?L^7E~wOU2JUguY(Qb8h-fYoZn>gp<Q
zytK5mXTY6$n3%9E%Qu%wC8X17zOL13h{a;q-rh!`P(VJPhfb%%{QUemitmbx&BNq$
z0>tBSz9vchen0GXJ2s6X1mAWcA|HZNd>$@Q^EAa7hD0L(fg_O!qR}XJc6N}>X8Ct;
zt-nCp(2s&!36#De@0Q}@@TDTf8Ah#E^9BSa?-34%k;!Cu1Fv}&IoCtfwpNffJx9g!
z9zT=o*cA8uqBz5-R4SCqWdwsk1OfrxgxovjlOpGSfJS8<mDo+>thW$&(+l(DwT6A9
z^(4g^h8q)##UfIv6ns7(ZxnYe;=AV_8mt-RXb;#_H;VoNgl5{H8}GS5(Oq#f9<|wQ
z`~*mR_l6j0TR(-bg8gzCKfL!5nY@Ta(O{Hf`^9|_I2;Zn98&l-x4GD#z$SW8O<h5O
zOA_W_>D&~ALSYj{_KW*nM;8Ql;QKHDmwF6eEuAPQx{-6<MR=wiYS|otJ81jg_3l{<
zP)s5?(*eW4F>Fk=;q!1Slnc`k2n6l4?O;8=-dwMlg{WD^VHr9LN#AkIjty>2OiY}n
zE&o>MnIr6zo~F9~X<J=8(z5Y#^wDb$K18?w5X1ZiKy?sk7P?Yq00000NkvXXu0mjf
D{e4^u

literal 0
HcmV?d00001

diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py
index 8349f35..0a323c4 100644
--- a/syncplay/ui/gui.py
+++ b/syncplay/ui/gui.py
@@ -844,7 +844,7 @@ class MainWindow(QtGui.QMainWindow):
     @needsClient
     def openSetTrustedDomainsDialog(self):
         TrustedDomainsDialog = QtGui.QDialog()
-        TrustedDomainsDialog.setWindowTitle(getMessage("settrusteddomains-menu-label"))
+        TrustedDomainsDialog.setWindowTitle(getMessage("syncplay-trusteddomains-title"))
         TrustedDomainsLayout = QtGui.QGridLayout()
         TrustedDomainsLabel = QtGui.QLabel(getMessage("trusteddomains-msgbox-label"))
         TrustedDomainsLayout.addWidget(TrustedDomainsLabel, 0, 0, 1, 1)
@@ -1205,16 +1205,15 @@ class MainWindow(QtGui.QMainWindow):
         window.setoffsetAction = window.advancedMenu.addAction(QtGui.QIcon(self.resourcespath + 'timeline_marker.png'),
                                                                getMessage("setoffset-menu-label"))
         window.setoffsetAction.triggered.connect(self.setOffset)
-
+        window.setTrustedDomainsAction = window.advancedMenu.addAction(QtGui.QIcon(self.resourcespath + 'shield_edit.png'),
+                                                      getMessage("settrusteddomains-menu-label"))
+        window.setTrustedDomainsAction.triggered.connect(self.openSetTrustedDomainsDialog)
         window.createcontrolledroomAction = window.advancedMenu.addAction(
             QtGui.QIcon(self.resourcespath + 'page_white_key.png'), getMessage("createcontrolledroom-menu-label"))
         window.createcontrolledroomAction.triggered.connect(self.createControlledRoom)
         window.identifyascontroller = window.advancedMenu.addAction(QtGui.QIcon(self.resourcespath + 'key_go.png'),
                                                                     getMessage("identifyascontroller-menu-label"))
         window.identifyascontroller.triggered.connect(self.identifyAsController)
-        window.setTrustedDomainsAction = window.advancedMenu.addAction(QtGui.QIcon(self.resourcespath + 'film_folder_edit.png'),
-                                                      getMessage("settrusteddomains-menu-label"))
-        window.setTrustedDomainsAction.triggered.connect(self.openSetTrustedDomainsDialog)
 
         window.menuBar.addMenu(window.advancedMenu)