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

Добавлена совместимость с тёмной темой оформления

Browse Source
master-3.5
Хирецкий Михаил 8 years ago
parent 4c3e715848
commit e0cbc2aff1
10 changed files with 229 additions and 177 deletions
Show Stats Download Patch File Download Diff File

2
pym/consolegui/application/Box.py
Unescape View File

@ -79,7 +79,7 @@ class MainWgt(QtGui.QMainWindow):
self.main_frame = QtGui.QScrollArea(self)
self.main_frame.setFrameShape(QtGui.QFrame.Shape.NoFrame)
self.main_frame.setObjectName('MF')
self.main_frame.setStyleSheet("#MF " "{background-color: #FFFFFF;}")
#self.main_frame.setStyleSheet("#MF " "{background-color: #FFFFFF;}")
self.MainFrameWgt = StartWidget(self)
self.main_frame.setWidget(self.MainFrameWgt)

5
pym/consolegui/application/ControlButton.py
Unescape View File

@ -15,7 +15,7 @@
# limitations under the License.
from PySide import QtGui, QtCore
from more import LabelWordWrap, _print
from more import LabelWordWrap, _print, get_system_rgb, ParameterWindow
DEBUG_LEVEL = 0
@ -112,7 +112,8 @@ class ControlButtonWgt(QtGui.QWidget):
self.setAttribute(QtCore.Qt.WA_StyledBackground)
self.setObjectName('ControlButton')
self.setStyleSheet("QWidget#ControlButton "
"{background-color: #FFFFFF;}")
"{background-color: %s;}"%
get_system_rgb(self, ParameterWindow))
self.main_layout = QtGui.QVBoxLayout(self)
self.main_layout.setContentsMargins(28, 8, 0, 28)

20
pym/consolegui/application/DisplayMethod.py
Unescape View File

@ -41,9 +41,17 @@ class DisplayMethod(QtGui.QWidget):
# set new Title
self.ClientObj._parent.setWindowTitle(self.ClientObj.Name)
background_color = 'rgb(255,255,255)'
self._parent.main_frame.viewport().setStyleSheet(\
"background-color: %s ; " %background_color
background_color = self.palette().color(QtGui.QPalette.Base)
background_color = background_color.getRgb()
background_color = "rgb%s"%str(background_color[0:3])
#text_color = self.palette().color(QtGui.QPalette.Text)
#text_color = text_color.getRgb()
#text_color = "rgb%s"%str(text_color[0:3])
text_color = "rgb(160,160,160)"
self._parent.main_frame.viewport().setStyleSheet(
"background-color: %s ; " %background_color
)
self.setStyleSheet(self.styleSheet() + \
@ -59,13 +67,13 @@ class DisplayMethod(QtGui.QWidget):
'border-top-left-radius: 2px;'
'background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1,'
'stop: 0 rgb(230, 230, 230), stop: 0.5 transparent,'
'stop: 0 rgba(200, 200, 200,75), stop: 0.5 transparent,'
'stop: 1 transparent);'
'padding-top: 18px; padding-bottom: 18px;}'
'QGroupBox::title {background-color: transparent;'
'color: #555; subcontrol-position: top left;'
'margin-top: 6px; margin-left: 8px;}')
'color: %s; subcontrol-position: top left;'
'margin-top: 6px; margin-left: 8px;}'%text_color)
# transform a list into the dictionary {'group': [methods], ...}
guiMethods = {}

79
pym/consolegui/application/LeftMenu.py
Unescape View File

@ -16,7 +16,9 @@
from PySide import QtGui, QtCore
from more import ButtonMenu, icon_visible, LabelWordWrap, get_sid, show_msg, \
ClientServiceThread, show_question, get_view_params, _print
ClientServiceThread, show_question, get_view_params, _print, \
get_system_rgb
class StepLabel(QtGui.QLabel):
clicked = QtCore.Signal()
@ -25,11 +27,12 @@ class StepLabel(QtGui.QLabel):
self.setWordWrap(True)
self.setText(text)
self.updateGeometry()
# self.setCursor(QtCore.Qt.CursorShape.PointingHandCursor)
self.setCursor(QtCore.Qt.CursorShape.PointingHandCursor)
bg = get_system_rgb(parent._parent, QtGui.QPalette.Highlight)
self.setStyleSheet("QLabel {margin-left: 0px; margin-right: 0px;}"
"QLabel:hover {"#color: blue;"
# "QLabel:hover {color: white;"
"background-color: #D4D4D4;}")
"background-color: %s;}"%bg)
self.setContentsMargins(26,0,26,0)
self.adjustSize()
self.setFixedHeight(self.height() + 13)
@ -53,30 +56,30 @@ class LeftMenu(QtGui.QScrollArea):
# self.setStyleSheet("QWidget { background-color: rgb (%s) ;}" \
# %ClientObj.method_background_color.replace(' ',',',2))
# Set style
self.setStyleSheet("QScrollArea {"# D6D2D0
# "background-color: #EEEEEE;"
"background-color: qlineargradient("
"x1: 0, y1: 0, x2: 0, y2: 1, "
"stop: 0 #EEEEEE, stop: 0.8 #EEEEEE, "
"stop: 1 #E4E1E0);"
# "border: 4px solid red;"
"border-right: 1px solid qlineargradient("
"x1: 0, y1: 0, x2: 0, y2: 1, "
"stop: 0 #A8A3A0, stop: 0.8 #A8A3A0, "
"stop: 0.95 transparent, stop: 1 transparent);"
# "border-bottom-color: qlineargradient("
# self.setStyleSheet("QScrollArea {"# D6D2D0
## "background-color: #EEEEEE;"
# "background-color: qlineargradient("
# "x1: 0, y1: 0, x2: 0, y2: 1, "
# "stop: 0 #EEEEEE, stop: 0.8 #EEEEEE, "
# "stop: 1 #E4E1E0);"
#
## "border: 4px solid red;"
# "border-right: 1px solid qlineargradient("
# "x1: 0, y1: 0, x2: 0, y2: 1, "
# "stop: 0 transparent, stop: 1 #888380);"
# "border-left-color: qlineargradient("
# "x1: 1, y1: 0, x2: 0, y2: 0, "
# "stop: 0 transparent, stop: 1 #888380);"
# "border-top-color: qlineargradient("
# "x1: 0, y1: 1, x2: 0, y2: 0, "
# "stop: 0 transparent, stop: 1 #888380);}")
"border-bottom: 0px;"
"border-left: 0px;"
"border-top: 0px;}")
# "stop: 0 #A8A3A0, stop: 0.8 #A8A3A0, "
# "stop: 0.95 transparent, stop: 1 transparent);"
## "border-bottom-color: qlineargradient("
## "x1: 0, y1: 0, x2: 0, y2: 1, "
## "stop: 0 transparent, stop: 1 #888380);"
## "border-left-color: qlineargradient("
## "x1: 1, y1: 0, x2: 0, y2: 0, "
## "stop: 0 transparent, stop: 1 #888380);"
## "border-top-color: qlineargradient("
## "x1: 0, y1: 1, x2: 0, y2: 0, "
## "stop: 0 transparent, stop: 1 #888380);}")
# "border-bottom: 0px;"
# "border-left: 0px;"
# "border-top: 0px;}")
self.setFrameShape(QtGui.QFrame.Shape.NoFrame)
self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
@ -89,11 +92,11 @@ class LeftMenu(QtGui.QScrollArea):
self.widget = QtGui.QWidget (self)
# self.cur_palette = display_wgt._parent.viewport().palette()
self.widget.setPalette(self.cur_palette)
#self.cur_palette = display_wgt._parent.viewport().palette()
#self.widget.setPalette(self.cur_palette)
# self.widget.setStyleSheet("QWidget { background-color: rgb(%s) }" \
# %ClientObj.method_background_color.replace(' ',',',2))
self.widget.setStyleSheet("QWidget { background-color: #EEEEEE;}")
#self.widget.setStyleSheet("QWidget { background-color: #EEEEEE;}")
self.lable_list = []
self.button_list = {}
@ -258,7 +261,7 @@ class LeftMenu(QtGui.QScrollArea):
icon_visible(self._parent.ClientObj.MainWidget, 'Back', True)
self.widget = QtGui.QWidget (self)
self.widget.setPalette(self.cur_palette)
#--self.widget.setPalette(self.cur_palette)
# self.widget.setStyleSheet("QWidget { background-color: rgb (%s) }" \
# %self._parent.ClientObj.method_background_color.\
@ -266,12 +269,16 @@ class LeftMenu(QtGui.QScrollArea):
self.widget.setObjectName('QQQ')
self.widget.setStyleSheet("QWidget#QQQ { "
# "background-color: #EEEEEE;}")
# self.setStyleSheet("QScrollArea { "
"background-color: qlineargradient("
"x1: 0, y1: 0, x2: 0, y2: 1, "
"stop: 0 #EEEEEE, stop: 0.7 #EEEEEE, "
"stop: 0.9 #E4E1E0, stop: 1 #E4E1E0);}")
"background-color: %s;}"
% get_system_rgb(self, QtGui.QPalette.Base))
#self.setStyleSheet("QScrollArea { "
# "background-color: qlineargradient("
# "x1: 0, y1: 0, x2: 0, y2: 1, "
# "stop: 0 %(start)s, stop: 0.7 %(start)s, "
# "stop: 0.9 %(end)s, stop: 1 %(end)s);}"%
# {'start':get_system_rgb(self, QtGui.QPalette.Base),
# 'end':get_system_rgb(self, QtGui.QPalette.Window),
# })
self.button_list = []
self.layout = QtGui.QVBoxLayout(self.widget)

6
pym/consolegui/application/MainFrameResult.py
Unescape View File

@ -117,9 +117,9 @@ class MainFrameRes(QtGui.QWidget):
else:
self._parent.methodname_wgt.setMethodName(method_name)
parent.main_frame.viewport().setObjectName('main_frame')
parent.main_frame.viewport().setStyleSheet("#main_frame "
"{background-color: #FFFFFF;}")
#"{background-color: #E4E1E0;}")
#parent.main_frame.viewport().setStyleSheet("#main_frame "
# "{background-color: #FFFFFF;}")
# #"{background-color: #E4E1E0;}")
self.setObjectName("Frame_Res")
self.setStyleSheet("#Frame_Res {background-color: transparent;}")
#self.setStyleSheet("#Frame_Res {background-color: green;}")

41
pym/consolegui/application/SelectTable.py
Unescape View File

@ -15,6 +15,8 @@
# limitations under the License.
from PySide import QtGui, QtCore
from more import get_system_rgb, ParameterWindow
class Delegate(QtGui.QStyledItemDelegate):
def __init__(self, parent = None):
@ -45,23 +47,26 @@ class SelectedTableWidget(QtGui.QTableWidget):
self.setMouseTracking(True)
self.readonly = readonly
self.setSelectionMode \
(QtGui.QAbstractItemView.SelectionMode.NoSelection)
self.setSelectionMode(QtGui.QAbstractItemView.SelectionMode.NoSelection)
self.horizontalHeader().moveSection(-1,0)
self.horizontalHeader().setFixedHeight(24)
self.horizontalHeader().setMinimumSectionSize(48)
self.setFrameStyle(QtGui.QFrame.NoFrame)
self.verticalHeader().hide()
item_background = 'transparent' if brief else 'rgba(255,255,255,255)'
self.background_color = 'transparent' if brief else '#FFFFFF'
self.horizontalHeader().setStyleSheet \
("QHeaderView {background-color: transparent;"
"border: none; }"
'QHeaderView::section {background-color: %s;' \
%item_background + \
'border: 1px solid #B3ABA7; border-radius: 1px;}')
item_background = 'transparent' if brief else get_system_rgb(
self, ParameterWindow)
#'rgba(255,255,255,255)'
self.background_color = 'transparent' if brief else get_system_rgb(
self, ParameterWindow)
#'#FFFFFF'
self.horizontalHeader().setStyleSheet(
"QHeaderView {background-color: transparent;"
"border: none; }"
'QHeaderView::section {background-color: %s;'
% item_background +
'border: 1px solid #B3ABA7; border-radius: 1px;}')
self.unsetErrorBorder()
def setColor(self, row = -1):
@ -69,11 +74,13 @@ class SelectedTableWidget(QtGui.QTableWidget):
return
if row == -1:
for row in range (0, self.rowCount()):
for col in range (0, self.columnCount()):
for col in range(0, self.columnCount()):
item = self.item(row, col)
if not item:
continue
item.setBackground(QtGui.QBrush(QtGui.QColor('white')))
brush = QtGui.QBrush(
self.palette().color(ParameterWindow))
item.setBackground(brush)
def mousePressEvent(self, event):
if self.readonly:
@ -92,7 +99,9 @@ class SelectedTableWidget(QtGui.QTableWidget):
item = self.item(row, col)
if not item:
continue
item.setBackground(QtGui.QBrush(QtGui.QColor(220,220,220,255)))
bg = self.palette().color(QtGui.QPalette.Highlight)
item.setBackground(QtGui.QBrush(bg))
#QtGui.QColor(220,220,220,255)))
if self.currHovered != -1:
self.disableMouseOver()
@ -107,7 +116,9 @@ class SelectedTableWidget(QtGui.QTableWidget):
item = self.item(self.currHovered, col)
if not item:
continue
item.setBackground(QtGui.QBrush(QtGui.QColor("white")))
bg = self.palette().color(ParameterWindow)
item.setBackground(QtGui.QBrush(bg))
#item.setBackground(QtGui.QBrush(QtGui.QColor("white")))
def mouseMoveEvent(self, event):
QtGui.QTableView.mouseMoveEvent(self, event)

170
pym/consolegui/application/mainframe.py
Unescape View File

@ -24,7 +24,7 @@ from more import show_msg, LabelWordWrap, MultipleChoice, SelectTable, \
ComboFileWgt, PasswordWidget, get_sid, ClientServiceThread, \
ExpertWidget, ButtonsWidget, show_question, PlusRow, \
ReadonlyCheckBox, get_view_params, ImageLabel, SelectList, \
QComboWgt, _print
QComboWgt, _print, get_system_rgb, ParameterWindow
from sudsds import WebFault
from calculate.lib.utils.tools import Sizes
from SelectTable import SelectedTableWidget
@ -124,6 +124,14 @@ class MainFrame(QtGui.QWidget):
debug(11, "! method has not brief")
return False
def isMultistep(self):
"""
Метод содержит несколько шагов
:return:
"""
steps = self.ClientObj.param_objects[self.method_name]['steps_field']
return len(steps.tablevalue.head.string) > 1
def isBrief(self, step=None):
"""
Определяет является ли данный шаг отображением brief
@ -212,7 +220,8 @@ class MainFrame(QtGui.QWidget):
self.setObjectName('MainFrame')
self.setStyleSheet("QWidget#MainFrame "
"{background-color: #FFFFFF;}")
"{background-color: %s;}"%
get_system_rgb(self, ParameterWindow))
# " QWidget { border: 1px solid blue;}")
# x = 0 - space for image
x = 1
@ -303,11 +312,11 @@ class MainFrame(QtGui.QWidget):
self.buttons = []
for Group in self.view.groups.GroupField:
if Group.name:
if Group.name and self.isMultistep():
self.group_name_label = LabelWordWrap(Group.name, self)
self.group_name_label.setAlignment(QtCore.Qt.AlignLeft)
self.group_name_label.setStyleSheet("font-size: 16px;"
"color: #000; font: bold;");
"font-weight: bold;");
self.grid.addWidget(self.group_name_label, x, y, 1, 2)
x += 1
@ -315,7 +324,7 @@ class MainFrame(QtGui.QWidget):
if not Group.fields:
continue
if cached:
debug(10, "CACHE DEBUG",self.param_object)
debug(10, "CACHE DEBUG", self.param_object)
for field in Group.fields.Field:
if lastTable:
self.resize_table(lastTable)
@ -335,7 +344,7 @@ class MainFrame(QtGui.QWidget):
if field.name in self.changed_expert_list:
field.default = False
else:
boolmapping = {True:'on', False:'off'}
boolmapping = {True: 'on', False: 'off'}
field.value = boolmapping.get(value, value)
if field.name in self.changed_expert_list:
field.default = False
@ -529,7 +538,8 @@ class MainFrame(QtGui.QWidget):
# If errors came in parameters
if self.ClientObj.param_objects[self.method_name]['error']:
debug(10, "METHOD has errors", self.method_name)
debug(15, "ERRORS", self.ClientObj.param_objects[self.method_name]['error'])
debug(15, "ERRORS",
self.ClientObj.param_objects[self.method_name]['error'])
self.highlight_errors()
else:
debug(10, "METHOD has not errors", self.method_name)
@ -756,8 +766,8 @@ class MainFrame(QtGui.QWidget):
self.view_dict[field.name] = ReadonlyCheckBox(self)
else:
self.view_dict[field.name] = QCheckBox(self)
self.view_dict[field.name].setStyleSheet(
"QCheckBox:hover {background-color:#FFFFFF}")
#self.view_dict[field.name].setStyleSheet(
# "QCheckBox:hover {background-color:#FFFFFF}")
self.view_dict[field.name].setFocusPolicy(QtCore.Qt.NoFocus)
@ -845,27 +855,26 @@ class MainFrame(QtGui.QWidget):
comments = field.comments[0]
self.GroupBox = QGroupBox(field.label, self)
self.GroupBox.setStyleSheet("QGroupBox {"
'padding-top: 24px; padding-bottom: 0px;'
'padding-left: 5px; padding-right: 5px;'
'border: 1px solid transparent;'
'border-top-color: gray;'
'border-left-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,'
'stop: 0 gray, stop: 0.7 gray, stop: 1 transparent);'
'border-right-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,'
'stop: 0 gray, stop: 0.7 gray, stop: 1 transparent);'
'background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,'
'stop: 0 #eeeeee, stop: 0.8 transparent, stop: 1 transparent);'
'border-bottom: 0px;'
'border-top-left-radius: 4px;'
'border-top-right-radius: 4px;}'
'QGroupBox::title {'
'background-color: transparent;'
'subcontrol-position: top center;'
'margin-top: 6px;}')
self.GroupBox.setStyleSheet( self.GroupBox.styleSheet() +
"QGroupBox {"
'padding-top: 24px; padding-bottom: 0px;'
'padding-left: 5px; padding-right: 5px;'
'border: 1px solid gray;'
'border-left-color: qlineargradient( x1: 0, y1: 0, x2: 0, y2: 1,'
'stop: 0 gray, stop: 1 transparent);'
'border-top-color: qlineargradient( x1: 0, y1: 0, x2: 1, y2: 0,'
'stop: 0 gray, stop: 1 transparent);'
'border-right: 0px; border-bottom: 0px;'
'border-top-left-radius: 2px;'
'background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1,'
'stop: 0 rgba(200, 200, 200,75), stop: 0.5 transparent,'
'stop: 1 transparent);}'
'QGroupBox::title {'
'background-color: transparent;'
'subcontrol-position: top center;'
'margin-top: 6px;}')
self.ButGrp_dict[field.name] = QtGui.QButtonGroup(self)
layout = QtGui.QVBoxLayout(self.GroupBox)
radiolist = []
@ -952,7 +961,7 @@ class MainFrame(QtGui.QWidget):
for i in range(len(choice)):
if choice[i] == '---':
self.ComboBox.setStyleSheet('QComboBox::separator ' \
'{height : 2px; background: gray;' \
'{height : 2px; ' #background: gray;' \
'margin-top: 0 2px 0 2px;}')
self.ComboBox.insertSeparator(i)
continue
@ -1044,7 +1053,7 @@ class MainFrame(QtGui.QWidget):
self.ComboBox.setDuplicatesEnabled(False)
self.ComboBox.setEditable(True)
le = QtGui.QLineEdit(self)
le.setStyleSheet('QLineEdit {background:white;margin: 1px;}')
#le.setStyleSheet('QLineEdit {background:white;margin: 1px;}')
self.ComboBox.setLineEdit(le)
for i in range(0, len(choice)):
if choice[i] == '---':
@ -1465,7 +1474,8 @@ class MainFrame(QtGui.QWidget):
if not brief:
self.collect_object(var_mapper, param_object, method_name)()
for k, v in ((k,v) for k,v in var_mapper.items() if k.endswith("!")):
for k, v in ((k, v) for k, v in var_mapper.items() if
k.endswith("!")):
debug(10, "FORCE SET for", k[:-1], v.__repr__())
mapper = {"on": True, "off": False, "None": None}
param_object[k[:-1]] = mapper.get(v, v)
@ -1507,7 +1517,7 @@ class MainFrame(QtGui.QWidget):
else:
return button_clicked(
field.value, self.button_variable_mapper[field.name],
self.error_mapper[field.name], brief)
self.error_mapper[field.name], brief)
def button_clicked_after(self, result, method_name):
meth_result = []
@ -1802,9 +1812,10 @@ class MainFrame(QtGui.QWidget):
(table.body.stringArray[row].string[column])
table_widget.setItem(row, col, tablewidgetitem)
table_widget.item(row, col).setFlags \
(QtCore.Qt.ItemIsEditable)
brush = QtGui.QBrush(QtCore.Qt.black)
table_widget.item(row, col).setFlags(
QtCore.Qt.ItemIsEditable)
brush = QtGui.QBrush(
self.palette().color(QtGui.QPalette.Text))
table_widget.item(row, col).setForeground(brush)
elif brief and table.values.ChoiceValue[column].typefield in \
@ -1841,7 +1852,8 @@ class MainFrame(QtGui.QWidget):
table_widget.item(row, col).setFlags \
(QtCore.Qt.ItemIsEditable)
brush = QtGui.QBrush(QtCore.Qt.black)
brush = QtGui.QBrush(
self.palette().color(QtGui.QPalette.Text))
table_widget.item(row, col).setForeground(brush)
elif table.values.ChoiceValue[column].typefield in \
@ -1875,7 +1887,8 @@ class MainFrame(QtGui.QWidget):
table_widget.item(row, col).setFlags \
(QtCore.Qt.ItemIsEditable)
brush = QtGui.QBrush(QtCore.Qt.black)
brush = QtGui.QBrush(
self.palette().color(QtGui.QPalette.Text))
table_widget.item(row, col).setForeground(brush)
elif table.values.ChoiceValue[column].typefield in \
@ -1897,9 +1910,10 @@ class MainFrame(QtGui.QWidget):
tablewidgetitem.setData(1, data)
table_widget.setItem(row, col, tablewidgetitem)
table_widget.item(row, col).setFlags \
(QtCore.Qt.ItemIsEditable)
brush = QtGui.QBrush(QtCore.Qt.black)
table_widget.item(row, col).setFlags(
QtCore.Qt.ItemIsEditable)
brush = QtGui.QBrush(
self.palette().color(QtGui.QPalette.Text))
table_widget.item(row, col).setForeground(brush)
elif table.values.ChoiceValue[column].typefield in \
@ -1910,9 +1924,10 @@ class MainFrame(QtGui.QWidget):
tablewidgetitem = QtGui.QTableWidgetItem(val)
table_widget.setItem(row, col, tablewidgetitem)
table_widget.item(row, col).setFlags \
(QtCore.Qt.ItemIsEditable)
brush = QtGui.QBrush(QtCore.Qt.black)
table_widget.item(row, col).setFlags(
QtCore.Qt.ItemIsEditable)
brush = QtGui.QBrush(
self.palette().color(QtGui.QPalette.Text))
table_widget.item(row, col).setForeground(brush)
elif table.values.ChoiceValue[column].typefield == 'password':
@ -1923,9 +1938,10 @@ class MainFrame(QtGui.QWidget):
tablewidgetitem.setData(1, passwd)
table_widget.setItem(row, col, tablewidgetitem)
table_widget.item(row, col).setFlags \
(QtCore.Qt.ItemIsEditable)
brush = QtGui.QBrush(QtCore.Qt.black)
table_widget.item(row, col).setFlags(
QtCore.Qt.ItemIsEditable)
brush = QtGui.QBrush(
self.palette().color(QtGui.QPalette.Text))
table_widget.item(row, col).setForeground(brush)
def add_select_check(self, table):
@ -2039,12 +2055,12 @@ class MainFrame(QtGui.QWidget):
_help = self.ClientObj.param_objects \
[self.method_name]['steps_field'].help
group_name_label = LabelWordWrap(group_name, self)
group_name_label.setStyleSheet("font-size: 16px; color: #000;"
"font: bold;")
self.grid.addWidget(group_name_label, x, y, 1, 2)
x += 1
if self.isMultistep():
group_name_label = LabelWordWrap(group_name, self)
group_name_label.setStyleSheet("font-size: 16px;" # color: #000;"
"font: bold;")
self.grid.addWidget(group_name_label, x, y, 1, 2)
x += 1
if _help:
help_lbl = LabelWordWrap(_help, self)
@ -2133,30 +2149,27 @@ class MainFrame(QtGui.QWidget):
GroupBox = QGroupBox(Group.name)
GroupBox.setObjectName('GroupBoxBrief')
# brief_widget.setStyleSheet("#Brief_w "
GroupBox.setStyleSheet('#GroupBoxBrief {'
'font-weight: bold;'
'padding-top: 24px; padding-bottom: 0px;'
'padding-left: 5px; padding-right: 5px;'
'border: 1px solid transparent;'
'border-top-color: gray;'
'border-left-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,'
'stop: 0 gray, stop: 0.7 gray, stop: 1 transparent);'
'border-right-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,'
'stop: 0 gray, stop: 0.7 gray, stop: 1 transparent);'
'background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,'
'stop: 0 #eeeeee, stop: 0.8 transparent, stop: 1 transparent);'
'border-bottom: 0px;'
'border-top-left-radius: 4px;'
'border-top-right-radius: 4px;}'
'QGroupBox::title {'
'background-color: transparent;'
'subcontrol-position: top center;'
'margin-top: 6px;}')
GroupBox.setStyleSheet(
GroupBox.styleSheet() +
"#GroupBoxBrief {"
'padding-top: 24px; padding-bottom: 0px;'
'padding-left: 5px; padding-right: 5px;'
'border: 1px solid gray;'
'border-left-color: qlineargradient( x1: 0, y1: 0, x2: 0, y2: 1,'
'stop: 0 gray, stop: 1 transparent);'
'border-top-color: qlineargradient( x1: 0, y1: 0, x2: 1, y2: 0,'
'stop: 0 gray, stop: 1 transparent);'
'border-right: 0px; border-bottom: 0px;'
'border-top-left-radius: 2px;'
'background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1,'
'stop: 0 rgba(200, 200, 200,75), stop: 0.5 transparent,'
'stop: 1 transparent);}'
'QGroupBox::title {'
'background-color: transparent;'
'subcontrol-position: top center;'
'margin-top: 6px;}')
else:
return grid_x
gb_layout = QtGui.QGridLayout(GroupBox)
@ -2477,7 +2490,6 @@ class MainFrame(QtGui.QWidget):
for fields in self.expert_list:
param_object[fields] = None
return wrapper
def fix_string_value(self, value):

10
pym/consolegui/application/mainmenu.py
Unescape View File

@ -27,7 +27,7 @@ class MainMenu(QtGui.QWidget):
self.hlayout.setAlignment(QtCore.Qt.AlignLeft)
######### Back on one step
self.Back = TopMenu(_('All settings'),
self.Back = TopMenu(_('All Settings'),
['calculate-toolbar-all-settings', 'go-previous'], self)
self.Back.setStatusTip(_('All settings'))
self.Back.setToolTip(_('All settings'))
@ -129,7 +129,7 @@ class MainMenu(QtGui.QWidget):
def refresh(self):
######### Back on one step
self.Back.setText(_('All settings'))
self.Back.setText(_('All Settings'))
self.Back.setStatusTip(_('All settings'))
self.Back.setToolTip(_('All settings'))
@ -163,9 +163,9 @@ class MainMenu(QtGui.QWidget):
self.Certificates.setToolTip(_('Certificates manager'))
######### Tools dialog
self.Tool.setText(_('Tools'))
self.Tool.setStatusTip(_('Application settings'))
self.Tool.setToolTip(_('Application settings'))
self.Tool.setText(_('Preferences'))
self.Tool.setStatusTip(_('Application preferences'))
self.Tool.setToolTip(_('Application preferences'))
######### View help information
self.Help.setText(_('Help'))

61
pym/consolegui/application/more.py
Unescape View File

@ -26,9 +26,14 @@ from calculate.lib.utils.files import readLinesFile
from PIL import Image
from calculate.lib.utils.files import listDirectory
from calculate.lib.utils.colortext.palette import (
GreyPalette as WorkPalette)
GuiPalette as WorkPalette)
from calculate.update.update_info import UpdateInfo
ParameterWindow = QtGui.QPalette.Window
def get_system_rgb(obj, pallete_type):
color = obj.palette().color(pallete_type).getRgb()
return "rgb%s"%str(color[0:3])
_('The user must not be root')
class TopMenu(QtGui.QPushButton):
@ -207,6 +212,7 @@ class ButtonMenu(QtGui.QPushButton):
icon_flag = True
QtGui.QIcon.setThemeName('Calculate')
pm2 = None
for image in images:
icon = QtGui.QIcon.fromTheme(image)
if not icon.isNull():
@ -225,8 +231,9 @@ class ButtonMenu(QtGui.QPushButton):
icon = QtGui.QIcon.fromTheme('applications-system')
pm2 = icon.pixmap(32)
pm2 = pm2.scaled(QtCore.QSize(32,32), QtCore.Qt.IgnoreAspectRatio, \
QtCore.Qt.SmoothTransformation)
if pm2:
pm2 = pm2.scaled(QtCore.QSize(32,32), QtCore.Qt.IgnoreAspectRatio,
QtCore.Qt.SmoothTransformation)
self.image_lbl.setPixmap(pm2)
self.image_lbl.setMinimumHeight(32)
@ -255,12 +262,16 @@ class ButtonMenu(QtGui.QPushButton):
self.setFixedSize(96,80)
self.setObjectName(name)
# rgb(218,218,218)
# rgb(230,230,230)
self.setStyleSheet("QPushButton:flat {border: None;}"
"QPushButton:hover:pressed {border: none;"
"background-color: rgb(218,218,218);"
"background-color: %s;"
"border-radius: 7px;}"
"QPushButton:hover:!pressed{background-color: "
"rgb(230,230,230); border-radius: 7px;}")
"%s; border-radius: 7px;}"%
(get_system_rgb(self, QtGui.QPalette.Link),
get_system_rgb(self, QtGui.QPalette.Highlight)))
self.updateGeometry()
def text(self):
@ -426,6 +437,10 @@ class LabelWordWrap(QtGui.QLabel):
except (UnicodeDecodeError, UnicodeEncodeError):
pass
QtGui.QLabel.__init__(self, name, parent)
WorkPalette.defaultBackground = get_system_rgb(
self, QtGui.QPalette.Window)
WorkPalette.defaultColor[0] = get_system_rgb(
self, QtGui.QPalette.Text)
if mono:
self.setStyleSheet(
'font-family: Liberation Mono;color:{color};'
@ -575,7 +590,7 @@ class ComboFileWgt(QtGui.QWidget):
self.ComboBox.setEditable(True)
self.lineEdit = QtGui.QLineEdit(self)
self.ComboBox.setLineEdit(self.lineEdit)
self.lineEdit.setStyleSheet('QLineEdit {background:white;margin: 1px;}')
#self.lineEdit.setStyleSheet('QLineEdit {background:white;margin: 1px;}')
self.ComboBox.currentIndexChanged.connect(self.setCursorPos)
# self.lineEdit.setStyleSheet("QLineEdit {border: none;}")
@ -1465,19 +1480,17 @@ class SelectList(QtGui.QGroupBox):
self.setStyleSheet("QGroupBox {"
'padding-top: 8px; padding-bottom: 0px;'
'padding-left: 5px; padding-right: 5px;'
'border: 1px solid transparent;'
'border-top-color: gray;'
'border-left-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,'
'stop: 0 gray, stop: 0.7 gray, stop: 1 transparent);'
'border-right-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,'
'stop: 0 gray, stop: 0.7 gray, stop: 1 transparent);'
'background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,'
'stop: 0 #f0f0f0, stop: 0.8 transparent, stop: 1 transparent);'
'border-bottom: 0px;'
'border-top-left-radius: 4px;'
'border-top-right-radius: 4px;}'
'border: 1px solid gray;'
'border-left-color: qlineargradient( x1: 0, y1: 0, x2: 0, y2: 1,'
'stop: 0 gray, stop: 1 transparent);'
'border-top-color: qlineargradient( x1: 0, y1: 0, x2: 1, y2: 0,'
'stop: 0 gray, stop: 1 transparent);'
'border-right: 0px; border-bottom: 0px;'
'border-top-left-radius: 2px;'
'background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1,'
'stop: 0 rgba(200, 200, 200, 75), stop: 0.5 transparent,'
'stop: 1 transparent);}'
'QGroupBox::title {'
'background-color: transparent;'
@ -1851,7 +1864,7 @@ class PlusRow (QtGui.QWidget):
self.ComboBox.setDuplicatesEnabled(False)
self.ComboBox.setEditable(True)
le = QtGui.QLineEdit(self)
le.setStyleSheet('QLineEdit {background:white;margin: 1px;}')
# le.setStyleSheet('QLineEdit {background:white;margin: 1px;}')
self.ComboBox.setLineEdit(le)
text = None
if changed:
@ -2055,7 +2068,7 @@ class PlusRow (QtGui.QWidget):
if self.widget_dict[str(i)]:
val = self.widget_dict[str(i)]
elif type(self.widget_dict[str(i)]) in [MultipleChoice, \
elif type(self.widget_dict[str(i)]) in [MultipleChoice,
QtGui.QLineEdit]:
val = self.widget_dict[str(i)].text()
@ -2073,9 +2086,9 @@ class PlusRow (QtGui.QWidget):
tablewidgetitem.setData(1, passwd)
self.table.setItem(row, col, tablewidgetitem)
self.table.item(row, col).setFlags \
(QtCore.Qt.ItemIsEditable)
brush = QtGui.QBrush(QtCore.Qt.black)
self.table.item(row, col).setFlags(QtCore.Qt.ItemIsEditable)
brush = QtGui.QBrush(
self.palette().color(QtGui.QPalette.Text))
self.table.item(row, col).setForeground(brush)
# adding in table 'readonly' values

12
pym/consolegui/application/tools.py
Unescape View File

@ -33,7 +33,7 @@ class ToolsWidget (QtGui.QWidget):
# 100+parent.frameGeometry().y())
self.setFixedSize(450, 220)
self.setWindowTitle(_('Tools'))
self.setWindowTitle(_('Preferences'))
self.setWindowIcon(QtGui.QIcon.fromTheme("preferences-other"))
# for clear memory after closed this window
@ -139,8 +139,8 @@ class ToolTabWidget(QtGui.QTabWidget):
if self.other_icon.isNull():
self.other_icon = QtGui.QIcon.fromTheme("preferences-desctop")
self.addTab(self.GuiWidget, self.gui_icon ,_('GUI Tools'))
self.addTab(self.OtherWidget, self.other_icon, _('Other Tools'))
self.addTab(self.GuiWidget, self.gui_icon ,_('GUI'))
self.addTab(self.OtherWidget, self.other_icon, _('Other'))
# message about save
self.cur_tab_num = 0
@ -154,7 +154,7 @@ class ToolTabWidget(QtGui.QTabWidget):
def save_mess(self, tab_num):
# change tab with unsaved changes
tab_list = [_('GUI Tools'),_('Other Tools')]
tab_list = [_('GUI'),_('Other')]
if self.changed_flag:
text = _('There are unsaved changes in tab %s') \
@ -180,11 +180,11 @@ class ToolTabWidget(QtGui.QTabWidget):
if self.cur_tab_num == 0:
self.GuiWidget = ToolGui(self, self.ClientObj)
self.insertTab(self.cur_tab_num, self.GuiWidget, \
self.gui_icon, _('GUI Tools'))
self.gui_icon, _('GUI'))
elif self.cur_tab_num == 1:
self.OtherWidget = ToolOther(self, self.ClientObj)
self.insertTab(self.cur_tab_num, self.OtherWidget, \
self.other_icon, _('Other Tools'))
self.other_icon, _('Other'))
self.cur_tab_num = tab_num
self.changed_flag = False

Write Preview
Loading…
Cancel
Save