Skip to content

Commit

Permalink
Changes to logged_on_admins list
Browse files Browse the repository at this point in the history
  • Loading branch information
reillychase committed Oct 28, 2016
1 parent 40d87c8 commit bc419cc
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
6 changes: 4 additions & 2 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,6 @@ def catch_textedit_chat(self, msg, color):
if re.findall('-----------name----------- users ----admin/operator----', msg):
self.list_channels.clear()
self.channels = []
self.logged_on_admins = []
msg_2 = msg.splitlines()
for line in msg_2:

Expand All @@ -518,7 +517,10 @@ def catch_textedit_chat(self, msg, color):
channel_admin_list.append(admin_level)
channel_admin_list.append(chan)
channel_admin_list.append(admin[:-3])
self.logged_on_admins.append(channel_admin_list)
if channel_admin_list in self.logged_on_admins:
pass
else:
self.logged_on_admins.append(channel_admin_list)

if self.print_channels == 1:
line = '<span style="color: #ffff00;">' + line + '</span>'
Expand Down
10 changes: 5 additions & 5 deletions ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Form implementation generated from reading ui file 'warchatter.ui'
#
# Created: Mon Oct 24 10:13:26 2016
# Created: Thu Oct 27 17:14:58 2016
# by: PyQt4 UI code generator 4.10.4
#
# WARNING! All changes made in this file will be lost!
Expand Down Expand Up @@ -208,10 +208,10 @@ def setupUi(self, MainWindow):
self.label_14 = QtGui.QLabel(self.verticalLayoutWidget_3)
self.label_14.setObjectName(_fromUtf8("label_14"))
self.verticalLayout_11.addWidget(self.label_14)
self.lineEdit = QtGui.QLineEdit(self.verticalLayoutWidget_3)
self.lineEdit.setEnabled(False)
self.lineEdit.setObjectName(_fromUtf8("lineEdit"))
self.verticalLayout_11.addWidget(self.lineEdit)
self.input_game_name = QtGui.QLineEdit(self.verticalLayoutWidget_3)
self.input_game_name.setEnabled(False)
self.input_game_name.setObjectName(_fromUtf8("input_game_name"))
self.verticalLayout_11.addWidget(self.input_game_name)
self.label_15 = QtGui.QLabel(self.verticalLayoutWidget_3)
self.label_15.setObjectName(_fromUtf8("label_15"))
self.verticalLayout_11.addWidget(self.label_15)
Expand Down
2 changes: 1 addition & 1 deletion warchatter.ui
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit">
<widget class="QLineEdit" name="input_game_name">
<property name="enabled">
<bool>false</bool>
</property>
Expand Down

0 comments on commit bc419cc

Please sign in to comment.