From 11c53368cbfdf688dfcc6b377d5f8e2f0a99b377 Mon Sep 17 00:00:00 2001
From: Uriziel <urizieli@gmail.com>
Date: Sun, 7 Sep 2014 11:07:18 +0200
Subject: [PATCH] Updated GUI for controlled rooms

---
 buildPy2exe.py               |   3 ++-
 resources/controller.png     | Bin 0 -> 666 bytes
 resources/key_go.png         | Bin 0 -> 744 bytes
 resources/page_white_key.png | Bin 0 -> 616 bytes
 syncplay/ui/gui.py           |  18 ++++++++++++++++--
 5 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 resources/controller.png
 create mode 100644 resources/key_go.png
 create mode 100644 resources/page_white_key.png

diff --git a/buildPy2exe.py b/buildPy2exe.py
index 7f91acc..164146b 100644
--- a/buildPy2exe.py
+++ b/buildPy2exe.py
@@ -582,7 +582,8 @@ guiIcons = ['resources/accept.png', 'resources/arrow_undo.png', 'resources/clock
      'resources/timeline_marker.png','resources/control_play_blue.png',
      'resources/mpc-hc.png','resources/mpc-hc64.png','resources/mplayer.png',
      'resources/mpv.png','resources/vlc.png', 'resources/house.png', 'resources/film_link.png',
-     'resources/eye.png', 'resources/comments.png', 'resources/cog_delete.png', 'resources/bullet_black.png'
+     'resources/eye.png', 'resources/comments.png', 'resources/cog_delete.png', 'resources/bullet_black.png',
+     'resources/controller.png', 'resources/key_go.png', 'resources/page_white_key.png'
     ]
 resources = ["resources/icon.ico", "resources/syncplay.png"]
 resources.extend(guiIcons)
diff --git a/resources/controller.png b/resources/controller.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cf76ed029a4468cfcd05c1a50089a98e718418f
GIT binary patch
literal 666
zcmV;L0%iS)P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!EJ;K`R5;6>
zlg*1#VHC#iD%uAHty;DTg0}q?ty;8bDFzCDreJ<Mik}F6Pzr`7=|)Gi&>80{BB+R<
zJE<uJ)4^}OIvSJr^qvd0s1`F`crM(R_xZi&J?FVpAP{i){r=|wKpi5==kq;uyWMAY
zyZzBY0DM`kR*A`Es%tcwy9WUb2E#42T79ZeD9*%U@f}>NR4PZMQi-K$n$6{M+e{`y
zCzHvi{{^55g~BV5NOa+FIKC8%#WFEpk_S+;0uA4flMsu=wvk9g@eiQYYGoUZ#;;nf
zwk?;-FdB`3VHmiWEa5y`gl|tCa~huHAQ%j?r0MVf0GiFFt=sK#C%yTk;Ec=V5(eW1
zy!^<*iw^+Bx5qH>dSE^ra{Kc6JlJfuBMv}5)@Yi~=Nw?K*=z<shI8l)7O+?>V6|Ft
zLOAX<8jU;B^k)=l4vT=l&3kn^9UxVL)9GYU)9I9}vfXZjQmOn(B@&4pQul^EU^1CN
zHk*ZXIt^qGkTG9cEEbJkuV?WZo6QC!5(!Z8c%13?`&?OQ#B#^uF;uHnNTpKPc_2n0
zqyCI{R;g4puH&IXp%AEOG<t%aM<W8z?DcwkGMQ}2<MDuKDV0i7I-Tww0_1Y}ZIYE!
zfj}_f^Z8CH91g!mB2EGUNG9=SuARhCDD;5Lm8sY3(ChVJy<UUM<=WjS${vsB9f>KB
zFaZe_Htgq(0OW7HPl9o7Hk+@=e6O@xZTY%@-!Rz$1Rlkwh5!Hn07*qoM6N<$f($t;
AN&o-=

literal 0
HcmV?d00001

diff --git a/resources/key_go.png b/resources/key_go.png
new file mode 100644
index 0000000000000000000000000000000000000000..30b0dc316e52dba388d88112d4c1cc32672fffbb
GIT binary patch
literal 744
zcmV<E0vG*>P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!dPzh<R5;6x
zlU+!YVHk$LRU{on2NEG99t4gN<(k<vgSIj~$mk$~eksv@gmxl=Ow(;Fr^B3}b5Lr_
z2G&-MqzD~`qBeg)s5vYXON+MJpPSp<&)xfdS}mK_2lvVQa$nE=JkR@40I2o!$#_If
zgcYe*-~X369QeQ}9^~I<-#CKyR)jn~<T%PeX7qx)>jGlUfiHCke$)P}4*HwX@?mb`
zzgiE#M5fLDxtj=lZ6q=+Lkt2$!wyVqxC~@X03De&Gn$t$kdWJig()R`(|L#ldNHNi
zi?tK@-;xA1zab1r3XkO&T;m5wdrx2~XU8>fpl4v~7ZF1h+!NXGy*rQ6jw}?mrNKGI
zL&zzIrIL-VTRiLE`+jy5wt-SCISiy4pO}x6>V>$`&V{7&3{GoOF)87oTao_ek0H|L
zXxL5q?8f4p7$RLZL=Q4>?LH3$EqhS@^b{VAG@wL(0y*{DquI)BECvw!(t<WU7OeSj
z4slT2o&n>y8jr^s8DqzY3Mx|xw6AM%RhNVG>V(j48H=@2*+n87;k63kFsH&hc^Czx
zU)p@TON5%2#gM-!LRIG_NS|MUrcZ`*_YPuLB^9Iro+W2D85SRofmAHM&xik`9B1#a
z@o-oLow*L$!CJHqC<x>_n){?E(&Zwhf|^V!qqZ#X+&c)jMMwsg3*W31W<{FoWOGV1
zuOTTStWS(&DYr&0v}HowTZPN*IY_RcCU%rj3Cs*;4T3Shy&sFSmGFOV!%!{P*`>;C
zSiN43jAg&56(U(ojS}<bU;n~z%OUZEdjI^WYM*^X$^G8flvN$?agoUOo#Ks1ETcBX
ap8o(~AJmyDx~^sb0000<MNUMnLSTY)_fHN0

literal 0
HcmV?d00001

diff --git a/resources/page_white_key.png b/resources/page_white_key.png
new file mode 100644
index 0000000000000000000000000000000000000000..d61648452284da1bc28b10385f95b5d2bf027901
GIT binary patch
literal 616
zcmV-u0+;=XP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz`bk7VR5;6x
zlh11tK^(<X{|FJWP|t#wNXf0xiq(U9kSbWH2SKEwJ@}*GA?-yW7ez_1DTTIrX%V4_
z2T`;Hky6D<Y6)FyQBv7tleL-sHM`3uKIgl1!zMMFfyXZF_kCvGurC52BGv(+s8IKR
z)FrfsJb@xRfT-g*%=5fjwOYmBB)%h=Og?Ca1b}Wbo2CiNvg*<_4V6j-ilX?CLZN_E
zD%Aj?)j<Fnux%Tz>-tZUVHjYHp;RjQ0M0pRlXN=mLv{hk9Ebp9&~+W<a(P#zojd7h
z0Eig%0eYw0K@?S0{gcSD+#1lVFhtiFer6KbdU+X@wWsX?!Vu-d6x8Jrc*Zh{ix+X{
z?7oq<0Hj~5b0}qo;ISuQYvWLt;@Eh6+J15M;Q6)y@|#h(+w*YbIGo}nST+uxABQy2
z!&(C9=z)}_hcGu2;6H|8=dXi*zX1Mq0H4NU#y<h3oQ3@Q3W}La(4`^pjZ?5U2Vt!b
z;N#d~cjjDI>j-T9IkpzWPWd#fZ)d=zV^~S`;LE*!<nABG&ECDE&6oJQA@{3ck$D#S
zY79KrkIxf*$i1D1YcRN`RwGZi3rED?X9;7yOvS}(aFx5Tq?1^A)CcL^vjAQbvy?p=
z26Pf6T-~`_ho-YrN4MW6Vuc$g_TO%*HC4Zpyng^qb+Ms`0V{|A0000<MNUMnLSTXx
CYZ^}g

literal 0
HcmV?d00001

diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py
index 476c700..a041a3c 100644
--- a/syncplay/ui/gui.py
+++ b/syncplay/ui/gui.py
@@ -6,7 +6,6 @@ import sys
 import time
 import re
 import os
-import threading
 from syncplay.utils import formatTime, sameFilename, sameFilesize, sameFileduration
 
 class MainWindow(QtGui.QMainWindow):
@@ -210,7 +209,17 @@ class MainWindow(QtGui.QMainWindow):
             self.mediadirectory = os.path.dirname(fileName)
             self.saveMediaBrowseSettings()
             self._syncplayClient._player.openFile(fileName)
-            
+
+    def createControlledRoom(self):
+        self._syncplayClient.createControlledRoom()
+
+    def identifyAsController(self):
+        tooltip = "Enter controller password for this room\r\n(see http://syncplay.pl/guide/ for usage instructions):"
+        name =  "Identify as Room Controller"
+        controlpassword, ok = QtGui.QInputDialog.getText(self, name, tooltip, QtGui.QLineEdit.Normal, "")
+        if ok and controlpassword != '':
+            self._syncplayClient.identifyAsController(controlpassword)
+
     def _extractSign(self, m):
         if m:
             if m == "-":
@@ -390,6 +399,11 @@ class MainWindow(QtGui.QMainWindow):
         window.advancedMenu = QtGui.QMenu(getMessage("advanced-menu-label"), self)
         window.setoffsetAction = window.advancedMenu.addAction(QtGui.QIcon(self.resourcespath + 'timeline_marker.png'),getMessage("setoffset-menu-label"))
         window.setoffsetAction.triggered.connect(self.setOffset)
+
+        window.createcontrolledroomAction = window.advancedMenu.addAction(QtGui.QIcon(self.resourcespath + 'page_white_key.png'), "&Create controlled room suffix")
+        window.createcontrolledroomAction.triggered.connect(self.createControlledRoom)
+        window.identifyascontroller = window.advancedMenu.addAction(QtGui.QIcon(self.resourcespath + 'key_go.png'), "&Identify as room controller")
+        window.identifyascontroller.triggered.connect(self.identifyAsController)
         window.menuBar.addMenu(window.advancedMenu)
         
         window.helpMenu = QtGui.QMenu(getMessage("help-menu-label"), self)