Skip to content

Commit

Permalink
Updated settings with fire and chat render
Browse files Browse the repository at this point in the history
  • Loading branch information
@nickolaj-jepsen
nickolaj-jepsen committed Jan 26, 2016
1 parent 2cb8878 commit 4f662cb
Show file tree
Hide file tree
Showing 4 changed files with 549 additions and 368 deletions.
9 changes: 9 additions & 0 deletions cue_csgo/csgo.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,15 @@ def __init__(self, debug=False, settings=None):
with open('settings.txt', 'w') as settings_file:
json.dump(DEFAULT_SETTINGS, settings_file)

# Make sure all renders has a settings dict, if not, use default settings
for render in all_renders:
name = render.__name__
if self.settings["renders"]["settings"].get(name, None) is None:
if DEFAULT_SETTINGS["renders"]["settings"].get(name, None) is not None:
self.settings["renders"]["settings"][name] = DEFAULT_SETTINGS["renders"]["settings"][name]
else:
self.settings["renders"]["settings"][name] = {}

logging.info("Starting keyboard access")
self.keyboard = Keyboard(self.settings["hardware"]["device_id"])

Expand Down
27 changes: 15 additions & 12 deletions cue_csgo/gui.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,6 @@ def show(self, settings=None):
if settings is not None:
self.settings = settings

# Make sure all renders has a settings dict, if not, use default settings
for render in all_renders:
name = render.__name__
if self.settings["renders"]["settings"].get(name, None) is None:
if DEFAULT_SETTINGS["renders"]["settings"].get(name, None) is not None:
self.settings["renders"]["settings"][name] = DEFAULT_SETTINGS["renders"]["settings"][name]
else:
self.settings["renders"]["settings"][name] = {}

self.general_update_interval.setValue(self.settings["update_interval"])

background_settings = self.settings["renders"]["settings"]["BackgroundRender"]
Expand All @@ -103,6 +94,10 @@ def show(self, settings=None):
self.background_button_t_color.setStyleSheet("background-color: {}"
.format(background_settings["t_color"]))

chat_color = self.settings["renders"]["settings"]["ChatRender"]["color"]
self.chat_line_edit_color.setText(chat_color)
self.chat_button_color.setStyleSheet("background-color: {}".format(chat_color))

for render in self.settings["renders"]["active"]:
if render == "HpRender":
self.healthbar_enabled.setChecked(True)
Expand All @@ -114,6 +109,10 @@ def show(self, settings=None):
self.flashbang_enabled.setChecked(True)
if render == "SmokeRender":
self.smoke_enabled.setChecked(True)
if render == "FireRender":
self.fire_enabled.setChecked(True)
if render == "ChatRender":
self.chat_enabled.setChecked(True)

self.bomb_timer.setValue(self.settings["renders"]["settings"]["BombRender"]["explode_time"])
self.flashbang_gradient.setChecked(self.settings["renders"]["settings"]["FlashbangRender"]["gradient"])
Expand All @@ -129,17 +128,21 @@ def new_settings(self):
enabled_renders.append("WeaponRender")
if self.bomb_enabled.isChecked():
enabled_renders.append("BombRender")
if self.flashbang_enabled.isChecked():
enabled_renders.append("FlashbangRender")
if self.smoke_enabled.isChecked():
enabled_renders.append("SmokeRender")
if self.flashbang_enabled.isChecked():
enabled_renders.append("FlashbangRender")
if self.fire_enabled.isChecked():
enabled_renders.append("FireRender")
if self.chat_enabled.isChecked():
enabled_renders.append("ChatRender")

self.settings["renders"]["active"] = enabled_renders
self.settings["renders"]["settings"]["BombRender"]["explode_time"] = self.bomb_timer.value()
self.settings["renders"]["settings"]["FlashbangRender"]["gradient"] = self.flashbang_gradient.isChecked()
self.settings["renders"]["settings"]["BackgroundRender"]["ct_color"] = self.background_line_edit_ct_color.text()
self.settings["renders"]["settings"]["BackgroundRender"]["t_color"] = self.background_line_edit_t_color.text()

self.settings["renders"]["settings"]["ChatRender"]["color"] = self.chat_line_edit_color.text()

with open('settings.txt', 'w') as settings_file:
json.dump(self.settings, settings_file)
Expand Down
91 changes: 71 additions & 20 deletions cue_csgo/ui/settings_dialog.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Form implementation generated from reading ui file 'settings_dialog.ui'
#
# Created: Sun Jan 24 15:32:00 2016
# Created: Tue Jan 26 17:14:04 2016
# by: pyside-uic 0.2.15 running on PySide 1.2.2
#
# WARNING! All changes made in this file will be lost!
Expand All @@ -12,10 +12,19 @@
class Ui_SettingsDialog(object):
def setupUi(self, SettingsDialog):
SettingsDialog.setObjectName("SettingsDialog")
SettingsDialog.resize(282, 582)
SettingsDialog.resize(282, 758)
self.verticalLayout_2 = QtGui.QVBoxLayout(SettingsDialog)
self.verticalLayout_2.setObjectName("verticalLayout_2")
self.groupBox = QtGui.QGroupBox(SettingsDialog)
self.scrollArea = QtGui.QScrollArea(SettingsDialog)
self.scrollArea.setFrameShape(QtGui.QFrame.NoFrame)
self.scrollArea.setWidgetResizable(True)
self.scrollArea.setObjectName("scrollArea")
self.scrollAreaWidgetContents = QtGui.QWidget()
self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 264, 709))
self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
self.verticalLayout = QtGui.QVBoxLayout(self.scrollAreaWidgetContents)
self.verticalLayout.setObjectName("verticalLayout")
self.groupBox = QtGui.QGroupBox(self.scrollAreaWidgetContents)
self.groupBox.setObjectName("groupBox")
self.formLayout_2 = QtGui.QFormLayout(self.groupBox)
self.formLayout_2.setObjectName("formLayout_2")
Expand All @@ -38,8 +47,8 @@ def setupUi(self, SettingsDialog):
self.general_debug = QtGui.QCheckBox(self.groupBox)
self.general_debug.setObjectName("general_debug")
self.formLayout_2.setWidget(1, QtGui.QFormLayout.LabelRole, self.general_debug)
self.verticalLayout_2.addWidget(self.groupBox)
self.groupBox_3 = QtGui.QGroupBox(SettingsDialog)
self.verticalLayout.addWidget(self.groupBox)
self.groupBox_3 = QtGui.QGroupBox(self.scrollAreaWidgetContents)
self.groupBox_3.setObjectName("groupBox_3")
self.formLayout_3 = QtGui.QFormLayout(self.groupBox_3)
self.formLayout_3.setObjectName("formLayout_3")
Expand Down Expand Up @@ -85,8 +94,8 @@ def setupUi(self, SettingsDialog):
self.background_button_t_color.setObjectName("background_button_t_color")
self.horizontalLayout_7.addWidget(self.background_button_t_color)
self.formLayout_3.setLayout(1, QtGui.QFormLayout.FieldRole, self.horizontalLayout_7)
self.verticalLayout_2.addWidget(self.groupBox_3)
self.groupBox_4 = QtGui.QGroupBox(SettingsDialog)
self.verticalLayout.addWidget(self.groupBox_3)
self.groupBox_4 = QtGui.QGroupBox(self.scrollAreaWidgetContents)
self.groupBox_4.setObjectName("groupBox_4")
self.formLayout_7 = QtGui.QFormLayout(self.groupBox_4)
self.formLayout_7.setObjectName("formLayout_7")
Expand All @@ -96,8 +105,8 @@ def setupUi(self, SettingsDialog):
self.horizontalLayout_8 = QtGui.QHBoxLayout()
self.horizontalLayout_8.setObjectName("horizontalLayout_8")
self.formLayout_7.setLayout(0, QtGui.QFormLayout.FieldRole, self.horizontalLayout_8)
self.verticalLayout_2.addWidget(self.groupBox_4)
self.groupBox_5 = QtGui.QGroupBox(SettingsDialog)
self.verticalLayout.addWidget(self.groupBox_4)
self.groupBox_5 = QtGui.QGroupBox(self.scrollAreaWidgetContents)
self.groupBox_5.setObjectName("groupBox_5")
self.formLayout_5 = QtGui.QFormLayout(self.groupBox_5)
self.formLayout_5.setObjectName("formLayout_5")
Expand All @@ -107,8 +116,8 @@ def setupUi(self, SettingsDialog):
self.horizontalLayout_10 = QtGui.QHBoxLayout()
self.horizontalLayout_10.setObjectName("horizontalLayout_10")
self.formLayout_5.setLayout(0, QtGui.QFormLayout.FieldRole, self.horizontalLayout_10)
self.verticalLayout_2.addWidget(self.groupBox_5)
self.groupBox_6 = QtGui.QGroupBox(SettingsDialog)
self.verticalLayout.addWidget(self.groupBox_5)
self.groupBox_6 = QtGui.QGroupBox(self.scrollAreaWidgetContents)
self.groupBox_6.setObjectName("groupBox_6")
self.formLayout_4 = QtGui.QFormLayout(self.groupBox_6)
self.formLayout_4.setObjectName("formLayout_4")
Expand All @@ -129,8 +138,8 @@ def setupUi(self, SettingsDialog):
self.bomb_timer.setObjectName("bomb_timer")
self.horizontalLayout.addWidget(self.bomb_timer)
self.formLayout_4.setLayout(1, QtGui.QFormLayout.FieldRole, self.horizontalLayout)
self.verticalLayout_2.addWidget(self.groupBox_6)
self.groupBox_7 = QtGui.QGroupBox(SettingsDialog)
self.verticalLayout.addWidget(self.groupBox_6)
self.groupBox_7 = QtGui.QGroupBox(self.scrollAreaWidgetContents)
self.groupBox_7.setObjectName("groupBox_7")
self.formLayout_6 = QtGui.QFormLayout(self.groupBox_7)
self.formLayout_6.setFieldGrowthPolicy(QtGui.QFormLayout.AllNonFixedFieldsGrow)
Expand All @@ -144,8 +153,8 @@ def setupUi(self, SettingsDialog):
self.flashbang_enabled = QtGui.QCheckBox(self.groupBox_7)
self.flashbang_enabled.setObjectName("flashbang_enabled")
self.formLayout_6.setWidget(0, QtGui.QFormLayout.LabelRole, self.flashbang_enabled)
self.verticalLayout_2.addWidget(self.groupBox_7)
self.groupBox_2 = QtGui.QGroupBox(SettingsDialog)
self.verticalLayout.addWidget(self.groupBox_7)
self.groupBox_2 = QtGui.QGroupBox(self.scrollAreaWidgetContents)
self.groupBox_2.setObjectName("groupBox_2")
self.formLayout_8 = QtGui.QFormLayout(self.groupBox_2)
self.formLayout_8.setFieldGrowthPolicy(QtGui.QFormLayout.AllNonFixedFieldsGrow)
Expand All @@ -156,16 +165,53 @@ def setupUi(self, SettingsDialog):
self.smoke_gradient = QtGui.QCheckBox(self.groupBox_2)
self.smoke_gradient.setObjectName("smoke_gradient")
self.formLayout_8.setWidget(1, QtGui.QFormLayout.LabelRole, self.smoke_gradient)
self.verticalLayout_2.addWidget(self.groupBox_2)
spacerItem4 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
self.verticalLayout_2.addItem(spacerItem4)
self.verticalLayout.addWidget(self.groupBox_2)
self.groupBox_8 = QtGui.QGroupBox(self.scrollAreaWidgetContents)
self.groupBox_8.setObjectName("groupBox_8")
self.formLayout = QtGui.QFormLayout(self.groupBox_8)
self.formLayout.setFieldGrowthPolicy(QtGui.QFormLayout.AllNonFixedFieldsGrow)
self.formLayout.setObjectName("formLayout")
self.fire_enabled = QtGui.QCheckBox(self.groupBox_8)
self.fire_enabled.setObjectName("fire_enabled")
self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.fire_enabled)
self.verticalLayout.addWidget(self.groupBox_8)
self.groupBox_9 = QtGui.QGroupBox(self.scrollAreaWidgetContents)
self.groupBox_9.setObjectName("groupBox_9")
self.formLayout_9 = QtGui.QFormLayout(self.groupBox_9)
self.formLayout_9.setFieldGrowthPolicy(QtGui.QFormLayout.AllNonFixedFieldsGrow)
self.formLayout_9.setObjectName("formLayout_9")
self.chat_enabled = QtGui.QCheckBox(self.groupBox_9)
self.chat_enabled.setObjectName("chat_enabled")
self.formLayout_9.setWidget(0, QtGui.QFormLayout.LabelRole, self.chat_enabled)
self.label = QtGui.QLabel(self.groupBox_9)
self.label.setObjectName("label")
self.formLayout_9.setWidget(1, QtGui.QFormLayout.LabelRole, self.label)
self.horizontalLayout_3 = QtGui.QHBoxLayout()
self.horizontalLayout_3.setObjectName("horizontalLayout_3")
spacerItem4 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.horizontalLayout_3.addItem(spacerItem4)
self.chat_line_edit_color = QtGui.QLineEdit(self.groupBox_9)
self.chat_line_edit_color.setMaximumSize(QtCore.QSize(53, 16777215))
self.chat_line_edit_color.setObjectName("chat_line_edit_color")
self.horizontalLayout_3.addWidget(self.chat_line_edit_color)
self.chat_button_color = QtGui.QPushButton(self.groupBox_9)
self.chat_button_color.setMaximumSize(QtCore.QSize(25, 16777215))
self.chat_button_color.setText("")
self.chat_button_color.setObjectName("chat_button_color")
self.horizontalLayout_3.addWidget(self.chat_button_color)
self.formLayout_9.setLayout(1, QtGui.QFormLayout.FieldRole, self.horizontalLayout_3)
self.verticalLayout.addWidget(self.groupBox_9)
spacerItem5 = QtGui.QSpacerItem(20, 200000, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
self.verticalLayout.addItem(spacerItem5)
self.scrollArea.setWidget(self.scrollAreaWidgetContents)
self.verticalLayout_2.addWidget(self.scrollArea)
self.horizontalLayout_2 = QtGui.QHBoxLayout()
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
self.label_2 = QtGui.QLabel(SettingsDialog)
self.label_2.setObjectName("label_2")
self.horizontalLayout_2.addWidget(self.label_2)
spacerItem5 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.horizontalLayout_2.addItem(spacerItem5)
spacerItem6 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.horizontalLayout_2.addItem(spacerItem6)
self.button_save_settings = QtGui.QPushButton(SettingsDialog)
self.button_save_settings.setObjectName("button_save_settings")
self.horizontalLayout_2.addWidget(self.button_save_settings)
Expand Down Expand Up @@ -198,6 +244,11 @@ def retranslateUi(self, SettingsDialog):
self.groupBox_2.setTitle(QtGui.QApplication.translate("SettingsDialog", "Smoke", None, QtGui.QApplication.UnicodeUTF8))
self.smoke_enabled.setText(QtGui.QApplication.translate("SettingsDialog", "Enabled *", None, QtGui.QApplication.UnicodeUTF8))
self.smoke_gradient.setText(QtGui.QApplication.translate("SettingsDialog", "Gradient", None, QtGui.QApplication.UnicodeUTF8))
self.groupBox_8.setTitle(QtGui.QApplication.translate("SettingsDialog", "Molotov", None, QtGui.QApplication.UnicodeUTF8))
self.fire_enabled.setText(QtGui.QApplication.translate("SettingsDialog", "Enabled *", None, QtGui.QApplication.UnicodeUTF8))
self.groupBox_9.setTitle(QtGui.QApplication.translate("SettingsDialog", "Chat", None, QtGui.QApplication.UnicodeUTF8))
self.chat_enabled.setText(QtGui.QApplication.translate("SettingsDialog", "Enabled *", None, QtGui.QApplication.UnicodeUTF8))
self.label.setText(QtGui.QApplication.translate("SettingsDialog", "Color", None, QtGui.QApplication.UnicodeUTF8))
self.label_2.setText(QtGui.QApplication.translate("SettingsDialog", "* Restart is needed", None, QtGui.QApplication.UnicodeUTF8))
self.button_save_settings.setText(QtGui.QApplication.translate("SettingsDialog", "Save settings", None, QtGui.QApplication.UnicodeUTF8))
self.button_cancel_settings.setText(QtGui.QApplication.translate("SettingsDialog", "Abort", None, QtGui.QApplication.UnicodeUTF8))
Expand Down
Loading

0 comments on commit 4f662cb

Please sign in to comment.