calculate
/
calculate-utils-3-console-gui
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix changed tabs, modified tools widget

Browse Source
master3.3
Denis Spiridonov 12 years ago
parent 29224b7fb7
commit 83454432d7
4 changed files with 123 additions and 235 deletions
Show Stats Download Patch File Download Diff File

2
consolegui/application/Box.py
Unescape View File

@ -222,7 +222,6 @@ class MainWgt(QtGui.QMainWindow):
if self.ClientObj.client.server_host_name in \
['127.0.0.1', 'localhost']:
self.ClientObj._parent.set_localhost(None)
self.ClientObj._parent.delClientObj(self.ClientObj)
else:
self.ClientObj._parent.connect()
return 0
@ -440,7 +439,6 @@ class MainWgt(QtGui.QMainWindow):
if self.ClientObj.client.server_host_name in \
['127.0.0.1', 'localhost']:
self.ClientObj._parent.set_localhost(None)
self.ClientObj._parent.delClientObj(self.ClientObj)
if reply == QtGui.QMessageBox.Yes:
# Closing session

26
consolegui/application/ConnectionTabs.py
Unescape View File

@ -348,21 +348,19 @@ class ToolTabWidget(QtGui.QTabWidget):
# self.tabbar.tabButton(self.currentIndex(), \
# QtGui.QTabBar.ButtonPosition.RightSide).hide()
def addClientObj(self, ClientObj):
self.connect_dict[ClientObj.host_name] = [self.FirstWidget.ClientObj,\
self.currentIndex()]
def delClientObj(self, ClientObj):
self.connect_dict.pop(ClientObj.host_name, None)
def find_host(self, host_name, port):
if not self.connect_dict.has_key(host_name):
return 0
ClientObj = self.connect_dict[host_name][0]
if ClientObj.port == port:
self.setCurrentIndex(self.connect_dict[host_name][1])
return 1
self.delClientObj(ClientObj)
ind = self.currentIndex()
for i in xrange (self.count() - 1):
self.setCurrentIndex(i)
wgt = self.currentWidget()
if hasattr (wgt, 'ClientObj'):
ClientObj = wgt.ClientObj
if host_name == ClientObj.host_name and \
port == ClientObj.port and ClientObj.client:
self.removeTab(ind)
return 1
self.setCurrentIndex(ind)
return 0
def closeEvent(self, event):

2
consolegui/application/conf_connection.py
Unescape View File

@ -385,8 +385,6 @@ class FrameConnection(QtGui.QWidget):
self.ClientObj._parent.rename_tab(host_name)
if host_name in ['127.0.0.1', 'localhost']:
self.ClientObj._parent.set_localhost(self.ClientObj)
else:
self.ClientObj._parent.addClientObj(self.ClientObj)
self.ClientObj.client.server_host_name = host_name
post_connect_action(self.ClientObj.client, self.ClientObj)
#----------------------------------------------------

226
consolegui/application/tools.py
Unescape View File

@ -46,12 +46,10 @@ class ToolsWidget (QtGui.QWidget):
- self.size().width() / 2, \
window.geometry().y() + window.geometry().height() / 2 \
- self.size().height() / 2)
gui_signal = QtCore.Signal()
other_signal = QtCore.Signal()
def create(self, parent, ClientObj):
if self.layout():
for i in range(self.layout().count()):
child = self.layout().takeAt(0)
@ -235,69 +233,6 @@ class ToolGui(QtGui.QWidget):
self.grid.addWidget(self.color_lbl,0,0)
self.grid.addWidget(self.color_button,0,1)
# # add open background image in grid
# self.cert_bg_image_lbl = LabelWordWrap(_('Path to bg Image'), self)
# self.cert_bg_image_lbl.setMaximumWidth \
# (self.cert_bg_image_lbl.sizeHint().width())
#
# self.fd_bg_image = FileOpenWgt \
# (self, 'file', _('Select Background Image'), '~/')
#
# self.fd_bg_image.setText(ClientObj.background_image)
#
# self.fd_bg_image.setToolTip(_('Enter "No" to remove Background'))
#
# self.grid.addWidget(self.cert_bg_image_lbl, 1, 0)
# self.grid.addWidget(self.fd_bg_image, 1, 1)
#
# # repeat background settings
# self.repeat_lbl = LabelWordWrap(_('Select repeat background'), self)
# self.repeat_lbl.setMaximumWidth(self.repeat_lbl.sizeHint().width())
#
# self.repeat_ComboBox = QComboBox(self)
# repeat_dict = {'no-repeat':_('no repeat'), \
# 'repeat-xy':_('repeat for x and y'), \
# 'repeat-x': _('repeat for x'), \
# 'repeat-y': _('repeat for y')}
#
# for repeat in repeat_dict:
# self.repeat_ComboBox.addItem(repeat_dict[repeat])
# self.repeat_ComboBox.setItemData(self.repeat_ComboBox.count()-1, \
# repeat)
# if ClientObj.background_repeat == repeat:
# self.repeat_ComboBox.setCurrentIndex \
# (self.repeat_ComboBox.count()-1)
#
## self.repeat_ComboBox.currentIndexChanged.connect(self.repeat_checked)
#
# #add repeat settings in grid
# self.grid.addWidget(self.repeat_lbl,2,0)
# self.grid.addWidget(self.repeat_ComboBox,2,1)
#
# # opacity setting
# self.opacity_lbl_text = _('Set opacity ')
# self.opacity_lbl = LabelWordWrap(self.opacity_lbl_text, self)
#
# self.opacity = QtGui.QSlider(QtCore.Qt.Orientation.Horizontal)
#
# self.opacity.setFocusPolicy(QtCore.Qt.StrongFocus)
#
# self.opacity.setTickPosition(QtGui.QSlider.TicksBothSides)
# self.opacity.setTickInterval(20)
# self.opacity.setSingleStep(1)
#
# self.opacity.setMaximum(255)
# self.opacity.setMinimum(0)
#
# self.opacity.setValue(int(ClientObj.bg_opacity))
#
# self.opacity.valueChanged.connect(self.set_opacity_lbl)
# self.set_opacity_lbl(ClientObj.bg_opacity)
#
# #add opacity settings in grid
# self.grid.addWidget(self.opacity_lbl,3,0)
# self.grid.addWidget(self.opacity,3,1)
# add height image in grid
self.h_image_lbl = LabelWordWrap(_('Height image'), self)
self.h_image_lbl.setMaximumWidth(self.h_image_lbl.sizeHint().width())
@ -308,8 +243,30 @@ class ToolGui(QtGui.QWidget):
self.h_image_lineedit.setText(str(ClientObj.height_image))
self.grid.addWidget(self.h_image_lbl, 4, 0)
self.grid.addWidget(self.h_image_lineedit, 4, 1)
self.grid.addWidget(self.h_image_lbl, 1, 0)
self.grid.addWidget(self.h_image_lineedit, 1, 1)
# add expers view result in grid
self.expert_lbl = LabelWordWrap(_('Expert view'), self)
self.expert_checkbox = QtGui.QCheckBox(self)
self.expert_checkbox.setChecked(ClientObj.expert)
self.expert_lbl.setToolTip(_('Expert mode view results'))
self.expert_checkbox.setToolTip(_('Expert mode view results'))
self.grid.addWidget(self.expert_lbl, 2, 0)
self.grid.addWidget(self.expert_checkbox, 2, 1, 1, 2)
# add count item in result table in grid
self.count_row_lbl = LabelWordWrap(_('Count Row in result Table'),self)
self.count_row_lbl.setMaximumWidth \
(self.count_row_lbl.sizeHint().width())
self.count_row_lineedit = QtGui.QLineEdit(self)
self.count_row_lineedit.setText(str(ClientObj.count_row_res_table))
self.grid.addWidget(self.count_row_lbl, 3, 0)
self.grid.addWidget(self.count_row_lineedit, 3, 1)
# add spacer
self.grid.addItem(QtGui.QSpacerItem(0,0, QtGui.QSizePolicy.Expanding, \
@ -317,12 +274,9 @@ class ToolGui(QtGui.QWidget):
# connect all with change value slot
self.color_button.clicked.connect(self.changed_val)
# self.fd_bg_image.textChanged.connect(self.changed_val)
# self.repeat_ComboBox.currentIndexChanged.connect(self.changed_val)
# self.opacity.valueChanged.connect(self.changed_val)
self.h_image_lineedit.textChanged.connect(self.changed_val)
self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
self.expert_checkbox.clicked.connect(self.changed_val)
self.count_row_lineedit.textChanged.connect(self.changed_val)
def changed_val(self):
self._parent.changed_flag = True
@ -362,32 +316,15 @@ class ToolGui(QtGui.QWidget):
new_config = []
bg_color_flag = False
bg_image_flag = False
bg_opacity_flag = False
repeat_bg_flag = False
count_row_flag = False
expert_flag = False
count_row_flag = False
h_image_flag = False
for line in config:
if line.startswith('bg_color '):
bg_color_flag = True
new_config.append('bg_color = %s\n' %self.bg_color)
# elif line.startswith('bg_image '):
# bg_image_flag = True
# if self.fd_bg_image.text().lower() == 'no' \
# or os.path.isfile(self.fd_bg_image.text()):
# new_config.append('bg_image = %s\n' \
# %self.fd_bg_image.text())
# else:
# new_config.append(line)
# elif line.startswith('bg_repeat '):
# repeat_bg_flag = True
# new_config.append('bg_repeat = %s\n' \
# %self.repeat_ComboBox.itemData \
# (self.repeat_ComboBox.currentIndex()))
# elif line.startswith('bg_opacity '):
# bg_opacity_flag = True
# new_config.append('bg_opacity = %s\n' \
# %str(self.opacity.value()))
elif line.startswith('height_image '):
h_image_flag = True
try:
@ -397,23 +334,43 @@ class ToolGui(QtGui.QWidget):
if height_image < 0 or height_image > 512:
height_image = ClientObj.height_image
new_config.append('height_image = %d\n' %height_image)
elif line.startswith('expert '):
expert_flag = True
if self.expert_checkbox.isChecked():
expert = 1
else:
expert = 0
new_config.append('expert = %d\n' %expert)
elif line.startswith('count_row '):
count_row_flag = True
try:
count_row = int(self.count_row_lineedit.text())
if count_row < 2:
count_row = 2
except ValueError:
count_row = ClientObj.count_row_res_table
new_config.append('count_row = %d\n' %count_row)
else:
new_config.append(line)
new_config = self.check_cfg (bg_color_flag, new_config, \
'[gui]', 'bg_color', self.bg_color)
# if self.fd_bg_image.text().lower() == 'no' \
# or os.path.isfile(self.fd_bg_image.text()):
# new_config = self.check_cfg (bg_image_flag, new_config, \
# '[gui]', 'bg_image', self.fd_bg_image.text())
#
# new_config = self.check_cfg (repeat_bg_flag, new_config, \
# '[gui]', 'bg_repeat', self.repeat_ComboBox.itemData \
# (self.repeat_ComboBox.currentIndex()))
#
# new_config = self.check_cfg (bg_opacity_flag, new_config, \
# '[gui]', 'bg_opacity', str(self.opacity.value()))
if self.expert_checkbox.isChecked():
expert = 1
else:
expert = 0
new_config = self.check_cfg (expert_flag, new_config, \
'[other]', 'expert', expert)
try:
count_row = int(self.count_row_lineedit.text())
if count_row < 2:
count_row = 2
except ValueError:
count_row = ClientObj.count_row_res_table
new_config = self.check_cfg (count_row_flag, new_config, \
'[other]', 'count_row', count_row)
try:
height_image = int(self.h_image_lineedit.text())
@ -429,14 +386,6 @@ class ToolGui(QtGui.QWidget):
fnc.write(line)
fnc.close()
# # save all without closing application
# ClientObj.method_background_color = self.bg_color
# ClientObj.bg_opacity = self.opacity.value()
#
# if self.fd_bg_image.text().lower() == 'not' \
# or os.path.isfile(self.fd_bg_image.text()):
# ClientObj.background_image = self.fd_bg_image.text()
# read config for changed parameters
ClientObj.create_user_config()
ClientObj.read_user_config(ClientObj.user_config)
@ -445,7 +394,6 @@ class ToolGui(QtGui.QWidget):
self._parent.changed_flag = False
return wrapper
# Other tools in ToolTabWidget
class ToolOther(QtGui.QWidget):
def __init__(self, parent, ClientObj):
@ -503,28 +451,6 @@ class ToolOther(QtGui.QWidget):
self.grid.addWidget(self.timeout_lbl, 2, 0)
self.grid.addWidget(self.timeout_lineedit, 2, 1)
# add expers view result in grid
self.expert_lbl = LabelWordWrap(_('Expert view'), self)
self.expert_checkbox = QtGui.QCheckBox(self)
self.expert_checkbox.setChecked(ClientObj.expert)
self.expert_lbl.setToolTip(_('Expert mode view results'))
self.expert_checkbox.setToolTip(_('Expert mode view results'))
self.grid.addWidget(self.expert_lbl, 3, 0)
self.grid.addWidget(self.expert_checkbox, 3, 1, 1, 2)
# add count item in result table in grid
self.count_row_lbl = LabelWordWrap(_('Count Row in result Table'),self)
self.count_row_lbl.setMaximumWidth \
(self.count_row_lbl.sizeHint().width())
self.count_row_lineedit = QtGui.QLineEdit(self)
self.count_row_lineedit.setText(str(ClientObj.count_row_res_table))
self.grid.addWidget(self.count_row_lbl, 4, 0)
self.grid.addWidget(self.count_row_lineedit, 4, 1)
# add spacer
self.grid.addItem(QtGui.QSpacerItem(0,0, QtGui.QSizePolicy.Expanding, \
QtGui.QSizePolicy.Expanding ), 5, 0, 1, 2)
@ -533,8 +459,6 @@ class ToolOther(QtGui.QWidget):
self.lang_ComboBox.currentIndexChanged.connect(self.changed_val)
self.fd_cert.textChanged.connect(self.changed_val)
self.timeout_lineedit.textChanged.connect(self.changed_val)
self.expert_checkbox.clicked.connect(self.changed_val)
self.count_row_lineedit.textChanged.connect(self.changed_val)
self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
@ -575,8 +499,6 @@ class ToolOther(QtGui.QWidget):
lang_flag = False
cert_flag = False
timeout_flag = False
expert_flag = False
count_row_flag = False
for line in config:
if line.startswith('lang '):
lang_flag = True
@ -599,20 +521,6 @@ class ToolOther(QtGui.QWidget):
except ValueError:
timeout = ClientObj.timeout
new_config.append('timeout = %d\n' %timeout)
elif line.startswith('expert '):
expert_flag = True
if self.expert_checkbox.isChecked():
expert = 1
else:
expert = 0
new_config.append('expert = %d\n' %expert)
elif line.startswith('count_row '):
count_row_flag = True
try:
count_row = int(self.count_row_lineedit.text())
except ValueError:
count_row = ClientObj.count_row_res_table
new_config.append('count_row = %d\n' %count_row)
else:
new_config.append(line)
@ -634,20 +542,6 @@ class ToolOther(QtGui.QWidget):
new_config = self.check_cfg (timeout_flag, new_config, \
'[other]', 'timeout', timeout)
if self.expert_checkbox.isChecked():
expert = 1
else:
expert = 0
new_config = self.check_cfg (expert_flag, new_config, \
'[other]', 'expert', expert)
try:
count_row = int(self.count_row_lineedit.text())
except ValueError:
count_row = ClientObj.count_row_res_table
new_config = self.check_cfg (count_row_flag, new_config, \
'[other]', 'count_row', count_row)
fnc = open(self.user_config, 'w')
for line in new_config:
fnc.write(line)

Write Preview
Loading…
Cancel
Save