Переход на PyQt5

master-3.5
parent 4870dc0040
commit a0ba291fa0

@ -2,7 +2,7 @@
#-*- coding: utf-8 -*- #-*- coding: utf-8 -*-
import sys, os, pwd import sys, os, pwd
from calculate.consolegui.qtwrapper import QtGuiWidgets from calculate.consolegui import qt
from calculate.consolegui.application.more import getRunProc, owner, _print from calculate.consolegui.application.more import getRunProc, owner, _print
import __builtin__ import __builtin__
@ -33,7 +33,7 @@ def main():
if sym_link != 'cl-console-gui' and sym_link.startswith("cl-console-gui-"): if sym_link != 'cl-console-gui' and sym_link.startswith("cl-console-gui-"):
args.method = sym_link[len("cl-console-gui-"):].replace("-","_") args.method = sym_link[len("cl-console-gui-"):].replace("-","_")
if args.method: if args.method:
app = QtGuiWidgets.QApplication(sys.argv) app = qt.QApplication(sys.argv)
app.setQuitOnLastWindowClosed(True) app.setQuitOnLastWindowClosed(True)
ex = SelectedMethodWgt(app, args) ex = SelectedMethodWgt(app, args)
if args.method == 'update': if args.method == 'update':
@ -72,7 +72,7 @@ def main():
except dbus.DBusException: except dbus.DBusException:
pass pass
app = QtGuiWidgets.QApplication(sys.argv) app = qt.QApplication(sys.argv)
second = False second = False
for run_commands in filter(lambda x:'cl-console-gui' in x[0],getRunProc()): for run_commands in filter(lambda x:'cl-console-gui' in x[0],getRunProc()):

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from calculate.consolegui.qtwrapper import QtGuiWidgets, QtCore from calculate.consolegui import qt
import urllib2 import urllib2
from DisplayMethod import DisplayMethod, StartWidget, ConnectLostLabel from DisplayMethod import DisplayMethod, StartWidget, ConnectLostLabel
@ -43,9 +43,9 @@ def debug(level, *args):
print s, print s,
print print
class MainWgt(QtGuiWidgets.QMainWindow): class MainWgt(qt.QMainWindow):
def __init__(self, ClientObj): def __init__(self, ClientObj):
QtGuiWidgets.QMainWindow.__init__(self) qt.QMainWindow.__init__(self)
self.ClientObj = ClientObj self.ClientObj = ClientObj
self.initUI() self.initUI()
@ -53,17 +53,17 @@ class MainWgt(QtGuiWidgets.QMainWindow):
# Create bottom status bar # Create bottom status bar
# self.statusbar = self.statusBar() # self.statusbar = self.statusBar()
self.Main = QtGuiWidgets.QWidget(self) self.Main = qt.QWidget(self)
self.vlayout = QtGuiWidgets.QVBoxLayout(self.Main) self.vlayout = qt.QVBoxLayout(self.Main)
# Create top main menu # Create top main menu
self.topmenu = MainMenu(self) self.topmenu = MainMenu(self)
self.vlayout.addWidget(self.topmenu) self.vlayout.addWidget(self.topmenu)
self.layout_wgt = QtGuiWidgets.QWidget(self) self.layout_wgt = qt.QWidget(self)
self.layout = QtGuiWidgets.QGridLayout(self.layout_wgt) self.layout = qt.QGridLayout(self.layout_wgt)
self.layout.setAlignment(QtCore.Qt.AlignLeft) self.layout.setAlignment(qt.Qt.AlignLeft)
# add control button widget # add control button widget
self.methodname_wgt = MethodNameWgt(self, self.ClientObj) self.methodname_wgt = MethodNameWgt(self, self.ClientObj)
@ -75,8 +75,8 @@ class MainWgt(QtGuiWidgets.QMainWindow):
self.left_frame.hide() self.left_frame.hide()
# Main Frame # Main Frame
self.main_frame = QtGuiWidgets.QScrollArea(self) self.main_frame = qt.QScrollArea(self)
self.main_frame.setFrameShape(QtGuiWidgets.QFrame.Shape.NoFrame) self.main_frame.setFrameShape(qt.QFrame.NoFrame)
self.main_frame.setObjectName('MF') self.main_frame.setObjectName('MF')
#self.main_frame.setStyleSheet("#MF " "{background-color: #FFFFFF;}") #self.main_frame.setStyleSheet("#MF " "{background-color: #FFFFFF;}")
@ -104,7 +104,7 @@ class MainWgt(QtGuiWidgets.QMainWindow):
def connecting(self): def connecting(self):
self.cur_size = self.size() self.cur_size = self.size()
self.ConnectWidget = FrameConnection(self, self.ClientObj) self.ConnectWidget = FrameConnection(self, self.ClientObj)
self.ConnectWidget.setAttribute(QtCore.Qt.WA_ShowModal) self.ConnectWidget.setWindowModality(qt.Qt.WindowModal)
self.ConnectWidget.initUI(self, self.ClientObj._parent) self.ConnectWidget.initUI(self, self.ClientObj._parent)
self.ConnectWidget.show() self.ConnectWidget.show()
@ -118,7 +118,7 @@ class MainWgt(QtGuiWidgets.QMainWindow):
# 3 methods for help menu # 3 methods for help menu
def help(self): def help(self):
self.HelpWidget = HelpWgt(self) self.HelpWidget = HelpWgt(self)
self.HelpWidget.setAttribute(QtCore.Qt.WA_ShowModal) self.HelpWidget.setWindowModality(qt.Qt.WindowModal)
self.HelpWidget.show() self.HelpWidget.show()
def hand_book(self): def hand_book(self):
@ -126,11 +126,11 @@ class MainWgt(QtGuiWidgets.QMainWindow):
site = "http://www.calculate-linux.ru/main/ru/calculate-console-gui" site = "http://www.calculate-linux.ru/main/ru/calculate-console-gui"
else: else:
site = "http://www.calculate-linux.org/main/en/calculate-console-gui" site = "http://www.calculate-linux.org/main/en/calculate-console-gui"
QtGuiWidgets.QDesktopServices.openUrl(QtCore.QUrl(site)) qt.QDesktopServices.openUrl(qt.QUrl(site))
def bug_report(self): def bug_report(self):
self.bugWidget = BugWgt(self) self.bugWidget = BugWgt(self)
self.bugWidget.setAttribute(QtCore.Qt.WA_ShowModal) self.bugWidget.setWindowModality(qt.Qt.WindowModal)
self.bugWidget.show() self.bugWidget.show()
def tools(self): def tools(self):
@ -199,7 +199,7 @@ class MainWgt(QtGuiWidgets.QMainWindow):
def view_session_info(self): def view_session_info(self):
self.SessionWgt = ViewSessionInfo(self, self.ClientObj.client, \ self.SessionWgt = ViewSessionInfo(self, self.ClientObj.client, \
self.ClientObj._parent) self.ClientObj._parent)
self.SessionWgt.setAttribute(QtCore.Qt.WA_ShowModal) self.SessionWgt.setWindowModality(qt.Qt.WindowModal)
self.SessionWgt.show() self.SessionWgt.show()
def disconnect(self, new_session=False): def disconnect(self, new_session=False):
@ -207,22 +207,22 @@ class MainWgt(QtGuiWidgets.QMainWindow):
return 1 return 1
if new_session: if new_session:
reply = QtGuiWidgets.QMessageBox.Yes reply = qt.QMessageBox.Yes
else: else:
reply = self.show_close_messagebox() reply = self.show_close_messagebox()
if reply in [QtGuiWidgets.QMessageBox.No, QtGuiWidgets.QMessageBox.Yes]: if reply in [qt.QMessageBox.No, qt.QMessageBox.Yes]:
if hasattr(self.ClientObj, 'signaling'): if hasattr(self.ClientObj, 'signaling'):
if self.ClientObj.signaling.isRunning(): if self.ClientObj.signaling.isRunning():
self.ClientObj.signaling.close() self.ClientObj.signaling.close()
self.ClientObj.signaling.wait() self.ClientObj.signaling.wait()
if reply == QtGuiWidgets.QMessageBox.Yes: if reply == qt.QMessageBox.Yes:
# Exit with closing session # Exit with closing session
client_del_sid(self.ClientObj.client) client_del_sid(self.ClientObj.client)
self.ClientObj.param_objects = {} self.ClientObj.param_objects = {}
if reply in [QtGuiWidgets.QMessageBox.No, QtGuiWidgets.QMessageBox.Yes]: if reply in [qt.QMessageBox.No, qt.QMessageBox.Yes]:
if not self.topmenu.Processes.isEnabled(): if not self.topmenu.Processes.isEnabled():
self.topmenu.Processes.setEnabled(True) self.topmenu.Processes.setEnabled(True)
self.topmenu.Session.setEnabled(True) self.topmenu.Session.setEnabled(True)
@ -412,7 +412,7 @@ class MainWgt(QtGuiWidgets.QMainWindow):
def show_close_messagebox(self): def show_close_messagebox(self):
list_pid = client_list_pid(self.ClientObj.client) list_pid = client_list_pid(self.ClientObj.client)
msgBox = QtGuiWidgets.QMessageBox(self) msgBox = qt.QMessageBox(self)
msgBox.setWindowTitle(_('Closing session')) msgBox.setWindowTitle(_('Closing session'))
msgBox.setText(_("Close this session") + ' ' + _('with %s?') \ msgBox.setText(_("Close this session") + ' ' + _('with %s?') \
% self.ClientObj.host_name + '\t') % self.ClientObj.host_name + '\t')
@ -426,16 +426,16 @@ class MainWgt(QtGuiWidgets.QMainWindow):
'data on process %d will be lost!') % len( 'data on process %d will be lost!') % len(
list_pid)) list_pid))
msgBox.setStandardButtons(QtGuiWidgets.QMessageBox.Yes | QtGuiWidgets.QMessageBox.No | \ msgBox.setStandardButtons(qt.QMessageBox.Yes | qt.QMessageBox.No | \
QtGuiWidgets.QMessageBox.Cancel) qt.QMessageBox.Cancel)
# translate # translate
msgBox.button(msgBox.Yes).setText(_('Yes')) msgBox.button(msgBox.Yes).setText(_('Yes'))
msgBox.button(msgBox.No).setText(_('No')) msgBox.button(msgBox.No).setText(_('No'))
msgBox.button(msgBox.Cancel).setText(_('Cancel')) msgBox.button(msgBox.Cancel).setText(_('Cancel'))
msgBox.setDefaultButton(QtGuiWidgets.QMessageBox.Cancel) msgBox.setDefaultButton(qt.QMessageBox.Cancel)
msgBox.setWindowIcon(QtGuiWidgets.QIcon.fromTheme("application-exit")) msgBox.setWindowIcon(qt.QIcon.fromTheme("application-exit"))
reply = msgBox.exec_() reply = msgBox.exec_()
return reply return reply
@ -443,7 +443,7 @@ class MainWgt(QtGuiWidgets.QMainWindow):
if self.ClientObj.client: if self.ClientObj.client:
reply = self.show_close_messagebox() reply = self.show_close_messagebox()
if reply == QtGuiWidgets.QMessageBox.Yes or reply == QtGuiWidgets.QMessageBox.No: if reply == qt.QMessageBox.Yes or reply == qt.QMessageBox.No:
self.topmenu.Processes.setEnabled(True) self.topmenu.Processes.setEnabled(True)
self.topmenu.Session.setEnabled(True) self.topmenu.Session.setEnabled(True)
self.topmenu.Back.setEnabled(True) self.topmenu.Back.setEnabled(True)
@ -461,7 +461,7 @@ class MainWgt(QtGuiWidgets.QMainWindow):
['127.0.0.1', 'localhost']: ['127.0.0.1', 'localhost']:
self.ClientObj._parent.set_localhost(None) self.ClientObj._parent.set_localhost(None)
if reply == QtGuiWidgets.QMessageBox.Yes: if reply == qt.QMessageBox.Yes:
# Closing session # Closing session
client_del_sid(self.ClientObj.client) client_del_sid(self.ClientObj.client)
return 1 return 1
@ -471,7 +471,7 @@ class MainWgt(QtGuiWidgets.QMainWindow):
return 1 return 1
def keyPressEvent(self, e): def keyPressEvent(self, e):
if e.key() == QtCore.Qt.Key_Return: if e.key() == qt.Qt.Key_Return:
self.control_button.keyPressEvent(e) self.control_button.keyPressEvent(e)
else: else:
QtGuiWidgets.QMainWindow.keyPressEvent(self, e) qt.QMainWindow.keyPressEvent(self, e)

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from calculate.consolegui.qtwrapper import QtGuiWidgets, QtCore from calculate.consolegui import qt
import urllib2 import urllib2
import OpenSSL, hashlib import OpenSSL, hashlib
@ -23,46 +23,46 @@ from create_cert import RequestCreate
from client_class import HTTPSClientCertTransport, Client_suds from client_class import HTTPSClientCertTransport, Client_suds
import os import os
class CertClass (QtGuiWidgets.QWidget): class CertClass (qt.QWidget):
def __init__(self, parent, ClientObj, window): def __init__(self, parent, ClientObj, window):
self.ClientObj = ClientObj self.ClientObj = ClientObj
QtGuiWidgets.QWidget.__init__(self) qt.QWidget.__init__(self)
# get_cert_path # get_cert_path
self.default_cert_path = ClientObj.path_to_cert self.default_cert_path = ClientObj.path_to_cert
# self.default_cert_path = self.default_cert_path.replace("~",homePath) # self.default_cert_path = self.default_cert_path.replace("~",homePath)
self.sendlayout = QtGuiWidgets.QGridLayout() self.sendlayout = qt.QGridLayout()
self.sendlayout.setContentsMargins(8,8,8,8) self.sendlayout.setContentsMargins(8,8,8,8)
self.mainlayout = QtGuiWidgets.QVBoxLayout() self.mainlayout = qt.QVBoxLayout()
# gen ceth by host # gen ceth by host
self.sendlayout.addWidget(LabelWordWrap(_('Host'), self), 0,0) self.sendlayout.addWidget(LabelWordWrap(_('Host'), self), 0,0)
self.send_host = QtGuiWidgets.QLineEdit('localhost', self) self.send_host = qt.QLineEdit('localhost', self)
self.sendlayout.addWidget(self.send_host, 0, 1, 1, 2) self.sendlayout.addWidget(self.send_host, 0, 1, 1, 2)
self.sendlayout.addWidget(LabelWordWrap(_('Port'), self), 1,0) self.sendlayout.addWidget(LabelWordWrap(_('Port'), self), 1,0)
cl_core_port = self.ClientObj.VarsApi.Get('core.cl_core_port') cl_core_port = self.ClientObj.VarsApi.Get('core.cl_core_port')
self.send_port = QtGuiWidgets.QLineEdit(cl_core_port, self) self.send_port = qt.QLineEdit(cl_core_port, self)
self.send_port.setValidator(QtGuiWidgets.QIntValidator(self)) self.send_port.setValidator(qt.QIntValidator(self))
self.sendlayout.addWidget(self.send_port, 1, 1, 1, 2) self.sendlayout.addWidget(self.send_port, 1, 1, 1, 2)
layout_button = QtGuiWidgets.QHBoxLayout() layout_button = qt.QHBoxLayout()
Send_button = QtGuiWidgets.QPushButton(_("Send a request"), self) Send_button = qt.QPushButton(_("Send a request"), self)
# Send_button.setFixedWidth(140) # Send_button.setFixedWidth(140)
Send_button.clicked.connect(self.send) Send_button.clicked.connect(self.send)
layout_button.addWidget(Send_button) layout_button.addWidget(Send_button)
Get_button = QtGuiWidgets.QPushButton(_("Get the certificate"), self) Get_button = qt.QPushButton(_("Get the certificate"), self)
# Get_button.setFixedWidth(140) # Get_button.setFixedWidth(140)
Get_button.clicked.connect(self.get) Get_button.clicked.connect(self.get)
layout_button.addWidget(Get_button) layout_button.addWidget(Get_button)
Quit_button = QtGuiWidgets.QPushButton(_("Quit"), self) Quit_button = qt.QPushButton(_("Quit"), self)
# Quit_button.setFixedWidth(60) # Quit_button.setFixedWidth(60)
Quit_button.setShortcut(QtGuiWidgets.QKeySequence(QtCore.Qt.Key_Return)) Quit_button.setShortcut(qt.QKeySequence(qt.Qt.Key_Return))
Quit_button.clicked.connect(self.close) Quit_button.clicked.connect(self.close)
layout_button.addWidget(Quit_button) layout_button.addWidget(Quit_button)
@ -71,7 +71,7 @@ class CertClass (QtGuiWidgets.QWidget):
self.sendlayout.setColumnStretch(1,1) self.sendlayout.setColumnStretch(1,1)
self.sendlayout.setColumnStretch(2,1) self.sendlayout.setColumnStretch(2,1)
self.GroupBoxSend = QtGuiWidgets.QGroupBox(_("Certificate signature request")) self.GroupBoxSend = qt.QGroupBox(_("Certificate signature request"))
# self.GroupBoxSend.setContentsMargins(10,0,0,0) # self.GroupBoxSend.setContentsMargins(10,0,0,0)
self.GroupBoxSend.setLayout(self.sendlayout) self.GroupBoxSend.setLayout(self.sendlayout)
@ -79,7 +79,7 @@ class CertClass (QtGuiWidgets.QWidget):
self.setLayout(self.mainlayout) self.setLayout(self.mainlayout)
self.setFocus() self.setFocus()
# for clear memory after closed this window # for clear memory after closed this window
self.setAttribute(QtCore.Qt.WA_DeleteOnClose) self.setAttribute(qt.Qt.WA_DeleteOnClose)
self.setFixedSize(self.sizeHint().width(), self.sizeHint().height()) self.setFixedSize(self.sizeHint().width(), self.sizeHint().height())
self.move(window.geometry().x() + window.geometry().width() / 2 \ self.move(window.geometry().x() + window.geometry().width() / 2 \
@ -88,7 +88,7 @@ class CertClass (QtGuiWidgets.QWidget):
- self.size().height() / 2 - 50) - self.size().height() / 2 - 50)
self.setWindowTitle (_('Certificates')) self.setWindowTitle (_('Certificates'))
self.setWindowIcon (QtGuiWidgets.QIcon.fromTheme("view-certificate")) self.setWindowIcon (qt.QIcon.fromTheme("view-certificate"))
def send(self): def send(self):
### client_post_request analog ### client_post_request analog
@ -116,10 +116,10 @@ class CertClass (QtGuiWidgets.QWidget):
reply = show_question(self, text, informative_text, reply = show_question(self, text, informative_text,
title = _('Calculate Console')) title = _('Calculate Console'))
if reply == QtGuiWidgets.QMessageBox.No: if reply == qt.QMessageBox.No:
return 0 return 0
elif reply == QtGuiWidgets.QMessageBox.Yes: elif reply == qt.QMessageBox.Yes:
pass pass
url = "https://%s:%d/?wsdl" %(by_host, int(port)) url = "https://%s:%d/?wsdl" %(by_host, int(port))
@ -159,18 +159,18 @@ class CertClass (QtGuiWidgets.QWidget):
reply = show_question(self, text, informative_text, reply = show_question(self, text, informative_text,
title = _('Calculate Console')) title = _('Calculate Console'))
if reply == QtGuiWidgets.QMessageBox.Yes: if reply == qt.QMessageBox.Yes:
self.req_obj = RequestCreate(self, self.ClientObj, key, \ self.req_obj = RequestCreate(self, self.ClientObj, key, \
cert_path, server_host_name) cert_path, server_host_name)
self.req_obj.show() self.req_obj.show()
elif reply == QtGuiWidgets.QMessageBox.No: elif reply == qt.QMessageBox.No:
pass pass
else: else:
self.req_obj = RequestCreate(self, self.ClientObj, key, \ self.req_obj = RequestCreate(self, self.ClientObj, key, \
cert_path, server_host_name) cert_path, server_host_name)
self.req_obj.setAttribute(QtCore.Qt.WA_ShowModal) self.req_obj.setWindowModality(qt.Qt.WindowModal)
self.req_obj.show() self.req_obj.show()
def end_send(self): def end_send(self):

@ -18,7 +18,7 @@ import dbus
import dbus.service import dbus.service
import dbus.mainloop.glib import dbus.mainloop.glib
from calculate.consolegui.qtwrapper import QtGuiWidgets, QtCore from calculate.consolegui import qt
import sudsds, time, sys import sudsds, time, sys
import os, pwd, shutil import os, pwd, shutil
import ConfigParser import ConfigParser
@ -32,9 +32,9 @@ from pid_information import client_pid_info
#from calculate.lib.cl_lang import setLocalTranslate #from calculate.lib.cl_lang import setLocalTranslate
#setLocalTranslate('console_gui',sys.modules[__name__]) #setLocalTranslate('console_gui',sys.modules[__name__])
class SelectedMethodWgt(QtGuiWidgets.QWidget): class SelectedMethodWgt(qt.QWidget):
def __init__(self, app, args): def __init__(self, app, args):
QtGuiWidgets.QWidget.__init__(self) qt.QWidget.__init__(self)
self.args = args self.args = args
self.user_changed_flag = False self.user_changed_flag = False
self.lang = args.lang self.lang = args.lang
@ -50,18 +50,18 @@ class SelectedMethodWgt(QtGuiWidgets.QWidget):
self.port = args.port or self.VarsGui.GetInteger('core.cl_core_port') self.port = args.port or self.VarsGui.GetInteger('core.cl_core_port')
self.MethodWidget = self.ClientObj.MainWidget self.MethodWidget = self.ClientObj.MainWidget
self.MethodWidget.topmenu.hide() self.MethodWidget.topmenu.hide()
layout = QtGuiWidgets.QHBoxLayout(self) layout = qt.QHBoxLayout(self)
layout.setContentsMargins(0,0,0,0) layout.setContentsMargins(0,0,0,0)
layout.setSpacing(0) layout.setSpacing(0)
layout.addWidget(self.MethodWidget) layout.addWidget(self.MethodWidget)
QtGuiWidgets.QIcon.setThemeName('Calculate') qt.QIcon.setThemeName('Calculate')
icon = QtGuiWidgets.QIcon.fromTheme('cl-console-gui-%s'%self.method.replace("_","-")) icon = qt.QIcon.fromTheme('cl-console-gui-%s'%self.method.replace("_","-"))
if icon.isNull(): if icon.isNull():
icon = QtGuiWidgets.QIcon.fromTheme('calculate-%s'%self.method.replace("_","-")) icon = qt.QIcon.fromTheme('calculate-%s'%self.method.replace("_","-"))
self.setWindowIcon(icon) self.setWindowIcon(icon)
QtGuiWidgets.QApplication.setWindowIcon(icon) qt.QApplication.setWindowIcon(icon)
conf_path = self.VarsGui.Get('cl_gui_config_path') conf_path = self.VarsGui.Get('cl_gui_config_path')
homePath = self.VarsGui.Get('ur_home_path') homePath = self.VarsGui.Get('ur_home_path')
@ -160,12 +160,12 @@ class SelectedMethodWgt(QtGuiWidgets.QWidget):
self.ClientObj.signaling.wait() self.ClientObj.signaling.wait()
return 1 return 1
if not self.user_changed_flag: if not self.user_changed_flag:
reply = QtGuiWidgets.QMessageBox.Yes reply = qt.QMessageBox.Yes
else: else:
reply = self.show_close_messagebox() reply = self.show_close_messagebox()
from mainframe import MainFrame from mainframe import MainFrame
if reply == QtGuiWidgets.QMessageBox.Yes: if reply == qt.QMessageBox.Yes:
if hasattr (self, 'con_lost_lbl'): if hasattr (self, 'con_lost_lbl'):
self.con_lost_lbl.hide() self.con_lost_lbl.hide()
self.con_lost_lbl.close() self.con_lost_lbl.close()
@ -188,31 +188,31 @@ class SelectedMethodWgt(QtGuiWidgets.QWidget):
if self.ClientObj.process_dict[str(pid)]['status'] != '1': if self.ClientObj.process_dict[str(pid)]['status'] != '1':
return 1 return 1
time.sleep(1) time.sleep(1)
elif reply == QtGuiWidgets.QMessageBox.No: elif reply == qt.QMessageBox.No:
return 0 return 0
def user_changed(self): def user_changed(self):
self.user_changed_flag = True self.user_changed_flag = True
def show_close_messagebox(self): def show_close_messagebox(self):
msgBox = QtGuiWidgets.QMessageBox(self) msgBox = qt.QMessageBox(self)
if self.ClientObj.method_names.has_key(self.method): if self.ClientObj.method_names.has_key(self.method):
method_name = self.ClientObj.method_names[self.method] method_name = self.ClientObj.method_names[self.method]
else: else:
method_name = self.method method_name = self.method
msgBox.setText(_("Close") +' "%s"?' %method_name) msgBox.setText(_("Close") +' "%s"?' %method_name)
msgBox.setStandardButtons(QtGuiWidgets.QMessageBox.Yes | QtGuiWidgets.QMessageBox.No) msgBox.setStandardButtons(qt.QMessageBox.Yes | qt.QMessageBox.No)
# translate # translate
msgBox.button(msgBox.Yes).setText(_('Yes')) msgBox.button(msgBox.Yes).setText(_('Yes'))
msgBox.button(msgBox.No).setText(_('No')) msgBox.button(msgBox.No).setText(_('No'))
if QtGuiWidgets.QIcon.hasThemeIcon('dialog-close'): if qt.QIcon.hasThemeIcon('dialog-close'):
msgBox.button(msgBox.No).setIcon \ msgBox.button(msgBox.No).setIcon \
(QtGuiWidgets.QIcon.fromTheme('dialog-close')) (qt.QIcon.fromTheme('dialog-close'))
msgBox.setDefaultButton(QtGuiWidgets.QMessageBox.No) msgBox.setDefaultButton(qt.QMessageBox.No)
msgBox.setWindowIcon(QtGuiWidgets.QIcon.fromTheme("application-exit")) msgBox.setWindowIcon(qt.QIcon.fromTheme("application-exit"))
reply = msgBox.exec_() reply = msgBox.exec_()
return reply return reply
@ -252,29 +252,30 @@ def parse():
return parser return parser
class MyTabBar(QtGuiWidgets.QTabBar): class MyTabBar(qt.QTabBar):
def __init__(self, _parent): def __init__(self, _parent):
QtGuiWidgets.QTabBar.__init__(self) qt.QTabBar.__init__(self)
self._parent = _parent self._parent = _parent
def wheelEvent(self, event): def wheelEvent(self, event):
event.ignore() event.ignore()
def mousePressEvent(self, event): def mousePressEvent(self, event):
if event.button() == QtCore.Qt.MouseButton.LeftButton: if event.button() == qt.Qt.LeftButton:
self.setCurrentIndex(self.tabAt(event.pos())) self.setCurrentIndex(self.tabAt(event.pos()))
event.accept() event.accept()
if event.button() == QtCore.Qt.MouseButton.MiddleButton: if event.button() == qt.Qt.MiddleButton:
self._parent.close_tab(self.tabAt(event.pos())) self._parent.close_tab(self.tabAt(event.pos()))
class ToolTabWidget(QtGuiWidgets.QTabWidget): class ToolTabWidget(qt.QTabWidget):
def __init__(self, app, args = None, host = None, port = None): def __init__(self, app, args = None, host = None, port = None):
QtGuiWidgets.QTabWidget.__init__(self) qt.QTabWidget.__init__(self)
self.app = app self.app = app
if args: if args:
if args.lang: if args.lang:
self.lang = args.lang self.lang = args.lang
self.current_icon = None
self.setContentsMargins(0,0,0,0) self.setContentsMargins(0,0,0,0)
self.init_variables() self.init_variables()
@ -286,17 +287,17 @@ class ToolTabWidget(QtGuiWidgets.QTabWidget):
ClientObj = ApiClient(app, self) ClientObj = ApiClient(app, self)
self.FirstWidget = ClientObj.MainWidget self.FirstWidget = ClientObj.MainWidget
self.PlusWidget = QtGuiWidgets.QWidget(self) self.PlusWidget = qt.QWidget(self)
self.tabbar = MyTabBar(self) self.tabbar = MyTabBar(self)
self.setTabBar(self.tabbar) self.setTabBar(self.tabbar)
QtGuiWidgets.QIcon.setThemeName('Calculate') qt.QIcon.setThemeName('Calculate')
self.gui_icon = QtGuiWidgets.QIcon.fromTheme("video-display") self.gui_icon = qt.QIcon.fromTheme("video-display")
self.other_icon = QtGuiWidgets.QIcon.fromTheme("list-add") self.other_icon = qt.QIcon.fromTheme("list-add")
if self.other_icon.isNull(): if self.other_icon.isNull():
self.other_icon = QtGuiWidgets.QIcon.fromTheme("preferences-desctop") self.other_icon = qt.QIcon.fromTheme("preferences-desctop")
self.addTab(self.FirstWidget, self.gui_icon , self.new_con_txt) self.addTab(self.FirstWidget, self.gui_icon , self.new_con_txt)
self.addTab(self.PlusWidget, self.other_icon, '') self.addTab(self.PlusWidget, self.other_icon, '')
@ -308,7 +309,7 @@ class ToolTabWidget(QtGuiWidgets.QTabWidget):
self.currentChanged.connect(self.changeWindowTitle) self.currentChanged.connect(self.changeWindowTitle)
self.setTabsClosable(True) self.setTabsClosable(True)
self.tabbar.tabButton(1, QtGuiWidgets.QTabBar.ButtonPosition.RightSide).hide() self.tabbar.tabButton(1, qt.QTabBar.RightSide).hide()
if not self.get_size(): if not self.get_size():
# definition of screen resolution # definition of screen resolution
@ -339,9 +340,8 @@ class ToolTabWidget(QtGuiWidgets.QTabWidget):
stop: 0 #E9E9E9, stop: 0.4 #E5E5E5, stop: 0 #E9E9E9, stop: 0.4 #E5E5E5,
stop: 0.5 #E1E1E1, stop: 1.0 #DDDDDD);} stop: 0.5 #E1E1E1, stop: 1.0 #DDDDDD);}
''') ''')
self.setWindowIcon(QtGuiWidgets.QIcon \
('/usr/share/pixmaps/calculate-console-offline.svg'))
self.set_offline_icon()
self.show() self.show()
self.app.processEvents() self.app.processEvents()
@ -366,6 +366,18 @@ class ToolTabWidget(QtGuiWidgets.QTabWidget):
if self.FirstWidget.ClientObj.client: if self.FirstWidget.ClientObj.client:
self.tray.set_icon(True) self.tray.set_icon(True)
def set_offline_icon(self):
if self.current_icon != "offline":
self.current_icon = "offline"
self.setWindowIcon(qt.QIcon \
('/usr/share/pixmaps/calculate-console-offline.svg'))
def set_online_icon(self):
if self.current_icon != "online":
self.current_icon = "online"
self.setWindowIcon(qt.QIcon \
('/usr/share/pixmaps/calculate-console-online.svg'))
def connect_count_changed(self, host, port, count): def connect_count_changed(self, host, port, count):
if count: if count:
if not host in self.connect_dict: if not host in self.connect_dict:
@ -382,13 +394,11 @@ class ToolTabWidget(QtGuiWidgets.QTabWidget):
self.connect_dict.pop(host) self.connect_dict.pop(host)
if self.connect_dict: if self.connect_dict:
self.setWindowIcon(QtGuiWidgets.QIcon \ self.set_online_icon()
('/usr/share/pixmaps/calculate-console-online.svg'))
if hasattr(self, 'tray'): if hasattr(self, 'tray'):
self.tray.set_icon(True) self.tray.set_icon(True)
else: else:
self.setWindowIcon(QtGuiWidgets.QIcon \ self.set_offline_icon()
('/usr/share/pixmaps/calculate-console-offline.svg'))
if hasattr(self, 'tray'): if hasattr(self, 'tray'):
self.tray.set_icon(False) self.tray.set_icon(False)
@ -496,7 +506,7 @@ class ToolTabWidget(QtGuiWidgets.QTabWidget):
# self.connect_dict[ClientObj.host_name] = \ # self.connect_dict[ClientObj.host_name] = \
# [ClientObj, self.currentIndex()] # [ClientObj, self.currentIndex()]
# self.tabbar.tabButton(self.currentIndex(), \ # self.tabbar.tabButton(self.currentIndex(), \
# QtGuiWidgets.QTabBar.ButtonPosition.RightSide).hide() # qt.QTabBar.RightSide).hide()
def find_host(self, host_name, port): def find_host(self, host_name, port):
ind = self.currentIndex() ind = self.currentIndex()
@ -558,7 +568,7 @@ class ToolTabWidget(QtGuiWidgets.QTabWidget):
return False return False
def keyPressEvent(self, e): def keyPressEvent(self, e):
if e.key() == QtCore.Qt.Key_Return: if e.key() == qt.Qt.Key_Return:
self.currentWidget().keyPressEvent(e) self.currentWidget().keyPressEvent(e)
else: else:
QtGuiWidgets.QTabWidget.keyPressEvent(self, e) qt.QTabWidget.keyPressEvent(self, e)

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from calculate.consolegui.qtwrapper import QtGuiWidgets, QtCore from calculate.consolegui import qt
from more import LabelWordWrap, _print, get_system_rgb, ParameterWindow from more import LabelWordWrap, _print, get_system_rgb, ParameterWindow
DEBUG_LEVEL = 0 DEBUG_LEVEL = 0
@ -27,26 +27,26 @@ def debug(level, *args):
print print
class MethodNameWgt(QtGuiWidgets.QWidget): class MethodNameWgt(qt.QWidget):
def __init__(self, parent, ClientObj): def __init__(self, parent, ClientObj):
QtGuiWidgets.QWidget.__init__(self, parent) qt.QWidget.__init__(self, parent)
self._parent = parent self._parent = parent
self.ClientObj = ClientObj self.ClientObj = ClientObj
# Set style # Set style
self.setAttribute(QtCore.Qt.WA_StyledBackground) self.setAttribute(qt.Qt.WA_StyledBackground)
self.setObjectName('ControlButton') self.setObjectName('ControlButton')
self.setStyleSheet("QWidget#ControlButton " self.setStyleSheet("QWidget#ControlButton "
"{background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1," "{background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,"
"stop: 0 #111111, stop: 0.95 #777777, stop: 1 #666666);}") "stop: 0 #111111, stop: 0.95 #777777, stop: 1 #666666);}")
self.hlayout = QtGuiWidgets.QHBoxLayout(self) self.hlayout = qt.QHBoxLayout(self)
self.hlayout.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) self.hlayout.setAlignment(qt.Qt.AlignLeft | qt.Qt.AlignVCenter)
self.hlayout.setContentsMargins(28, 0, 0, 0) self.hlayout.setContentsMargins(28, 0, 0, 0)
self.hlayout.setSpacing(0) self.hlayout.setSpacing(0)
self.meth_name = QtGuiWidgets.QLabel('Method Name', self) self.meth_name = qt.QLabel('Method Name', self)
# self.meth_name.setAlignment(QtCore.Qt.AlignLeft) # self.meth_name.setAlignment(qt.Qt.AlignLeft)
self.meth_name.setStyleSheet("font-size: 16px;" self.meth_name.setStyleSheet("font-size: 16px;"
"font: bold;" "font: bold;"
"color: white;"); "color: white;");
@ -102,31 +102,31 @@ class MethodNameWgt(QtGuiWidgets.QWidget):
# "stop: 0 #222222, stop: 1 #9797A0);}" + \ # "stop: 0 #222222, stop: 1 #9797A0);}" + \
# self.button_hover_style + self.button_pressed_style) # self.button_hover_style + self.button_pressed_style)
class ControlButtonWgt(QtGuiWidgets.QWidget): class ControlButtonWgt(qt.QWidget):
def __init__(self, parent, ClientObj): def __init__(self, parent, ClientObj):
QtGuiWidgets.QWidget.__init__(self, parent) qt.QWidget.__init__(self, parent)
self._parent = parent self._parent = parent
self.ClientObj = ClientObj self.ClientObj = ClientObj
# Set style # Set style
self.setAttribute(QtCore.Qt.WA_StyledBackground) self.setAttribute(qt.Qt.WA_StyledBackground)
self.setObjectName('ControlButton') self.setObjectName('ControlButton')
self.setStyleSheet("QWidget#ControlButton " self.setStyleSheet("QWidget#ControlButton "
"{background-color: %s;}"% "{background-color: %s;}"%
get_system_rgb(self, ParameterWindow)) get_system_rgb(self, ParameterWindow))
self.main_layout = QtGuiWidgets.QVBoxLayout(self) self.main_layout = qt.QVBoxLayout(self)
self.main_layout.setContentsMargins(28, 8, 0, 28) self.main_layout.setContentsMargins(28, 8, 0, 28)
self.question_label = LabelWordWrap("") self.question_label = LabelWordWrap("")
# self.question_label.hide() # self.question_label.hide()
self.main_layout.addWidget(self.question_label) self.main_layout.addWidget(self.question_label)
self.hlayout = QtGuiWidgets.QHBoxLayout() self.hlayout = qt.QHBoxLayout()
self.hlayout.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) self.hlayout.setAlignment(qt.Qt.AlignLeft | qt.Qt.AlignVCenter)
self.hlayout.setContentsMargins(0, 0, 28, 0) self.hlayout.setContentsMargins(0, 0, 28, 0)
self.hlayout.setSpacing(0) self.hlayout.setSpacing(0)
self.main_layout.addItem(QtGuiWidgets.QSpacerItem( self.main_layout.addItem(qt.QSpacerItem(
0, 0, QtGuiWidgets.QSizePolicy.Expanding, QtGuiWidgets.QSizePolicy.Expanding)) 0, 0, qt.QSizePolicy.Expanding, qt.QSizePolicy.Expanding))
self.main_layout.addLayout(self.hlayout) self.main_layout.addLayout(self.hlayout)
# self.setLayout(self.hlayout) # self.setLayout(self.hlayout)
@ -179,15 +179,15 @@ class ControlButtonWgt(QtGuiWidgets.QWidget):
self.hide() self.hide()
def add_custom_button(self, Group, x, y, brief=False, def add_custom_button(self, Group, x, y, brief=False,
next_button_text=None): next_button_text=""):
self.del_button() self.del_button()
buttons = self._parent.MainFrameWgt.buttons buttons = self._parent.MainFrameWgt.buttons
self.button_widget = QtGuiWidgets.QWidget(self) self.button_widget = qt.QWidget(self)
end_layout = QtGuiWidgets.QHBoxLayout(self.button_widget) end_layout = qt.QHBoxLayout(self.button_widget)
end_layout.setContentsMargins(0, 0, 0, 0) end_layout.setContentsMargins(0, 0, 0, 0)
end_layout.setSpacing(10) end_layout.setSpacing(10)
end_layout.addItem(QtGuiWidgets.QSpacerItem( end_layout.addItem(qt.QSpacerItem(
0, 0, QtGuiWidgets.QSizePolicy.Expanding, QtGuiWidgets.QSizePolicy.Maximum)) 0, 0, qt.QSizePolicy.Expanding, qt.QSizePolicy.Maximum))
self.customs = [] self.customs = []
self.add_cancel_button(end_layout, Group, brief, next_button_text) self.add_cancel_button(end_layout, Group, brief, next_button_text)
@ -198,7 +198,7 @@ class ControlButtonWgt(QtGuiWidgets.QWidget):
self.add_next_button(end_layout, Group, brief, next_button_text) self.add_next_button(end_layout, Group, brief, next_button_text)
has_next = True has_next = True
else: else:
button = QtGuiWidgets.QPushButton(self) button = qt.QPushButton(self)
self.customs.append(button) self.customs.append(button)
button.setText(field.label.decode('utf-8')) button.setText(field.label.decode('utf-8'))
button.clicked.connect(self.button_disabled) button.clicked.connect(self.button_disabled)
@ -209,23 +209,23 @@ class ControlButtonWgt(QtGuiWidgets.QWidget):
button.setDisabled(True) button.setDisabled(True)
end_layout.addWidget(button) end_layout.addWidget(button)
if not has_next and button: if not has_next and button:
button.setShortcut(QtGuiWidgets.QKeySequence(QtCore.Qt.Key_Return)) button.setShortcut(qt.QKeySequence(qt.Qt.Key_Return))
button.setShortcut(QtGuiWidgets.QKeySequence(QtCore.Qt.Key_Enter)) button.setShortcut(qt.QKeySequence(qt.Qt.Key_Enter))
self.default_button = button self.default_button = button
self.hlayout.addWidget(self.button_widget) self.hlayout.addWidget(self.button_widget)
def add_standart_button(self, Group, x, y, brief=False, \ def add_standart_button(self, Group, x, y, brief=False, \
next_button_text=None): next_button_text=""):
self.del_button() self.del_button()
main_frame = self._parent.MainFrameWgt main_frame = self._parent.MainFrameWgt
# add 1 (or 2) button ok (next) [and previous] # add 1 (or 2) button ok (next) [and previous]
self.button_widget = QtGuiWidgets.QWidget(self) self.button_widget = qt.QWidget(self)
end_layout = QtGuiWidgets.QHBoxLayout(self.button_widget) end_layout = qt.QHBoxLayout(self.button_widget)
end_layout.setContentsMargins(0, 0, 0, 0) end_layout.setContentsMargins(0, 0, 0, 0)
end_layout.setSpacing(10) end_layout.setSpacing(10)
end_layout.addItem(QtGuiWidgets.QSpacerItem( end_layout.addItem(qt.QSpacerItem(
0, 0, QtGuiWidgets.QSizePolicy.Expanding, QtGuiWidgets.QSizePolicy.Maximum)) 0, 0, qt.QSizePolicy.Expanding, qt.QSizePolicy.Maximum))
self.add_cancel_button(end_layout, Group, brief, next_button_text) self.add_cancel_button(end_layout, Group, brief, next_button_text)
self.add_prev_button(end_layout, Group, brief, next_button_text) self.add_prev_button(end_layout, Group, brief, next_button_text)
@ -236,10 +236,10 @@ class ControlButtonWgt(QtGuiWidgets.QWidget):
return x return x
def add_cancel_button(self, end_layout, Group, brief=False, def add_cancel_button(self, end_layout, Group, brief=False,
next_button_text=None): next_button_text=""):
# создать кнопку отмена # создать кнопку отмена
main_frame = self._parent.MainFrameWgt main_frame = self._parent.MainFrameWgt
self.cancel_button = QtGuiWidgets.QPushButton(self) self.cancel_button = qt.QPushButton(self)
if main_frame.has_errors: if main_frame.has_errors:
self.cancel_button.setText(_('Close').decode('utf-8')) self.cancel_button.setText(_('Close').decode('utf-8'))
else: else:
@ -258,23 +258,23 @@ class ControlButtonWgt(QtGuiWidgets.QWidget):
if main_frame.has_errors: if main_frame.has_errors:
self.cancel_button.setShortcut( self.cancel_button.setShortcut(
QtGuiWidgets.QKeySequence(QtCore.Qt.Key_Return)) qt.QKeySequence(qt.Qt.Key_Return))
self.cancel_button.setShortcut( self.cancel_button.setShortcut(
QtGuiWidgets.QKeySequence(QtCore.Qt.Key_Enter)) qt.QKeySequence(qt.Qt.Key_Enter))
self.default_button = self.cancel_button self.default_button = self.cancel_button
else: else:
self.cancel_button.setShortcut( self.cancel_button.setShortcut(
QtGuiWidgets.QKeySequence(QtCore.Qt.Key_Escape)) qt.QKeySequence(qt.Qt.Key_Escape))
def add_prev_button(self, end_layout, Group, brief=False, def add_prev_button(self, end_layout, Group, brief=False,
next_button_text=None): next_button_text=""):
# создать кнопку предыдущий # создать кнопку предыдущий
main_frame = self._parent.MainFrameWgt main_frame = self._parent.MainFrameWgt
if (self.ClientObj.param_objects[main_frame.method_name]['step'] != 0 if (self.ClientObj.param_objects[main_frame.method_name]['step'] != 0
and main_frame.mutable): and main_frame.mutable):
debug(10, "CREATE PREV BUTTON") debug(10, "CREATE PREV BUTTON")
self.prev_button = QtGuiWidgets.QPushButton(self) self.prev_button = qt.QPushButton(self)
self.prev_button.setText(Group.prevlabel or _('Previous')) self.prev_button.setText(Group.prevlabel or _('Previous'))
self.prev_button.clicked.connect(self.button_disabled) self.prev_button.clicked.connect(self.button_disabled)
@ -286,14 +286,14 @@ class ControlButtonWgt(QtGuiWidgets.QWidget):
end_layout.addWidget(self.prev_button) end_layout.addWidget(self.prev_button)
def add_next_button(self, end_layout, Group, brief=False, def add_next_button(self, end_layout, Group, brief=False,
next_button_text=None): next_button_text=""):
# если текущая страница - brief # если текущая страница - brief
# если это последний шаг, но метод без brief # если это последний шаг, но метод без brief
main_frame = self._parent.MainFrameWgt main_frame = self._parent.MainFrameWgt
if (brief or main_frame.view.groups.GroupField[-1].last and if (brief or main_frame.view.groups.GroupField[-1].last and
not main_frame.hasBrief()): not main_frame.hasBrief()):
debug(10, "CREATE PERFORM BUTTON") debug(10, "CREATE PERFORM BUTTON")
self.next_button = QtGuiWidgets.QPushButton(self) self.next_button = qt.QPushButton(self)
if next_button_text and brief: if next_button_text and brief:
self.next_button.setText(next_button_text) self.next_button.setText(next_button_text)
else: else:
@ -308,7 +308,7 @@ class ControlButtonWgt(QtGuiWidgets.QWidget):
end_layout.addWidget(self.next_button) end_layout.addWidget(self.next_button)
else: else:
debug(10, "CREATE NEXT BUTTON") debug(10, "CREATE NEXT BUTTON")
self.next_button = QtGuiWidgets.QPushButton(self) self.next_button = qt.QPushButton(self)
self.next_button.setText(Group.nextlabel or _("Next")) self.next_button.setText(Group.nextlabel or _("Next"))
self.next_button.clicked.connect(self.button_disabled) self.next_button.clicked.connect(self.button_disabled)
@ -322,8 +322,8 @@ class ControlButtonWgt(QtGuiWidgets.QWidget):
self.next_button.setMinimumWidth(64) self.next_button.setMinimumWidth(64)
self.next_button.setFixedHeight(32) self.next_button.setFixedHeight(32)
self.next_button.setShortcut(QtGuiWidgets.QKeySequence(QtCore.Qt.Key_Return)) self.next_button.setShortcut(qt.QKeySequence(qt.Qt.Key_Return))
self.next_button.setShortcut(QtGuiWidgets.QKeySequence(QtCore.Qt.Key_Enter)) self.next_button.setShortcut(qt.QKeySequence(qt.Qt.Key_Enter))
self.default_button = self.next_button self.default_button = self.next_button
def del_button(self): def del_button(self):
@ -350,18 +350,18 @@ class ControlButtonWgt(QtGuiWidgets.QWidget):
def pre_add_button(self): def pre_add_button(self):
self.del_button() self.del_button()
# add 1 (or 2) button ok (next) [and previous] # add 1 (or 2) button ok (next) [and previous]
self.button_widget = QtGuiWidgets.QWidget(self) self.button_widget = qt.QWidget(self)
end_layout = QtGuiWidgets.QHBoxLayout(self.button_widget) end_layout = qt.QHBoxLayout(self.button_widget)
end_layout.setContentsMargins(0, 0, 0, 0) end_layout.setContentsMargins(0, 0, 0, 0)
end_layout.setSpacing(0) end_layout.setSpacing(0)
end_layout.addItem(QtGuiWidgets.QSpacerItem(0, 0, \ end_layout.addItem(qt.QSpacerItem(0, 0, \
QtGuiWidgets.QSizePolicy.Expanding, qt.QSizePolicy.Expanding,
QtGuiWidgets.QSizePolicy.Maximum)) qt.QSizePolicy.Maximum))
return end_layout return end_layout
def add_clear_cache_button(self, pid=None): def add_clear_cache_button(self, pid=None):
end_layout = self.pre_add_button() end_layout = self.pre_add_button()
self.clear_proc_cache_button = QtGuiWidgets.QPushButton(_('Close'), self) self.clear_proc_cache_button = qt.QPushButton(_('Close'), self)
self.default_button = self.clear_proc_cache_button self.default_button = self.clear_proc_cache_button
self.ClientObj._parent.user_changed_flag = False self.ClientObj._parent.user_changed_flag = False
if pid: if pid:
@ -449,11 +449,11 @@ class ControlButtonWgt(QtGuiWidgets.QWidget):
self.ClientObj.app.processEvents() self.ClientObj.app.processEvents()
def keyPressEvent(self, e): def keyPressEvent(self, e):
if e.key() == QtCore.Qt.Key_Return: if e.key() == qt.Qt.Key_Return:
if self.default_button: if self.default_button:
self.default_button.click() self.default_button.click()
elif e.key() == QtCore.Qt.Key_Escape: elif e.key() == qt.Qt.Key_Escape:
if self.cancel_button: if self.cancel_button:
self.cancel_button.click() self.cancel_button.click()
else: else:
QtGuiWidgets.QWidget.keyPressEvent(self, e) qt.QWidget.keyPressEvent(self, e)

@ -14,17 +14,17 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from calculate.consolegui.qtwrapper import QtGuiWidgets, QtCore from calculate.consolegui import qt
from more import ButtonMenu, FlowLayout, get_sid, ClientServiceThread, \ from more import ButtonMenu, FlowLayout, get_sid, ClientServiceThread, \
get_view_params, show_msg, client_list_methods get_view_params, show_msg, client_list_methods
class DisplayMethod(QtGuiWidgets.QWidget): class DisplayMethod(qt.QWidget):
def __init__(self, parent, ClientObj): def __init__(self, parent, ClientObj):
super(DisplayMethod, self).__init__(parent) super(DisplayMethod, self).__init__(parent)
self.ClientObj = ClientObj self.ClientObj = ClientObj
self._parent = parent self._parent = parent
self.setAttribute(QtCore.Qt.WA_DeleteOnClose) self.setAttribute(qt.Qt.WA_DeleteOnClose)
ClientObj.back_step_list = [] ClientObj.back_step_list = []
def initUI(self, results): def initUI(self, results):
@ -34,18 +34,18 @@ class DisplayMethod(QtGuiWidgets.QWidget):
IMAGE = 3 # Getting image path IMAGE = 3 # Getting image path
self.lable_list = [] self.lable_list = []
self.button_list = {} self.button_list = {}
self.layout = QtGuiWidgets.QVBoxLayout() self.layout = qt.QVBoxLayout()
self.groupbox_dict = {} self.groupbox_dict = {}
self.layout_dict = {} self.layout_dict = {}
# set new Title # set new Title
self.ClientObj._parent.setWindowTitle(self.ClientObj.Name) self.ClientObj._parent.setWindowTitle(self.ClientObj.Name)
background_color = self.palette().color(QtGuiWidgets.QPalette.Base) background_color = self.palette().color(qt.QPalette.Base)
background_color = background_color.getRgb() background_color = background_color.getRgb()
background_color = "rgb%s"%str(background_color[0:3]) background_color = "rgb%s"%str(background_color[0:3])
#text_color = self.palette().color(QtGuiWidgets.QPalette.Text) #text_color = self.palette().color(qt.QPalette.Text)
#text_color = text_color.getRgb() #text_color = text_color.getRgb()
#text_color = "rgb%s"%str(text_color[0:3]) #text_color = "rgb%s"%str(text_color[0:3])
text_color = "rgb(160,160,160)" text_color = "rgb(160,160,160)"
@ -103,10 +103,10 @@ class DisplayMethod(QtGuiWidgets.QWidget):
sub_group = group.split('.')[1].encode('utf-8') sub_group = group.split('.')[1].encode('utf-8')
if not self.groupbox_dict.has_key(group_name): if not self.groupbox_dict.has_key(group_name):
self.groupbox_dict[group_name] = \ self.groupbox_dict[group_name] = \
QtGuiWidgets.QGroupBox(group_name.decode('utf-8'), self) qt.QGroupBox(group_name.decode('utf-8'), self)
self.groupbox_dict[group_name].setAlignment \ self.groupbox_dict[group_name].setAlignment \
(QtCore.Qt.AlignLeft) (qt.Qt.AlignLeft)
if not self.layout_dict.has_key(group_name): if not self.layout_dict.has_key(group_name):
self.layout_dict[group_name] = \ self.layout_dict[group_name] = \
@ -139,8 +139,8 @@ class DisplayMethod(QtGuiWidgets.QWidget):
if not self.groupbox_dict.has_key(group): if not self.groupbox_dict.has_key(group):
self.groupbox_dict[group] = \ self.groupbox_dict[group] = \
QtGuiWidgets.QGroupBox(group, self) qt.QGroupBox(group, self)
self.groupbox_dict[group].setAlignment(QtCore.Qt.AlignLeft) self.groupbox_dict[group].setAlignment(qt.Qt.AlignLeft)
if not self.layout_dict.has_key(group): if not self.layout_dict.has_key(group):
self.layout_dict[group] = FlowLayout(self.groupbox_dict[group]) self.layout_dict[group] = FlowLayout(self.groupbox_dict[group])
@ -172,8 +172,8 @@ class DisplayMethod(QtGuiWidgets.QWidget):
(self.button_list[group]\ (self.button_list[group]\
[len(self.button_list[group]) - 1]) [len(self.button_list[group]) - 1])
self.layout_dict[group].setAlignment(QtCore.Qt.AlignLeft | \ self.layout_dict[group].setAlignment(qt.Qt.AlignLeft | \
QtCore.Qt.AlignTop) qt.Qt.AlignTop)
self.groupbox_dict[group].setLayout(self.layout_dict[group]) self.groupbox_dict[group].setLayout(self.layout_dict[group])
keys_sort = guiMethods.keys() keys_sort = guiMethods.keys()
@ -194,7 +194,7 @@ class DisplayMethod(QtGuiWidgets.QWidget):
(self.button_list[sub_group]\ (self.button_list[sub_group]\
[len(self.button_list[sub_group]) - 1]) [len(self.button_list[sub_group]) - 1])
self.layout_dict[group_name].setAlignment(QtCore.Qt.AlignLeft) self.layout_dict[group_name].setAlignment(qt.Qt.AlignLeft)
if self.groupbox_dict[group_name]: if self.groupbox_dict[group_name]:
self.groupbox_dict[group_name].setLayout \ self.groupbox_dict[group_name].setLayout \
(self.layout_dict[group_name]) (self.layout_dict[group_name])
@ -207,7 +207,7 @@ class DisplayMethod(QtGuiWidgets.QWidget):
self.layout.addWidget(self.groupbox_dict[group]) self.layout.addWidget(self.groupbox_dict[group])
self.groupbox_dict[group] = None self.groupbox_dict[group] = None
self.layout.setAlignment(QtCore.Qt.AlignTop) self.layout.setAlignment(qt.Qt.AlignTop)
self.setLayout(self.layout) self.setLayout(self.layout)
self.resize(self.layout.sizeHint()) self.resize(self.layout.sizeHint())
@ -287,15 +287,15 @@ class DisplayMethod(QtGuiWidgets.QWidget):
self.ClientObj.MainWidget.delete_MainFrameWgt() self.ClientObj.MainWidget.delete_MainFrameWgt()
self.ClientObj.MainWidget.MainFrameWgt = \ self.ClientObj.MainWidget.MainFrameWgt = \
QtGuiWidgets.QWidget(self.ClientObj.MainWidget) qt.QWidget(self.ClientObj.MainWidget)
if not back: if not back:
# save data for a step back # save data for a step back
self.ClientObj.back_step_list.append ([groups, sub_group, \ self.ClientObj.back_step_list.append ([groups, sub_group, \
self.ClientObj._parent.windowTitle()]) self.ClientObj._parent.windowTitle()])
hlayout = QtGuiWidgets.QHBoxLayout() hlayout = qt.QHBoxLayout()
hlayout.addItem(QtGuiWidgets.QSpacerItem( 0, 0, \ hlayout.addItem(qt.QSpacerItem( 0, 0, \
QtGuiWidgets.QSizePolicy.Expanding, QtGuiWidgets.QSizePolicy.Expanding)) qt.QSizePolicy.Expanding, qt.QSizePolicy.Expanding))
self.ClientObj.MainWidget.MainFrameWgt.setLayout(hlayout) self.ClientObj.MainWidget.MainFrameWgt.setLayout(hlayout)
self.ClientObj.MainWidget.main_frame.setWidget \ self.ClientObj.MainWidget.main_frame.setWidget \
@ -327,30 +327,30 @@ class DisplayMethod(QtGuiWidgets.QWidget):
self.onActivated_thread.wait() self.onActivated_thread.wait()
event.accept() event.accept()
class StartWidget(QtGuiWidgets.QWidget): class StartWidget(qt.QWidget):
def __init__(self, parent): def __init__(self, parent):
super(StartWidget, self).__init__(parent) super(StartWidget, self).__init__(parent)
self.setAttribute(QtCore.Qt.WA_DeleteOnClose) self.setAttribute(qt.Qt.WA_DeleteOnClose)
class ConnectLostLabel (QtGuiWidgets.QWidget): class ConnectLostLabel (qt.QWidget):
def __init__(self, text, parent, reconnect = False): def __init__(self, text, parent, reconnect = False):
QtGuiWidgets.QWidget.__init__(self, parent.layout_wgt) qt.QWidget.__init__(self, parent.layout_wgt)
self._parent = parent self._parent = parent
if parent.main_frame.isEnabled(): if parent.main_frame.isEnabled():
parent.left_frame.setDisabled(True) parent.left_frame.setDisabled(True)
parent.main_frame.setDisabled(True) parent.main_frame.setDisabled(True)
parent.control_button.setDisabled(True) parent.control_button.setDisabled(True)
white_layout = QtGuiWidgets.QVBoxLayout(self) white_layout = qt.QVBoxLayout(self)
lbl = QtGuiWidgets.QLabel(text + '\n\n', self) lbl = qt.QLabel(text + '\n\n', self)
white_layout.addWidget(lbl) white_layout.addWidget(lbl)
self.setStyleSheet ('background-color: rgba(250,250,250,200);' self.setStyleSheet ('background-color: rgba(250,250,250,200);'
'border-radius: 2px;') 'border-radius: 2px;')
if reconnect: if reconnect:
self.reconnect_button = QtGuiWidgets.QPushButton(_('Reconnect'), self) self.reconnect_button = qt.QPushButton(_('Reconnect'), self)
self.reconnect_button.setIcon(QtGuiWidgets.QIcon.fromTheme('view-refresh')) self.reconnect_button.setIcon(qt.QIcon.fromTheme('view-refresh'))
self.reconnect_button.setStyleSheet(''' self.reconnect_button.setStyleSheet('''
QPushButton { QPushButton {
border: 2px solid #8f8f91; border: 2px solid #8f8f91;
@ -373,19 +373,19 @@ class ConnectLostLabel (QtGuiWidgets.QWidget):
self.reconnect_button.sizeHint().height()) self.reconnect_button.sizeHint().height())
self.reconnect_button.resize(self.reconnect_button.sizeHint() + \ self.reconnect_button.resize(self.reconnect_button.sizeHint() + \
QtCore.QSize(5,5)) qt.QSize(5,5))
self.reconnect_button.show() self.reconnect_button.show()
self.reconnect_button.setEnabled(True) self.reconnect_button.setEnabled(True)
lbl.setAlignment(QtCore.Qt.AlignCenter) lbl.setAlignment(qt.Qt.AlignCenter)
self.move(-10,-10) self.move(-10,-10)
self.resize(parent.layout_wgt.size() + QtCore.QSize(20,20)) self.resize(parent.layout_wgt.size() + qt.QSize(20,20))
self.setEnabled(True) self.setEnabled(True)
def resize_widget(self): def resize_widget(self):
cur_size = self._parent.size() cur_size = self._parent.size()
self.resize(cur_size + QtCore.QSize(20,20)) self.resize(cur_size + qt.QSize(20,20))
if hasattr (self, 'reconnect_button'): if hasattr (self, 'reconnect_button'):
self.reconnect_button.move(cur_size.width()/2 - \ self.reconnect_button.move(cur_size.width()/2 - \
self.reconnect_button.sizeHint().width()/2,\ self.reconnect_button.sizeHint().width()/2,\

@ -14,21 +14,21 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from calculate.consolegui.qtwrapper import QtGuiWidgets, QtCore from calculate.consolegui import qt
from more import ButtonMenu, icon_visible, LabelWordWrap, get_sid, show_msg, \ 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 get_system_rgb
class StepLabel(QtGuiWidgets.QLabel): class StepLabel(qt.QLabel):
clicked = QtCore.Signal() clicked = qt.Signal()
def __init__(self, text, parent): def __init__(self, text, parent):
QtGuiWidgets.QLabel.__init__(self, parent) qt.QLabel.__init__(self, parent)
self.setWordWrap(True) self.setWordWrap(True)
self.setText(text) self.setText(text)
self.updateGeometry() self.updateGeometry()
self.setCursor(QtCore.Qt.CursorShape.PointingHandCursor) self.setCursor(qt.Qt.PointingHandCursor)
bg = get_system_rgb(parent._parent, QtGuiWidgets.QPalette.Highlight) bg = get_system_rgb(parent._parent, qt.QPalette.Highlight)
self.setStyleSheet("QLabel {margin-left: 0px; margin-right: 0px;}" self.setStyleSheet("QLabel {margin-left: 0px; margin-right: 0px;}"
"QLabel:hover {"#color: blue;" "QLabel:hover {"#color: blue;"
# "QLabel:hover {color: white;" # "QLabel:hover {color: white;"
@ -45,9 +45,9 @@ class StepLabel(QtGuiWidgets.QLabel):
font.setBold(bold) font.setBold(bold)
self.setFont(font) self.setFont(font)
class LeftMenu(QtGuiWidgets.QScrollArea): class LeftMenu(qt.QScrollArea):
def __init__(self, parent, ClientObj): def __init__(self, parent, ClientObj):
QtGuiWidgets.QScrollArea.__init__(self, parent) qt.QScrollArea.__init__(self, parent)
self._parent = parent self._parent = parent
self.ClientObj = ClientObj self.ClientObj = ClientObj
@ -80,8 +80,8 @@ class LeftMenu(QtGuiWidgets.QScrollArea):
# "border-bottom: 0px;" # "border-bottom: 0px;"
# "border-left: 0px;" # "border-left: 0px;"
# "border-top: 0px;}") # "border-top: 0px;}")
self.setFrameShape(QtGuiWidgets.QFrame.Shape.NoFrame) self.setFrameShape(qt.QFrame.NoFrame)
self.setAttribute(QtCore.Qt.WA_DeleteOnClose) self.setAttribute(qt.Qt.WA_DeleteOnClose)
def create_menu(self, display_wgt, groups, sub_groups, ClientObj): def create_menu(self, display_wgt, groups, sub_groups, ClientObj):
self.display_wgt = display_wgt self.display_wgt = display_wgt
@ -90,7 +90,7 @@ class LeftMenu(QtGuiWidgets.QScrollArea):
# icon_visible(self._parent.ClientObj.MainWidget, 'Methods', True) # icon_visible(self._parent.ClientObj.MainWidget, 'Methods', True)
icon_visible(self._parent.ClientObj.MainWidget, 'Back', True) icon_visible(self._parent.ClientObj.MainWidget, 'Back', True)
self.widget = QtGuiWidgets.QWidget (self) self.widget = qt.QWidget (self)
#self.cur_palette = display_wgt._parent.viewport().palette() #self.cur_palette = display_wgt._parent.viewport().palette()
#self.widget.setPalette(self.cur_palette) #self.widget.setPalette(self.cur_palette)
@ -100,9 +100,9 @@ class LeftMenu(QtGuiWidgets.QScrollArea):
self.lable_list = [] self.lable_list = []
self.button_list = {} self.button_list = {}
self.layout = QtGuiWidgets.QVBoxLayout(self.widget) self.layout = qt.QVBoxLayout(self.widget)
self.layout.setAlignment(QtCore.Qt.AlignTop | QtCore.Qt.AlignHCenter) self.layout.setAlignment(qt.Qt.AlignTop | qt.Qt.AlignHCenter)
self.group_name = LabelWordWrap(sub_groups[0].split('.')[0], self) self.group_name = LabelWordWrap(sub_groups[0].split('.')[0], self)
@ -114,7 +114,7 @@ class LeftMenu(QtGuiWidgets.QScrollArea):
'border-radius: 3px;' 'border-radius: 3px;'
'}') '}')
self.group_name.setAlignment(QtCore.Qt.AlignHCenter) self.group_name.setAlignment(qt.Qt.AlignHCenter)
self.layout.addWidget(self.group_name) self.layout.addWidget(self.group_name)
for num in range(len(sub_groups)): for num in range(len(sub_groups)):
@ -180,12 +180,12 @@ class LeftMenu(QtGuiWidgets.QScrollArea):
def groupActivated(self, groups, sub_group, title, ClientObj, back = False): def groupActivated(self, groups, sub_group, title, ClientObj, back = False):
ClientObj.MainWidget.delete_MainFrameWgt() ClientObj.MainWidget.delete_MainFrameWgt()
ClientObj.MainWidget.MainFrameWgt = QtGuiWidgets.QWidget \ ClientObj.MainWidget.MainFrameWgt = qt.QWidget \
(ClientObj.MainWidget) (ClientObj.MainWidget)
hlayout = QtGuiWidgets.QHBoxLayout() hlayout = qt.QHBoxLayout()
hlayout.addItem(QtGuiWidgets.QSpacerItem( 0, 0, \ hlayout.addItem(qt.QSpacerItem( 0, 0, \
QtGuiWidgets.QSizePolicy.Expanding, QtGuiWidgets.QSizePolicy.Expanding )) qt.QSizePolicy.Expanding, qt.QSizePolicy.Expanding ))
ClientObj.MainWidget.MainFrameWgt.setLayout(hlayout) ClientObj.MainWidget.MainFrameWgt.setLayout(hlayout)
@ -260,7 +260,7 @@ class LeftMenu(QtGuiWidgets.QScrollArea):
# icon_visible(self._parent.ClientObj.MainWidget, 'Methods', True) # icon_visible(self._parent.ClientObj.MainWidget, 'Methods', True)
icon_visible(self._parent.ClientObj.MainWidget, 'Back', True) icon_visible(self._parent.ClientObj.MainWidget, 'Back', True)
self.widget = QtGuiWidgets.QWidget (self) self.widget = qt.QWidget (self)
#--self.widget.setPalette(self.cur_palette) #--self.widget.setPalette(self.cur_palette)
# self.widget.setStyleSheet("QWidget { background-color: rgb (%s) }" \ # self.widget.setStyleSheet("QWidget { background-color: rgb (%s) }" \
@ -270,19 +270,19 @@ class LeftMenu(QtGuiWidgets.QScrollArea):
self.widget.setObjectName('QQQ') self.widget.setObjectName('QQQ')
self.widget.setStyleSheet("QWidget#QQQ { " self.widget.setStyleSheet("QWidget#QQQ { "
"background-color: %s;}" "background-color: %s;}"
% get_system_rgb(self, QtGuiWidgets.QPalette.Base)) % get_system_rgb(self, qt.QPalette.Base))
#self.setStyleSheet("QScrollArea { " #self.setStyleSheet("QScrollArea { "
# "background-color: qlineargradient(" # "background-color: qlineargradient("
# "x1: 0, y1: 0, x2: 0, y2: 1, " # "x1: 0, y1: 0, x2: 0, y2: 1, "
# "stop: 0 %(start)s, stop: 0.7 %(start)s, " # "stop: 0 %(start)s, stop: 0.7 %(start)s, "
# "stop: 0.9 %(end)s, stop: 1 %(end)s);}"% # "stop: 0.9 %(end)s, stop: 1 %(end)s);}"%
# {'start':get_system_rgb(self, QtGuiWidgets.QPalette.Base), # {'start':get_system_rgb(self, qt.QPalette.Base),
# 'end':get_system_rgb(self, QtGuiWidgets.QPalette.Window), # 'end':get_system_rgb(self, qt.QPalette.Window),
# }) # })
self.button_list = [] self.button_list = []
self.layout = QtGuiWidgets.QVBoxLayout(self.widget) self.layout = qt.QVBoxLayout(self.widget)
self.layout.setAlignment(QtCore.Qt.AlignTop | QtCore.Qt.AlignHCenter) self.layout.setAlignment(qt.Qt.AlignTop | qt.Qt.AlignHCenter)
# self.layout.setContentsMargins(28,28,28,0) # self.layout.setContentsMargins(28,28,28,0)
self.layout.setContentsMargins(2,28,2,0) self.layout.setContentsMargins(2,28,2,0)
self.layout.setSpacing(5) self.layout.setSpacing(5)
@ -295,8 +295,8 @@ class LeftMenu(QtGuiWidgets.QScrollArea):
self.button_list.append(StepLabel(steps[num_step], self)) self.button_list.append(StepLabel(steps[num_step], self))
# if len(icons) > num_step: # if len(icons) > num_step:
# themeName = QtGuiWidgets.QIcon.themeName() # themeName = qt.QIcon.themeName()
# icon = QtGuiWidgets.QIcon() # icon = qt.QIcon()
# icon.setThemeName(themeName) # icon.setThemeName(themeName)
# icon = icon.fromTheme(icons[num_step]) # icon = icon.fromTheme(icons[num_step])
# if icon.isNull(): # if icon.isNull():
@ -314,9 +314,9 @@ class LeftMenu(QtGuiWidgets.QScrollArea):
# (self.check_step(method_name, num_step)) # (self.check_step(method_name, num_step))
# calculate button width # calculate button width
fmn = QtGuiWidgets.QFontMetrics(QtGuiWidgets.QFont('',-1,QtGuiWidgets.QFont.Normal)) fmn = qt.QFontMetrics(qt.QFont('',-1,qt.QFont.Normal))
normal_width = fmn.width(self.button_list[num_step].text()) normal_width = fmn.width(self.button_list[num_step].text())
fmb = QtGuiWidgets.QFontMetrics(QtGuiWidgets.QFont('',-1,QtGuiWidgets.QFont.Bold)) fmb = qt.QFontMetrics(qt.QFont('',-1,qt.QFont.Bold))
bold_width = fmb.width(self.button_list[num_step].text()) bold_width = fmb.width(self.button_list[num_step].text())
diff = bold_width - normal_width + 6 diff = bold_width - normal_width + 6
@ -340,8 +340,8 @@ class LeftMenu(QtGuiWidgets.QScrollArea):
self.changed_step(self._parent.ClientObj.param_objects \ self.changed_step(self._parent.ClientObj.param_objects \
[method_name]['step']) [method_name]['step'])
# self.layout.addItem(QtGuiWidgets.QSpacerItem(100, 100, \ # self.layout.addItem(qt.QSpacerItem(100, 100, \
# QtGuiWidgets.QSizePolicy.Expanding, QtGuiWidgets.QSizePolicy.Expanding)) # qt.QSizePolicy.Expanding, qt.QSizePolicy.Expanding))
self.setWidget(self.widget) self.setWidget(self.widget)
@ -354,8 +354,8 @@ class LeftMenu(QtGuiWidgets.QScrollArea):
self.show() self.show()
# create helper signals # create helper signals
collect = QtCore.Signal() collect = qt.Signal()
calling = QtCore.Signal() calling = qt.Signal()
def collect_object(self, method_name, set_step = None): def collect_object(self, method_name, set_step = None):
def wrapper(): def wrapper():
@ -370,15 +370,12 @@ class LeftMenu(QtGuiWidgets.QScrollArea):
change_step: change_step:
# self.setEnabled(True) # self.setEnabled(True)
return return
try:
self.collect.disconnect()
except RuntimeError:
pass
self.collect.connect(self._parent.ClientObj.MainWidget.\ self.collect.connect(self._parent.ClientObj.MainWidget.\
MainFrameWgt.collect_object()) MainFrameWgt.collect_object())
self.collect.emit() self.collect.emit()
self.collect.disconnect()
return wrapper return wrapper
def calling_method(self, method_name, set_step = None): def calling_method(self, method_name, set_step = None):
@ -395,13 +392,10 @@ class LeftMenu(QtGuiWidgets.QScrollArea):
self.check_step(method_name, set_step) self.check_step(method_name, set_step)
# self.setEnabled(True) # self.setEnabled(True)
return return
try:
self.calling.disconnect()
except RuntimeError:
pass
self.calling.connect(self._parent.ClientObj.MainWidget.\ self.calling.connect(self._parent.ClientObj.MainWidget.\
MainFrameWgt.calling(True, from_left_frame = True)) MainFrameWgt.calling(True, from_left_frame = True))
self.calling.emit() self.calling.emit()
self.calling.disconnect()
self.check_step(method_name, set_step) self.check_step(method_name, set_step)
return wrapper return wrapper
@ -452,7 +446,7 @@ class LeftMenu(QtGuiWidgets.QScrollArea):
reply = show_question(self._parent, text, informative_text, \ reply = show_question(self._parent, text, informative_text, \
not_move = True, title = _('Calculate Console')) not_move = True, title = _('Calculate Console'))
if reply == QtGuiWidgets.QMessageBox.No: if reply == qt.QMessageBox.No:
self.setEnabled(True) self.setEnabled(True)
return return

@ -15,13 +15,13 @@
# limitations under the License. # limitations under the License.
from Box import MainWgt from Box import MainWgt
from calculate.consolegui.qtwrapper import QtGuiWidgets from calculate.consolegui import qt
#from mainmenu import MainMenu #from mainmenu import MainMenu
import os import os
import ConfigParser import ConfigParser
class ApiClient(QtGuiWidgets.QWidget): class ApiClient(qt.QWidget):
def __init__(self, app, tabs): def __init__(self, app, tabs):
super(ApiClient, self).__init__() super(ApiClient, self).__init__()
self.app = app self.app = app
@ -50,7 +50,7 @@ class ApiClient(QtGuiWidgets.QWidget):
self.client = None self.client = None
self.host_name = None self.host_name = None
self.res_layout = QtGuiWidgets.QVBoxLayout(self) self.res_layout = qt.QVBoxLayout(self)
self.process_dict = {} self.process_dict = {}
self.param_objects = {} self.param_objects = {}

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from calculate.consolegui.qtwrapper import QtGuiWidgets, QtCore from calculate.consolegui import qt
DEBUG_LEVEL = 0 DEBUG_LEVEL = 0
@ -42,13 +42,13 @@ class LabelWordWrap(Label):
Label.__init__(self, name, parent, mono, margin_top) Label.__init__(self, name, parent, mono, margin_top)
# set text selectable # set text selectable
self.setTextInteractionFlags(self.textInteractionFlags() | \ self.setTextInteractionFlags(self.textInteractionFlags() | \
QtCore.Qt.TextSelectableByMouse) qt.Qt.TextSelectableByMouse)
class PlusButton(QtGuiWidgets.QPushButton): class PlusButton(qt.QPushButton):
def __init__(self, parent, ClientObj, method, disable_method=None): def __init__(self, parent, ClientObj, method, disable_method=None):
QtGuiWidgets.QPushButton.__init__(self, parent) qt.QPushButton.__init__(self, parent)
try: try:
self.setIcon(QtGuiWidgets.QIcon.fromTheme('list-add')) self.setIcon(qt.QIcon.fromTheme('list-add'))
except: except:
self.setText('+') self.setText('+')
self._parent = parent self._parent = parent
@ -81,12 +81,12 @@ class PlusButton(QtGuiWidgets.QPushButton):
' - ' + self.ClientObj.Name) ' - ' + self.ClientObj.Name)
self._parent._parent.main_frame_view(view, self.method) self._parent._parent.main_frame_view(view, self.method)
class MainFrameRes(QtGuiWidgets.QWidget): class MainFrameRes(qt.QWidget):
valSignal = QtCore.Signal() valSignal = qt.Signal()
def __init__(self, parent, ClientObj, method_name, meth_result, def __init__(self, parent, ClientObj, method_name, meth_result,
change_offset=False): change_offset=False):
# super(MainFrameRes, self).__init__(self, parent) # super(MainFrameRes, self).__init__(self, parent)
QtGuiWidgets.QWidget.__init__(self, parent) qt.QWidget.__init__(self, parent)
self._parent = parent self._parent = parent
self.ClientObj = ClientObj self.ClientObj = ClientObj
self.method_name = method_name self.method_name = method_name
@ -125,14 +125,14 @@ class MainFrameRes(QtGuiWidgets.QWidget):
#self.setStyleSheet("#Frame_Res {background-color: green;}") #self.setStyleSheet("#Frame_Res {background-color: green;}")
# "QWidget {border: 1px solid red;}") # "QWidget {border: 1px solid red;}")
self.timer = QtCore.QTimer(self) self.timer = qt.QTimer(self)
self.timer.timeout.connect(self.show_bottom) self.timer.timeout.connect(self.show_bottom)
self.timer.start(100) self.timer.start(100)
self.valSignal.connect(self.show_bottom) self.valSignal.connect(self.show_bottom)
def initUI(self): def initUI(self):
#self.setSizePolicy(QtGuiWidgets.QSizePolicy.Minimum,QtGuiWidgets.QSizePolicy.Minimum) #self.setSizePolicy(qt.QSizePolicy.Minimum,qt.QSizePolicy.Minimum)
self.updateGeometry() self.updateGeometry()
def show_bottom(self): def show_bottom(self):
@ -201,22 +201,20 @@ class MainFrameRes(QtGuiWidgets.QWidget):
self.mytable.setHorizontalHeaderLabels(list_head) self.mytable.setHorizontalHeaderLabels(list_head)
for line in range(len(table.body[0])): for line in range(len(table.body[0])):
for i in range(len(table.body[0][line][0])): for i in range(len(table.body[0][line][0])):
tablewidgetitem = QtGuiWidgets.QTableWidgetItem( tablewidgetitem = qt.QTableWidgetItem(
table.body[0][line][0][i]) table.body[0][line][0][i])
#tablewidgetitem.setTextAlignment(
# QtCore.Qt.Align | QtCore.Qt.AlignLeft)
self.mytable.setItem(line, i, tablewidgetitem) self.mytable.setItem(line, i, tablewidgetitem)
# set writeonly # set writeonly
self.mytable.setEditTriggers(QtGuiWidgets.QAbstractItemView.NoEditTriggers) self.mytable.setEditTriggers(qt.QAbstractItemView.NoEditTriggers)
if table.onClick: if table.onClick:
self.mytable.itemClicked.connect(self.row_activate(table)) self.mytable.itemClicked.connect(self.row_activate(table))
self.mytable.setColor() self.mytable.setColor()
minimum = QtGuiWidgets.QSizePolicy.Minimum minimum = qt.QSizePolicy.Minimum
self.mytable.setSizePolicy(minimum, minimum) self.mytable.setSizePolicy(minimum, minimum)
self.mytable.horizontalHeader().resizeSections( self.mytable.horizontalHeader().resizeSections(
QtGuiWidgets.QHeaderView.ResizeMode.ResizeToContents) qt.QHeaderView.ResizeToContents)
self.work_layout._addWidget(self.mytable) self.work_layout._addWidget(self.mytable)
self.ClientObj.app.processEvents() self.ClientObj.app.processEvents()
self.mytable.resizeRowsToContents() self.mytable.resizeRowsToContents()
@ -278,9 +276,9 @@ class MainFrameRes(QtGuiWidgets.QWidget):
self.timer.stop() self.timer.stop()
def add_offset_buttons(self, len_body, addAction, records): def add_offset_buttons(self, len_body, addAction, records):
offset_buttons = QtGuiWidgets.QWidget() offset_buttons = qt.QWidget()
layout = QtGuiWidgets.QHBoxLayout(offset_buttons) layout = qt.QHBoxLayout(offset_buttons)
layout.setAlignment(QtCore.Qt.AlignLeft) layout.setAlignment(qt.Qt.AlignLeft)
offset = self.ClientObj.param_objects[self.method_name]['offset'] offset = self.ClientObj.param_objects[self.method_name]['offset']
count_records = int(self.ClientObj.count_row_res_table) count_records = int(self.ClientObj.count_row_res_table)
@ -298,8 +296,8 @@ class MainFrameRes(QtGuiWidgets.QWidget):
last = False last = False
begin_offset = QtGuiWidgets.QPushButton(offset_buttons) begin_offset = qt.QPushButton(offset_buttons)
begin_offset.setIcon(QtGuiWidgets.QIcon.fromTheme('go-first')) begin_offset.setIcon(qt.QIcon.fromTheme('go-first'))
begin_offset.setToolTip('First page') begin_offset.setToolTip('First page')
begin_offset.clicked.connect(self.disable_buttons) begin_offset.clicked.connect(self.disable_buttons)
begin_offset.clicked.connect(self.call_method_with_offset(0, True)) begin_offset.clicked.connect(self.call_method_with_offset(0, True))
@ -308,8 +306,8 @@ class MainFrameRes(QtGuiWidgets.QWidget):
layout.addWidget(begin_offset) layout.addWidget(begin_offset)
minus_offset = QtGuiWidgets.QPushButton(offset_buttons) minus_offset = qt.QPushButton(offset_buttons)
minus_offset.setIcon(QtGuiWidgets.QIcon.fromTheme('go-previous')) minus_offset.setIcon(qt.QIcon.fromTheme('go-previous'))
minus_offset.setToolTip('Previous page') minus_offset.setToolTip('Previous page')
minus_offset.clicked.connect(self.disable_buttons) minus_offset.clicked.connect(self.disable_buttons)
minus_offset.clicked.connect(self.call_method_with_offset( minus_offset.clicked.connect(self.call_method_with_offset(
@ -323,8 +321,8 @@ class MainFrameRes(QtGuiWidgets.QWidget):
begin_offset.setDisabled(True) begin_offset.setDisabled(True)
plus_offset = QtGuiWidgets.QPushButton(offset_buttons) plus_offset = qt.QPushButton(offset_buttons)
plus_offset.setIcon(QtGuiWidgets.QIcon.fromTheme('go-next')) plus_offset.setIcon(qt.QIcon.fromTheme('go-next'))
plus_offset.setToolTip('Next page') plus_offset.setToolTip('Next page')
plus_offset.clicked.connect(self.disable_buttons) plus_offset.clicked.connect(self.disable_buttons)
plus_offset.clicked.connect(self.call_method_with_offset( plus_offset.clicked.connect(self.call_method_with_offset(
@ -333,8 +331,8 @@ class MainFrameRes(QtGuiWidgets.QWidget):
layout.addWidget(plus_offset) layout.addWidget(plus_offset)
self.buttons.append(plus_offset) self.buttons.append(plus_offset)
last_offset = QtGuiWidgets.QPushButton(offset_buttons) last_offset = qt.QPushButton(offset_buttons)
last_offset.setIcon(QtGuiWidgets.QIcon.fromTheme('go-last')) last_offset.setIcon(qt.QIcon.fromTheme('go-last'))
last_offset.setToolTip('Last page') last_offset.setToolTip('Last page')
last_offset.clicked.connect(self.disable_buttons) last_offset.clicked.connect(self.disable_buttons)
last_offset.clicked.connect(self.call_method_with_offset( last_offset.clicked.connect(self.call_method_with_offset(
@ -837,7 +835,7 @@ class MainFrameRes(QtGuiWidgets.QWidget):
self.get_Frame(sid, pid, def_end_frame = end_frame) self.get_Frame(sid, pid, def_end_frame = end_frame)
def add_Progress(self): def add_Progress(self):
progressBar = QtGuiWidgets.QProgressBar() progressBar = qt.QProgressBar()
progressBar.setMinimumHeight(progressBar.sizeHint().height()) progressBar.setMinimumHeight(progressBar.sizeHint().height())
progressBar.setTextVisible(True) progressBar.setTextVisible(True)
self.progress_list.append(progressBar) self.progress_list.append(progressBar)
@ -1027,7 +1025,7 @@ class MainFrameRes(QtGuiWidgets.QWidget):
event.accept() event.accept()
class MessageDialog(QtGuiWidgets.QWidget): class MessageDialog(qt.QWidget):
# answer to the server question # answer to the server question
def __init__(self, parent, item, sid, pid, isPassword = False): def __init__(self, parent, item, sid, pid, isPassword = False):
super(MessageDialog, self).__init__() super(MessageDialog, self).__init__()
@ -1036,11 +1034,11 @@ class MessageDialog(QtGuiWidgets.QWidget):
self.sid = sid self.sid = sid
self.pid = pid self.pid = pid
self.setWindowTitle(self._parent.ClientObj._parent.windowTitle()) self.setWindowTitle(self._parent.ClientObj._parent.windowTitle())
self.layout = QtGuiWidgets.QGridLayout(self) self.layout = qt.QGridLayout(self)
self.label = LabelWordWrap(item.message, self) self.label = LabelWordWrap(item.message, self)
self.pass_edit = QtGuiWidgets.QLineEdit(self) self.pass_edit = qt.QLineEdit(self)
self.layout.addWidget(self.label,0,0) self.layout.addWidget(self.label,0,0)
self.layout.addWidget(self.pass_edit,0,1) self.layout.addWidget(self.pass_edit,0,1)
@ -1049,7 +1047,7 @@ class MessageDialog(QtGuiWidgets.QWidget):
self.pass_edit.setEchoMode(self.pass_edit.Password) self.pass_edit.setEchoMode(self.pass_edit.Password)
if item.id == 2: if item.id == 2:
if hasattr(self,'pass_edit2'): if hasattr(self,'pass_edit2'):
self.pass_edit2 = QtGuiWidgets.QLineEdit(self) self.pass_edit2 = qt.QLineEdit(self)
self.pass_edit2.setEchoMode(self.pass_edit2.Password) self.pass_edit2.setEchoMode(self.pass_edit2.Password)
self.layout.addWidget(LabelWordWrap(_('Repeat'), self), x, 0) self.layout.addWidget(LabelWordWrap(_('Repeat'), self), x, 0)
@ -1059,8 +1057,8 @@ class MessageDialog(QtGuiWidgets.QWidget):
if hasattr(self,'pass_edit2'): if hasattr(self,'pass_edit2'):
self.pass_edit2.textChanged.connect(self.check_passwd) self.pass_edit2.textChanged.connect(self.check_passwd)
self.send_button = QtGuiWidgets.QPushButton(_('Send'), self) self.send_button = qt.QPushButton(_('Send'), self)
self.send_button.setShortcut(QtGuiWidgets.QKeySequence(QtCore.Qt.Key_Return)) self.send_button.setShortcut(qt.QKeySequence(qt.Qt.Key_Return))
self.send_button.clicked.connect(self.send_password) self.send_button.clicked.connect(self.send_password)
self.layout.addWidget(self.send_button,x,1) self.layout.addWidget(self.send_button,x,1)
@ -1071,8 +1069,7 @@ class MessageDialog(QtGuiWidgets.QWidget):
parent.ClientObj._parent.geometry().y() + \ parent.ClientObj._parent.geometry().y() + \
parent.ClientObj._parent.geometry().height() / 2 \ parent.ClientObj._parent.geometry().height() / 2 \
- self.sizeHint().height() / 2) - self.sizeHint().height() / 2)
self.setWindowFlags (QtCore.Qt.WindowMinimizeButtonHint) self.setWindowFlags (qt.Qt.WindowMinimizeButtonHint)
# self.setAttribute(QtCore.Qt.WA_ShowModal)
def send_password(self): def send_password(self):
answer = self.pass_edit.text() answer = self.pass_edit.text()
@ -1106,7 +1103,7 @@ class MessageDialog(QtGuiWidgets.QWidget):
self.send_button.setEnabled(True) self.send_button.setEnabled(True)
class ButtonDialog(QtGuiWidgets.QWidget): class ButtonDialog(qt.QWidget):
button_size = 144 button_size = 144
def __init__(self, parent, item, sid, pid): def __init__(self, parent, item, sid, pid):
@ -1114,12 +1111,13 @@ class ButtonDialog(QtGuiWidgets.QWidget):
self._parent = parent self._parent = parent
self.sid = sid self.sid = sid
self.pid = pid self.pid = pid
self.layout = QtGuiWidgets.QHBoxLayout(self) self.layout = qt.QHBoxLayout(self)
self.layout.setContentsMargins(0, 0, 4, 0) self.layout.setContentsMargins(0, 0, 4, 0)
self.header_label = None self.header_label = None
minimum = QtGuiWidgets.QSizePolicy.Fixed minimum = qt.QSizePolicy.Fixed
self.setSizePolicy(minimum, minimum) self.setSizePolicy(minimum, minimum)
self.setFixedHeight(32)
self.init(item) self.init(item)
def init(self, item): def init(self, item):
@ -1129,15 +1127,15 @@ class ButtonDialog(QtGuiWidgets.QWidget):
""" """
Создать кнопку в диалоге Создать кнопку в диалоге
""" """
button = QtGuiWidgets.QPushButton(label, self) button = qt.QPushButton(label, self)
if type(shortcut) in (list, tuple): if type(shortcut) in (list, tuple):
action = QtGuiWidgets.QAction(self) action = qt.QAction(self)
action.setShortcuts(map(QtGuiWidgets.QKeySequence, action.setShortcuts(map(qt.QKeySequence,
shortcut)) shortcut))
action.triggered.connect(button.animateClick) action.triggered.connect(button.animateClick)
button.addAction(action) button.addAction(action)
elif shortcut: elif shortcut:
button.setShortcut(QtGuiWidgets.QKeySequence(shortcut)) button.setShortcut(qt.QKeySequence(shortcut))
button.clicked.connect(self.send(answer, label)) button.clicked.connect(self.send(answer, label))
button.setFixedWidth(self.button_size) button.setFixedWidth(self.button_size)
button.setFixedHeight(32) button.setFixedHeight(32)
@ -1178,9 +1176,9 @@ class ConfirmDialog(ButtonDialog):
def init(self, item): def init(self, item):
self._parent._parent.control_button.set_confirm_question( self._parent._parent.control_button.set_confirm_question(
"<b>%s</b>" % item.message) "<b>%s</b>" % item.message)
self.createButton(_("Yes"), "yes", [QtCore.Qt.Key_Enter, self.createButton(_("Yes"), "yes", [qt.Qt.Key_Enter,
QtCore.Qt.Key_Return]) qt.Qt.Key_Return])
self.createButton(_("No"), "no", QtCore.Qt.Key_Escape) self.createButton(_("No"), "no", qt.Qt.Key_Escape)
class ChoiceDialog(ButtonDialog): class ChoiceDialog(ButtonDialog):

@ -14,29 +14,29 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from calculate.consolegui.qtwrapper import QtGuiWidgets, QtCore from calculate.consolegui import qt
from more import get_system_rgb, ParameterWindow from more import get_system_rgb, ParameterWindow
class Delegate(QtGuiWidgets.QStyledItemDelegate): class Delegate(qt.QStyledItemDelegate):
def __init__(self, parent = None): def __init__(self, parent = None):
QtGuiWidgets.QStyledItemDelegate.__init__(self, parent) qt.QStyledItemDelegate.__init__(self, parent)
def setView(self, view): def setView(self, view):
self.view = view self.view = view
def paint(self, painter, option, index): def paint(self, painter, option, index):
o = QtGuiWidgets.QStyleOptionViewItemV4(option) o = qt.QStyleOptionViewItemV4(option)
self.initStyleOption(o, index) self.initStyleOption(o, index)
if o.state & QtGuiWidgets.QStyle.State_MouseOver: if o.state & qt.QStyle.State_MouseOver:
self.view.setMouseOver(index.row()) self.view.setMouseOver(index.row())
o.state &= ~QtGuiWidgets.QStyle.State_MouseOver o.state &= ~qt.QStyle.State_MouseOver
QtGuiWidgets.QStyledItemDelegate.paint(self, painter, o, index) qt.QStyledItemDelegate.paint(self, painter, o, index)
class SelectedTableWidget(QtGuiWidgets.QTableWidget): class SelectedTableWidget(qt.QTableWidget):
def __init__(self, rows, columns, parent, readonly = False, brief = False): def __init__(self, rows, columns, parent, readonly = False, brief = False):
QtGuiWidgets.QTableWidget.__init__(self, rows, columns, parent) qt.QTableWidget.__init__(self, rows, columns, parent)
self.currHovered = -1 self.currHovered = -1
self.brief = brief self.brief = brief
self.bFixedHeight = True self.bFixedHeight = True
@ -47,11 +47,11 @@ class SelectedTableWidget(QtGuiWidgets.QTableWidget):
self.setMouseTracking(True) self.setMouseTracking(True)
self.readonly = readonly self.readonly = readonly
self.setSelectionMode(QtGuiWidgets.QAbstractItemView.SelectionMode.NoSelection) self.setSelectionMode(qt.QAbstractItemView.NoSelection)
self.horizontalHeader().moveSection(-1,0) self.horizontalHeader().moveSection(-1,0)
self.horizontalHeader().setFixedHeight(24) self.horizontalHeader().setFixedHeight(24)
self.horizontalHeader().setMinimumSectionSize(48) self.horizontalHeader().setMinimumSectionSize(48)
self.setFrameStyle(QtGuiWidgets.QFrame.NoFrame) self.setFrameStyle(qt.QFrame.NoFrame)
self.verticalHeader().hide() self.verticalHeader().hide()
item_background = 'transparent' if brief else get_system_rgb( item_background = 'transparent' if brief else get_system_rgb(
@ -78,7 +78,7 @@ class SelectedTableWidget(QtGuiWidgets.QTableWidget):
item = self.item(row, col) item = self.item(row, col)
if not item: if not item:
continue continue
brush = QtGuiWidgets.QBrush( brush = qt.QBrush(
self.palette().color(ParameterWindow)) self.palette().color(ParameterWindow))
item.setBackground(brush) item.setBackground(brush)
@ -86,10 +86,10 @@ class SelectedTableWidget(QtGuiWidgets.QTableWidget):
if self.readonly: if self.readonly:
event.ignore() event.ignore()
return return
if event.button() != QtCore.Qt.MouseButton.LeftButton: if event.button() != qt.Qt.LeftButton:
event.ignore() event.ignore()
else: else:
QtGuiWidgets.QTableWidget.mousePressEvent(self, event) qt.QTableWidget.mousePressEvent(self, event)
event.accept() event.accept()
def setMouseOver(self, row): def setMouseOver(self, row):
@ -99,29 +99,29 @@ class SelectedTableWidget(QtGuiWidgets.QTableWidget):
item = self.item(row, col) item = self.item(row, col)
if not item: if not item:
continue continue
bg = self.palette().color(QtGuiWidgets.QPalette.Highlight) bg = self.palette().color(qt.QPalette.Highlight)
item.setBackground(QtGuiWidgets.QBrush(bg)) item.setBackground(qt.QBrush(bg))
#QtGuiWidgets.QColor(220,220,220,255))) #qt.QColor(220,220,220,255)))
if self.currHovered != -1: if self.currHovered != -1:
self.disableMouseOver() self.disableMouseOver()
self.currHovered = row self.currHovered = row
# self.setCursor(QtCore.Qt.CursorShape.PointingHandCursor) # self.setCursor(qt.Qt.PointingHandCursor)
def disableMouseOver(self): def disableMouseOver(self):
if self.readonly: if self.readonly:
return return
# self.setCursor(QtCore.Qt.CursorShape.ArrowCursor) # self.setCursor(qt.Qt.ArrowCursor)
for col in range (0, self.columnCount()): for col in range (0, self.columnCount()):
item = self.item(self.currHovered, col) item = self.item(self.currHovered, col)
if not item: if not item:
continue continue
bg = self.palette().color(ParameterWindow) bg = self.palette().color(ParameterWindow)
item.setBackground(QtGuiWidgets.QBrush(bg)) item.setBackground(qt.QBrush(bg))
#item.setBackground(QtGuiWidgets.QBrush(QtGuiWidgets.QColor("white"))) #item.setBackground(qt.QBrush(qt.QColor("white")))
def mouseMoveEvent(self, event): def mouseMoveEvent(self, event):
QtGuiWidgets.QTableView.mouseMoveEvent(self, event) qt.QTableView.mouseMoveEvent(self, event)
def leaveEvent(self, event): def leaveEvent(self, event):
if self.readonly: if self.readonly:

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from calculate.consolegui.qtwrapper import QtGuiWidgets, QtCore from calculate.consolegui import qt
import time, urllib2 import time, urllib2
from calculate.core.client.function import create_obj from calculate.core.client.function import create_obj
@ -29,15 +29,15 @@ from calculate.consolegui.application.pid_information import client_pid_info, \
client_list_pid client_list_pid
from more import show_msg, get_sid, _print from more import show_msg, get_sid, _print
# class MySignal(QtCore.QObject): # class MySignal(qt.QObject):
# sig = QtCore.Signal(str, str) # sig = qt.Signal(str, str)
class TrayUpdateSystem(QtCore.QThread): class TrayUpdateSystem(qt.QThread):
mes_sig = QtCore.Signal(str, str) mes_sig = qt.Signal(str, str)
started_sig = QtCore.Signal(str) started_sig = qt.Signal(str)
def __init__(self, target, parent=None): def __init__(self, target, parent=None):
QtCore.QThread.__init__(self, parent) qt.QThread.__init__(self, parent)
self._parent = target self._parent = target
def run(self): def run(self):
@ -88,10 +88,10 @@ class TrayUpdateSystem(QtCore.QThread):
self._parent.localhost_ClientObj.process_dict \ self._parent.localhost_ClientObj.process_dict \
[meth_result[0].message]['name'] = method_name [meth_result[0].message]['name'] = method_name
self._parent.localhost_ClientObj.process_dict \ self._parent.localhost_ClientObj.process_dict \
[meth_result[0].message]['layout'] = QtGuiWidgets.QVBoxLayout() [meth_result[0].message]['layout'] = qt.QVBoxLayout()
self._parent.localhost_ClientObj.process_dict \ self._parent.localhost_ClientObj.process_dict \
[meth_result[0].message]['layout'].setAlignment \ [meth_result[0].message]['layout'].setAlignment \
(QtCore.Qt.AlignTop) (qt.Qt.AlignTop)
else: else:
return 1 return 1
@ -147,7 +147,7 @@ class TrayUpdateSystem(QtCore.QThread):
self.close_flag = True self.close_flag = True
class TrayIcon(QtGuiWidgets.QSystemTrayIcon): class TrayIcon(qt.QSystemTrayIcon):
default_theme_name = 'Tango' default_theme_name = 'Tango'
def __init__(self, parent): def __init__(self, parent):
@ -155,7 +155,7 @@ class TrayIcon(QtGuiWidgets.QSystemTrayIcon):
self._parent = parent self._parent = parent
self.actions = [] self.actions = []
self.setIcon(QtGuiWidgets.QIcon( self.setIcon(qt.QIcon(
'/usr/share/pixmaps/calculate-console-offline.svg')) '/usr/share/pixmaps/calculate-console-offline.svg'))
self.is_online_icon = False self.is_online_icon = False
@ -176,16 +176,16 @@ class TrayIcon(QtGuiWidgets.QSystemTrayIcon):
self.update_thread.started_sig.connect(self.showUpdate) self.update_thread.started_sig.connect(self.showUpdate)
def select_icon(self, icons): def select_icon(self, icons):
old_theme_name = QtGuiWidgets.QIcon.themeName() old_theme_name = qt.QIcon.themeName()
try: try:
for theme_name in (old_theme_name, self.default_theme_name): for theme_name in (old_theme_name, self.default_theme_name):
QtGuiWidgets.QIcon.setThemeName(theme_name) qt.QIcon.setThemeName(theme_name)
for image in icons: for image in icons:
if QtGuiWidgets.QIcon.hasThemeIcon(image): if qt.QIcon.hasThemeIcon(image):
return QtGuiWidgets.QIcon.fromTheme(image) return qt.QIcon.fromTheme(image)
return QtGuiWidgets.QIcon() return qt.QIcon()
finally: finally:
QtGuiWidgets.QIcon.setThemeName(old_theme_name) qt.QIcon.setThemeName(old_theme_name)
def generation_actions(self): def generation_actions(self):
_("About") _("About")
@ -222,12 +222,12 @@ class TrayIcon(QtGuiWidgets.QSystemTrayIcon):
} }
for action_name, action_data in self.actions.items(): for action_name, action_data in self.actions.items():
setattr(self, '%s_action' % action_name, setattr(self, '%s_action' % action_name,
QtGuiWidgets.QAction(self.select_icon(action_data['icons']), qt.QAction(self.select_icon(action_data['icons']),
_(action_data['label']), self, _(action_data['label']), self,
triggered=action_data['trigger'])) triggered=action_data['trigger']))
def create_menu(self, *actions): def create_menu(self, *actions):
menu = QtGuiWidgets.QMenu() menu = qt.QMenu()
for action in actions: for action in actions:
if action: if action:
menu.addAction(getattr(self, "%s_action" % action)) menu.addAction(getattr(self, "%s_action" % action))
@ -247,15 +247,9 @@ class TrayIcon(QtGuiWidgets.QSystemTrayIcon):
return False return False
def set_icon(self, online, has_update=None): def set_icon(self, online, has_update=None):
if has_update is None:
if self.check_for_update():
has_update = True
else:
has_update = False
if online: if online:
if not self.is_online_icon: if not self.is_online_icon:
self.setIcon(QtGuiWidgets.QIcon( self.setIcon(qt.QIcon(
'/usr/share/pixmaps/calculate-console-online.svg')) '/usr/share/pixmaps/calculate-console-online.svg'))
# для решения странного размера иконки в mate # для решения странного размера иконки в mate
self.hide() self.hide()
@ -263,7 +257,7 @@ class TrayIcon(QtGuiWidgets.QSystemTrayIcon):
self.is_online_icon = True self.is_online_icon = True
else: else:
if self.is_online_icon: if self.is_online_icon:
self.setIcon(QtGuiWidgets.QIcon( self.setIcon(qt.QIcon(
'/usr/share/pixmaps/calculate-console-offline.svg')) '/usr/share/pixmaps/calculate-console-offline.svg'))
# для решения странного размера иконки в mate # для решения странного размера иконки в mate
self.hide() self.hide()
@ -330,18 +324,18 @@ class TrayIcon(QtGuiWidgets.QSystemTrayIcon):
# informative_text = _('Stop updating and exit?') # informative_text = _('Stop updating and exit?')
# reply = show_question(self._parent, text, informative_text) # reply = show_question(self._parent, text, informative_text)
# if reply == QtGuiWidgets.QMessageBox.No: # if reply == qt.QMessageBox.No:
# return 0 # return 0
# elif reply == QtGuiWidgets.QMessageBox.Yes: # elif reply == qt.QMessageBox.Yes:
# self.update_thread.close() # self.update_thread.close()
# self.update_thread.wait() # self.update_thread.wait()
self._parent._closeEvent() self._parent._closeEvent()
def activ(self, reason): def activ(self, reason):
if reason == QtGuiWidgets.QSystemTrayIcon.Trigger: if reason == qt.QSystemTrayIcon.Trigger:
self.windowVisible() self.windowVisible()
if reason == QtGuiWidgets.QSystemTrayIcon.DoubleClick: if reason == qt.QSystemTrayIcon.DoubleClick:
self.windowVisible() self.windowVisible()
def showMessage(self, title, message, icon='dialog-warning'): def showMessage(self, title, message, icon='dialog-warning'):

@ -14,16 +14,16 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from calculate.consolegui.qtwrapper import QtGuiWidgets, QtCore from calculate.consolegui import qt
from pid_information import client_list_pid, client_pid_info from pid_information import client_list_pid, client_pid_info
from more import LabelWordWrap, show_msg, get_sid, ClientServiceThread from more import LabelWordWrap, show_msg, get_sid, ClientServiceThread
class ViewProc(QtGuiWidgets.QWidget): class ViewProc(qt.QWidget):
def __init__(self, parent, ClientObj): def __init__(self, parent, ClientObj):
# super(ViewProc, self).__init__(parent) # super(ViewProc, self).__init__(parent)
QtGuiWidgets.QWidget.__init__(self, parent) qt.QWidget.__init__(self, parent)
# self._parent = parent # self._parent = parent
self.ClientObj = ClientObj self.ClientObj = ClientObj
self.client = ClientObj.client self.client = ClientObj.client
@ -38,7 +38,7 @@ class ViewProc(QtGuiWidgets.QWidget):
self.lable_list = [] self.lable_list = []
self.button_list = [] self.button_list = []
self.status_list = [] self.status_list = []
self.grid_layout = QtGuiWidgets.QGridLayout() self.grid_layout = qt.QGridLayout()
self.helpLabel = LabelWordWrap \ self.helpLabel = LabelWordWrap \
(_('View information about the running processes'), self) (_('View information about the running processes'), self)
self.grid_layout.addWidget(self.helpLabel, 0, 0, 1, 0) self.grid_layout.addWidget(self.helpLabel, 0, 0, 1, 0)
@ -84,7 +84,7 @@ class ViewProc(QtGuiWidgets.QWidget):
# add status button # add status button
if self.ClientObj.process_dict[str(list_pid[num])]['status'] == '1': if self.ClientObj.process_dict[str(list_pid[num])]['status'] == '1':
kill_but_text = _('Kill the process? (It\'s active)') kill_but_text = _('Kill the process? (It\'s active)')
kill_button = QtGuiWidgets.QPushButton(kill_but_text, self) kill_button = qt.QPushButton(kill_but_text, self)
kill_button.clicked.connect(self.kill_process \ kill_button.clicked.connect(self.kill_process \
(int(list_pid[num]), num+2, 2)) (int(list_pid[num]), num+2, 2))
self.status_list.append(kill_button) self.status_list.append(kill_button)
@ -101,7 +101,7 @@ class ViewProc(QtGuiWidgets.QWidget):
# add 'View result' button # add 'View result' button
button_text = _('View the result, PID %s') %str(list_pid[num]) button_text = _('View the result, PID %s') %str(list_pid[num])
Button = QtGuiWidgets.QPushButton(button_text, self) Button = qt.QPushButton(button_text, self)
Button.clicked.connect(self.onActivated(str(list_pid[num]), \ Button.clicked.connect(self.onActivated(str(list_pid[num]), \
str(view_method_name))) str(view_method_name)))
@ -122,9 +122,9 @@ class ViewProc(QtGuiWidgets.QWidget):
self.grid_layout.addWidget(lbl, 1,3) self.grid_layout.addWidget(lbl, 1,3)
# for clear memory after closed this window # for clear memory after closed this window
self.setAttribute(QtCore.Qt.WA_DeleteOnClose) self.setAttribute(qt.Qt.WA_DeleteOnClose)
self.grid_layout.setAlignment(QtCore.Qt.AlignTop) self.grid_layout.setAlignment(qt.Qt.AlignTop)
self.setLayout(self.grid_layout) self.setLayout(self.grid_layout)
self.show() self.show()

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from calculate.consolegui.qtwrapper import QtGuiWidgets, QtCore from calculate.consolegui import qt
import urllib2 as u2 import urllib2 as u2
if hasattr(u2,"ssl"): if hasattr(u2,"ssl"):
u2.ssl._create_default_https_context = u2.ssl._create_unverified_context u2.ssl._create_default_https_context = u2.ssl._create_unverified_context
@ -39,14 +39,14 @@ from more import show_msg, show_question, LabelWordWrap
flag = 0 flag = 0
log = getLogger(__name__) log = getLogger(__name__)
class AddServerCert (QtGuiWidgets.QDialog): class AddServerCert (qt.QDialog):
def __init__(self, parent, ClientObj, cert): def __init__(self, parent, ClientObj, cert):
super(AddServerCert, self).__init__() super(AddServerCert, self).__init__()
self.ClientObj = ClientObj self.ClientObj = ClientObj
self.parent = parent self.parent = parent
self.cert = cert self.cert = cert
self.grid = QtGuiWidgets.QGridLayout(self) self.grid = qt.QGridLayout(self)
self.lbl_list = [] self.lbl_list = []
self.grid.addWidget(LabelWordWrap(_('Untrusted Server Certificate!'), \ self.grid.addWidget(LabelWordWrap(_('Untrusted Server Certificate!'), \
@ -59,10 +59,10 @@ class AddServerCert (QtGuiWidgets.QDialog):
self.grid.addWidget(LabelWordWrap (_('Serial Number = %s') \ self.grid.addWidget(LabelWordWrap (_('Serial Number = %s') \
% certobj.get_serial_number(), self), 2, 0, 1, 3) % certobj.get_serial_number(), self), 2, 0, 1, 3)
self.tab = QtGuiWidgets.QTabWidget(self) self.tab = qt.QTabWidget(self)
# add Issuer tab # add Issuer tab
self.issuer_wgt = QtGuiWidgets.QWidget(self) self.issuer_wgt = qt.QWidget(self)
self.issuer_layout = QtGuiWidgets.QVBoxLayout() self.issuer_layout = qt.QVBoxLayout()
Issuer = certobj.get_issuer().get_components() Issuer = certobj.get_issuer().get_components()
for i in Issuer: for i in Issuer:
@ -73,8 +73,8 @@ class AddServerCert (QtGuiWidgets.QDialog):
self.tab.addTab(self.issuer_wgt, _('Issuer')) self.tab.addTab(self.issuer_wgt, _('Issuer'))
# add Subject tab # add Subject tab
self.subject_wgt = QtGuiWidgets.QWidget(self) self.subject_wgt = qt.QWidget(self)
self.subject_layout = QtGuiWidgets.QVBoxLayout() self.subject_layout = qt.QVBoxLayout()
Subject = certobj.get_subject().get_components() Subject = certobj.get_subject().get_components()
for item in Subject: for item in Subject:
@ -94,8 +94,8 @@ class AddServerCert (QtGuiWidgets.QDialog):
(_("Add this server certificate to trusted or ") +\ (_("Add this server certificate to trusted or ") +\
_('try adding the CA and root certificates to trusted?'),self)) _('try adding the CA and root certificates to trusted?'),self))
self.pix_lbl = QtGuiWidgets.QLabel(self) self.pix_lbl = qt.QLabel(self)
pi = QtGuiWidgets.QPixmap() pi = qt.QPixmap()
pi.load('/usr/share/icons/oxygen/48x48/status/security-medium.png') pi.load('/usr/share/icons/oxygen/48x48/status/security-medium.png')
self.pix_lbl.setPixmap(pi) self.pix_lbl.setPixmap(pi)
self.grid.addWidget(self.pix_lbl, 0,0) self.grid.addWidget(self.pix_lbl, 0,0)
@ -104,20 +104,20 @@ class AddServerCert (QtGuiWidgets.QDialog):
self.grid.addWidget(self.lbl_list[num_lbl], num_lbl + 8, 0, 1, 3) self.grid.addWidget(self.lbl_list[num_lbl], num_lbl + 8, 0, 1, 3)
x = len (self.lbl_list) + 8 x = len (self.lbl_list) + 8
self.server_but = QtGuiWidgets.QPushButton(_('Add the server certificate'), self.server_but = qt.QPushButton(_('Add the server certificate'),
self) self)
self.server_but.clicked.connect(self.add_server) self.server_but.clicked.connect(self.add_server)
self.server_but.clicked.connect(self.close) self.server_but.clicked.connect(self.close)
self.grid.addWidget(self.server_but, x, 0) self.grid.addWidget(self.server_but, x, 0)
self.ca_but = QtGuiWidgets.QPushButton(_("Add the CA and root certificates"), self.ca_but = qt.QPushButton(_("Add the CA and root certificates"),
self) self)
self.ca_but.clicked.connect(self.add_ca) self.ca_but.clicked.connect(self.add_ca)
self.ca_but.clicked.connect(self.add_server) self.ca_but.clicked.connect(self.add_server)
self.ca_but.clicked.connect(self.close) self.ca_but.clicked.connect(self.close)
self.grid.addWidget(self.ca_but, x, 1) self.grid.addWidget(self.ca_but, x, 1)
self.cancel_but = QtGuiWidgets.QPushButton(_('Cancel'), self) self.cancel_but = qt.QPushButton(_('Cancel'), self)
self.cancel_but.clicked.connect(self.close) self.cancel_but.clicked.connect(self.close)
self.grid.addWidget(self.cancel_but, x, 2) self.grid.addWidget(self.cancel_but, x, 2)
@ -134,7 +134,7 @@ class AddServerCert (QtGuiWidgets.QDialog):
self.move(x, y) self.move(x, y)
self.setFixedSize(self.sizeHint()) self.setFixedSize(self.sizeHint())
self.setAttribute(QtCore.Qt.WA_ShowModal) self.setWindowModality(qt.Qt.WindowModal)
self.flag = 4 self.flag = 4
def add_server(self): def add_server(self):
@ -436,10 +436,10 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection):
reply = show_question(self.ClientObj.MainWidget, text, inf_text, reply = show_question(self.ClientObj.MainWidget, text, inf_text,
title = _('Adding the certificate')) title = _('Adding the certificate'))
if reply == QtGuiWidgets.QMessageBox.No: if reply == qt.QMessageBox.No:
show_msg (_('Certificate not added to trusted')) show_msg (_('Certificate not added to trusted'))
elif reply == QtGuiWidgets.QMessageBox.Yes: elif reply == qt.QMessageBox.Yes:
list_ca_certs.append(cert) list_ca_certs.append(cert)
self.add_all_ca_cert(list_ca_certs) self.add_all_ca_cert(list_ca_certs)
return return

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from calculate.consolegui.qtwrapper import QtGuiWidgets, QtCore from calculate.consolegui import qt
from sudsds import WebFault from sudsds import WebFault
import logging, OpenSSL import logging, OpenSSL
import ConfigParser, os, urllib2 import ConfigParser, os, urllib2
@ -27,34 +27,34 @@ from calculate.core.client.cert_verify import VerifyError
from client_class import Client_suds, HTTPSClientCertTransport from client_class import Client_suds, HTTPSClientCertTransport
from more import post_connect_action, show_msg, uniq, LabelWordWrap from more import post_connect_action, show_msg, uniq, LabelWordWrap
class LocalhostPasswd(QtGuiWidgets.QDialog): class LocalhostPasswd(qt.QDialog):
def __init__(self, parent): def __init__(self, parent):
QtGuiWidgets.QDialog.__init__(self) qt.QDialog.__init__(self)
grid = QtGuiWidgets.QGridLayout(self) grid = qt.QGridLayout(self)
grid.setContentsMargins(10, 10, 10, 10) grid.setContentsMargins(10, 10, 10, 10)
grid.setSpacing(4) grid.setSpacing(4)
self.lbl_passwd = QtGuiWidgets.QLabel(_("Password"), self) self.lbl_passwd = qt.QLabel(_("Password"), self)
self.text_passwd = QtGuiWidgets.QLineEdit('', self) self.text_passwd = qt.QLineEdit('', self)
self.text_passwd.setEchoMode(self.text_passwd.Password) self.text_passwd.setEchoMode(self.text_passwd.Password)
grid.addWidget(self.lbl_passwd, 0, 0) grid.addWidget(self.lbl_passwd, 0, 0)
grid.addWidget(self.text_passwd, 0, 1) grid.addWidget(self.text_passwd, 0, 1)
layout_button = QtGuiWidgets.QHBoxLayout() layout_button = qt.QHBoxLayout()
self.cmd_ok = QtGuiWidgets.QPushButton(_('Ok'), self) self.cmd_ok = qt.QPushButton(_('Ok'), self)
self.cmd_ok.setDefault(True) self.cmd_ok.setDefault(True)
self.cmd_ok.setAutoDefault(True) self.cmd_ok.setAutoDefault(True)
self.cmd_ok.clicked.connect(self.set_disabled) self.cmd_ok.clicked.connect(self.set_disabled)
self.cmd_ok.clicked.connect(self.onClick) self.cmd_ok.clicked.connect(self.onClick)
self.cmd_ok.setFixedWidth(100) self.cmd_ok.setFixedWidth(100)
self.cmd_cancel = QtGuiWidgets.QPushButton(_('Cancel'), self) self.cmd_cancel = qt.QPushButton(_('Cancel'), self)
self.cmd_cancel.setShortcut(QtGuiWidgets.QKeySequence(QtCore.Qt.Key_Escape)) self.cmd_cancel.setShortcut(qt.QKeySequence(qt.Qt.Key_Escape))
self.cmd_cancel.clicked.connect(self.close) self.cmd_cancel.clicked.connect(self.close)
self.cmd_cancel.setFixedWidth(100) self.cmd_cancel.setFixedWidth(100)
layout_button.addWidget(self.cmd_ok) layout_button.addWidget(self.cmd_ok)
layout_button.addWidget(self.cmd_cancel) layout_button.addWidget(self.cmd_cancel)
grid.addLayout(layout_button, 1,0,1,2, QtCore.Qt.AlignRight) grid.addLayout(layout_button, 1,0,1,2, qt.Qt.AlignRight)
self.setLayout(grid) self.setLayout(grid)
self.setFixedSize(self.sizeHint()) self.setFixedSize(self.sizeHint())
self._text = None self._text = None
@ -70,22 +70,22 @@ class LocalhostPasswd(QtGuiWidgets.QDialog):
def text(self): def text(self):
return self._text return self._text
class FrameConnection(QtGuiWidgets.QWidget): class FrameConnection(qt.QWidget):
def __init__(self, parent, ClientObj): def __init__(self, parent, ClientObj):
QtGuiWidgets.QWidget.__init__(self) qt.QWidget.__init__(self)
self.ClientObj = ClientObj self.ClientObj = ClientObj
def initUI(self, parent, window): def initUI(self, parent, window):
grid = QtGuiWidgets.QGridLayout(self) grid = qt.QGridLayout(self)
grid.setContentsMargins(10, 10, 10, 10) grid.setContentsMargins(10, 10, 10, 10)
grid.setSpacing(4) grid.setSpacing(4)
self.lbl_host = LabelWordWrap(_("Host"), self) self.lbl_host = LabelWordWrap(_("Host"), self)
self.lbl_port = LabelWordWrap(_("Port"), self) self.lbl_port = LabelWordWrap(_("Port"), self)
self.lbl_passwd = LabelWordWrap(_("Password"), self) self.lbl_passwd = LabelWordWrap(_("Password"), self)
self.text_host = QtGuiWidgets.QLineEdit(self.ClientObj.default_host, self) self.text_host = qt.QLineEdit(self.ClientObj.default_host, self)
self.text_port = QtGuiWidgets.QLineEdit(self.ClientObj.default_port, self) self.text_port = qt.QLineEdit(self.ClientObj.default_port, self)
self.text_passwd = QtGuiWidgets.QLineEdit('', self) self.text_passwd = qt.QLineEdit('', self)
self.text_passwd.setEchoMode(self.text_passwd.Password) self.text_passwd.setEchoMode(self.text_passwd.Password)
###################### ######################
# add completer in 'host name' QLineEdit # add completer in 'host name' QLineEdit
@ -94,8 +94,8 @@ class FrameConnection(QtGuiWidgets.QWidget):
self.wordList.append (self.text_host.text()) self.wordList.append (self.text_host.text())
self.wordList = uniq(self.wordList) self.wordList = uniq(self.wordList)
del (self.completer) del (self.completer)
self.completer = QtGuiWidgets.QCompleter(self.wordList, self) self.completer = qt.QCompleter(self.wordList, self)
self.completer.setCaseSensitivity(QtCore.Qt.CaseInsensitive) self.completer.setCaseSensitivity(qt.Qt.CaseInsensitive)
self.completer.setMaxVisibleItems(7) self.completer.setMaxVisibleItems(7)
self.text_host.setCompleter(self.completer) self.text_host.setCompleter(self.completer)
return wrapper return wrapper
@ -109,8 +109,8 @@ class FrameConnection(QtGuiWidgets.QWidget):
except (ConfigParser.NoOptionError, ConfigParser.NoSectionError): except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
self.wordList = [] self.wordList = []
self.completer = QtGuiWidgets.QCompleter(self.wordList, self) self.completer = qt.QCompleter(self.wordList, self)
self.completer.setCaseSensitivity(QtCore.Qt.CaseInsensitive) self.completer.setCaseSensitivity(qt.Qt.CaseInsensitive)
self.completer.setMaxVisibleItems(7) self.completer.setMaxVisibleItems(7)
self.text_host.setCompleter(self.completer) self.text_host.setCompleter(self.completer)
self.text_host.editingFinished.connect(add_wordlist(self)) self.text_host.editingFinished.connect(add_wordlist(self))
@ -122,20 +122,20 @@ class FrameConnection(QtGuiWidgets.QWidget):
grid.addWidget(self.lbl_passwd, 2, 0) grid.addWidget(self.lbl_passwd, 2, 0)
grid.addWidget(self.text_passwd, 2, 1) grid.addWidget(self.text_passwd, 2, 1)
self.cmd_connect = QtGuiWidgets.QPushButton(_('Connect'), self) self.cmd_connect = qt.QPushButton(_('Connect'), self)
self.cmd_connect.setIcon(QtGuiWidgets.QIcon.fromTheme("network-connect")) self.cmd_connect.setIcon(qt.QIcon.fromTheme("network-connect"))
self.cmd_connect.setDefault(True) self.cmd_connect.setDefault(True)
self.cmd_connect.setAutoDefault(True) self.cmd_connect.setAutoDefault(True)
# self.cmd_connect.setMaximumWidth(120) # self.cmd_connect.setMaximumWidth(120)
self.cmd_connect.setShortcut(QtGuiWidgets.QKeySequence(QtCore.Qt.Key_Return)) self.cmd_connect.setShortcut(qt.QKeySequence(qt.Qt.Key_Return))
self.cmd_cancel = QtGuiWidgets.QPushButton(_('Cancel'), self) self.cmd_cancel = qt.QPushButton(_('Cancel'), self)
# self.cmd_cancel.setMaximumWidth(120) # self.cmd_cancel.setMaximumWidth(120)
self.cmd_cancel.setShortcut(QtGuiWidgets.QKeySequence(QtCore.Qt.Key_Escape)) self.cmd_cancel.setShortcut(qt.QKeySequence(qt.Qt.Key_Escape))
self.cmd_cancel.clicked.connect(self.close) self.cmd_cancel.clicked.connect(self.close)
layout_button = QtGuiWidgets.QHBoxLayout() layout_button = qt.QHBoxLayout()
layout_button.addWidget(self.cmd_connect) layout_button.addWidget(self.cmd_connect)
layout_button.addWidget(self.cmd_cancel) layout_button.addWidget(self.cmd_cancel)
grid.addLayout(layout_button, 3, 0, 1, 2) grid.addLayout(layout_button, 3, 0, 1, 2)
@ -147,7 +147,7 @@ class FrameConnection(QtGuiWidgets.QWidget):
self.cmd_connect.clicked.connect (self.onClick) self.cmd_connect.clicked.connect (self.onClick)
# for clear memory after closed this window # for clear memory after closed this window
self.setAttribute(QtCore.Qt.WA_DeleteOnClose) self.setAttribute(qt.Qt.WA_DeleteOnClose)
self.setLayout(grid) self.setLayout(grid)
@ -157,7 +157,7 @@ class FrameConnection(QtGuiWidgets.QWidget):
window.geometry().y() + window.geometry().height() / 2 \ window.geometry().y() + window.geometry().height() / 2 \
- self.sizeHint().height() / 2) - self.sizeHint().height() / 2)
self.setWindowTitle(_('Connection')) self.setWindowTitle(_('Connection'))
self.setWindowIcon(QtGuiWidgets.QIcon.fromTheme("network-connect")) self.setWindowIcon(qt.QIcon.fromTheme("network-connect"))
def set_disabled(self): def set_disabled(self):

@ -15,7 +15,7 @@
# limitations under the License. # limitations under the License.
import socket import socket
from calculate.consolegui.qtwrapper import QtGuiWidgets, QtCore from calculate.consolegui import qt
from more import LabelWordWrap, show_msg from more import LabelWordWrap, show_msg
@ -34,9 +34,9 @@ def makePKey(key):
pkey.assign_rsa(key) pkey.assign_rsa(key)
return pkey return pkey
class RequestCreate (QtGuiWidgets.QWidget): class RequestCreate (qt.QWidget):
def __init__(self, parent, ClientObj, key, cert_path, server_host_name): def __init__(self, parent, ClientObj, key, cert_path, server_host_name):
QtGuiWidgets.QWidget.__init__(self) qt.QWidget.__init__(self)
self.ClientObj = ClientObj self.ClientObj = ClientObj
self._parent = parent self._parent = parent
@ -44,7 +44,7 @@ class RequestCreate (QtGuiWidgets.QWidget):
self.cert_path = cert_path self.cert_path = cert_path
self.server_host_name = server_host_name self.server_host_name = server_host_name
self.mainlayout = QtGuiWidgets.QGridLayout() self.mainlayout = qt.QGridLayout()
self.mainlayout.setColumnStretch(0,0) self.mainlayout.setColumnStretch(0,0)
self.mainlayout.setColumnStretch(1,1) self.mainlayout.setColumnStretch(1,1)
# Add HostName field # Add HostName field
@ -53,8 +53,8 @@ class RequestCreate (QtGuiWidgets.QWidget):
result_host_name = list_host_name[0]+"@"+server_host_name result_host_name = list_host_name[0]+"@"+server_host_name
self.mainlayout.addWidget(LabelWordWrap(_('User@Server_HostName'), \ self.mainlayout.addWidget(LabelWordWrap(_('User@Server_HostName'), \
self),0,0, QtCore.Qt.AlignRight) self),0,0, qt.Qt.AlignRight)
self.host_name = QtGuiWidgets.QLineEdit(result_host_name, self) self.host_name = qt.QLineEdit(result_host_name, self)
self.mainlayout.addWidget(self.host_name, 0,1) self.mainlayout.addWidget(self.host_name, 0,1)
# Add UserName field # Add UserName field
@ -62,73 +62,73 @@ class RequestCreate (QtGuiWidgets.QWidget):
suffixPort = ":%s"%ClientObj.VarsApi.Get('core.cl_core_port') suffixPort = ":%s"%ClientObj.VarsApi.Get('core.cl_core_port')
username = username.decode('utf-8') username = username.decode('utf-8')
self.mainlayout.addWidget(LabelWordWrap(_('User Name'), self),1,0 \ self.mainlayout.addWidget(LabelWordWrap(_('User Name'), self),1,0,
,QtCore.Qt.AlignRight) qt.Qt.AlignRight)
self.user_name = QtGuiWidgets.QLineEdit(username, self) self.user_name = qt.QLineEdit(username, self)
self.mainlayout.addWidget(self.user_name, 1,1) self.mainlayout.addWidget(self.user_name, 1,1)
# Add Organization name field # Add Organization name field
self.mainlayout.addWidget(QtGuiWidgets.QLabel(_('Organization Name'), self),\ self.mainlayout.addWidget(qt.QLabel(_('Organization Name'), self),\
2, 0, QtCore.Qt.AlignRight) 2, 0, qt.Qt.AlignRight)
self.org_name = QtGuiWidgets.QLineEdit('Company', self) self.org_name = qt.QLineEdit('Company', self)
self.mainlayout.addWidget(self.org_name, 2,1) self.mainlayout.addWidget(self.org_name, 2,1)
# Add Network address field # Add Network address field
self.mainlayout.addWidget(LabelWordWrap(_('Network address'), self), \ self.mainlayout.addWidget(LabelWordWrap(_('Network address'), self), \
3,0,QtCore.Qt.AlignRight) 3,0,qt.Qt.AlignRight)
self.netw_adr = QtGuiWidgets.QLineEdit(host_name+suffixPort, self) self.netw_adr = qt.QLineEdit(host_name+suffixPort, self)
self.mainlayout.addWidget(self.netw_adr, 3,1) self.mainlayout.addWidget(self.netw_adr, 3,1)
# Add State name field # Add State name field
self.mainlayout.addWidget(LabelWordWrap(_("City"), self),4,0, \ self.mainlayout.addWidget(LabelWordWrap(_("City"), self),4,0, \
QtCore.Qt.AlignRight) qt.Qt.AlignRight)
self.state_name = QtGuiWidgets.QLineEdit('My_State', self) self.state_name = qt.QLineEdit('My_State', self)
self.mainlayout.addWidget(self.state_name, 4,1) self.mainlayout.addWidget(self.state_name, 4,1)
# Add Country field # Add Country field
self.mainlayout.addWidget(LabelWordWrap \ self.mainlayout.addWidget(LabelWordWrap \
(_('Country (a two-character tag)'), self), (_('Country (a two-character tag)'), self),
5,0,QtCore.Qt.AlignRight) 5,0,qt.Qt.AlignRight)
self.country = QtGuiWidgets.QLineEdit('Ru', self) self.country = qt.QLineEdit('Ru', self)
# only 2 words # only 2 words
rx = QtCore.QRegExp ("^[a-zA-Z]{0,2}$") rx = qt.QRegExp ("^[a-zA-Z]{0,2}$")
country_validator = QtGuiWidgets.QRegExpValidator(rx, self) country_validator = qt.QRegExpValidator(rx, self)
self.country.setValidator(country_validator) self.country.setValidator(country_validator)
self.mainlayout.addWidget(self.country, 5,1) self.mainlayout.addWidget(self.country, 5,1)
button_layout = QtGuiWidgets.QHBoxLayout() button_layout = qt.QHBoxLayout()
button_layout.setAlignment(QtCore.Qt.AlignRight) button_layout.setAlignment(qt.Qt.AlignRight)
# Add Password field # Add Password field
self.mainlayout.addWidget(LabelWordWrap(_('Password'),\ self.mainlayout.addWidget(LabelWordWrap(_('Password'),\
self), 6,0,QtCore.Qt.AlignRight) self), 6,0,qt.Qt.AlignRight)
self.passwd_lineedit = QtGuiWidgets.QLineEdit('', self) self.passwd_lineedit = qt.QLineEdit('', self)
self.passwd_lineedit.setEchoMode(self.passwd_lineedit.Password) self.passwd_lineedit.setEchoMode(self.passwd_lineedit.Password)
self.mainlayout.addWidget(self.passwd_lineedit, 6,1) self.mainlayout.addWidget(self.passwd_lineedit, 6,1)
# Add create button # Add create button
self.CreateButton = QtGuiWidgets.QPushButton(_('Create a signature request'), self.CreateButton = qt.QPushButton(_('Create a signature request'),
self) self)
self.CreateButton.setFixedWidth(self.CreateButton.sizeHint().width()) self.CreateButton.setFixedWidth(self.CreateButton.sizeHint().width())
self.CreateButton.clicked.connect(self.create_req) self.CreateButton.clicked.connect(self.create_req)
button_layout.addWidget(self.CreateButton) button_layout.addWidget(self.CreateButton)
# Add cancel button # Add cancel button
self.CancelButton = QtGuiWidgets.QPushButton(_('Cancel'), self) self.CancelButton = qt.QPushButton(_('Cancel'), self)
self.CancelButton.setFixedWidth(self.CancelButton.sizeHint().width()) self.CancelButton.setFixedWidth(self.CancelButton.sizeHint().width())
self.CancelButton.clicked.connect(self.close) self.CancelButton.clicked.connect(self.close)
button_layout.addWidget(self.CancelButton) button_layout.addWidget(self.CancelButton)
self.mainlayout.addLayout(button_layout,7,0,1,2,QtCore.Qt.AlignRight) self.mainlayout.addLayout(button_layout,7,0,1,2,qt.Qt.AlignRight)
self.setLayout(self.mainlayout) self.setLayout(self.mainlayout)
# for clear memory after closed this window # for clear memory after closed this window
self.setAttribute(QtCore.Qt.WA_DeleteOnClose) self.setAttribute(qt.Qt.WA_DeleteOnClose)
self.setWindowTitle (_('Create a signature request')) self.setWindowTitle (_('Create a signature request'))
self.setWindowIcon (QtGuiWidgets.QIcon.fromTheme("view-certificate")) self.setWindowIcon (qt.QIcon.fromTheme("view-certificate"))
self.setFocus() self.setFocus()
self.move(50+parent.frameGeometry().x(), \ self.move(50+parent.frameGeometry().x(), \

@ -14,15 +14,15 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from calculate.consolegui.qtwrapper import QtGuiWidgets, QtCore from calculate.consolegui import qt
from more import LabelWordWrap, show_msg from more import LabelWordWrap, show_msg
import datetime import datetime
from calculate.lib.datavars import DataVars from calculate.lib.datavars import DataVars
_('The user should not be root') _('The user should not be root')
class HelpWgt(QtGuiWidgets.QWidget): class HelpWgt(qt.QWidget):
def __init__(self, parent): def __init__(self, parent):
QtGuiWidgets.QWidget.__init__(self) qt.QWidget.__init__(self)
clVars = DataVars() clVars = DataVars()
clVars.flIniFile() clVars.flIniFile()
@ -54,36 +54,36 @@ class HelpWgt(QtGuiWidgets.QWidget):
linkLabel.setContentsMargins(10,5,10,5) linkLabel.setContentsMargins(10,5,10,5)
linkLabel.setOpenExternalLinks(True) linkLabel.setOpenExternalLinks(True)
helpQuit = QtGuiWidgets.QPushButton(_("Close"), self) helpQuit = qt.QPushButton(_("Close"), self)
helpQuit.setShortcut(QtGuiWidgets.QKeySequence(QtCore.Qt.Key_Escape)) helpQuit.setShortcut(qt.QKeySequence(qt.Qt.Key_Escape))
helpQuit.setFixedWidth(100) helpQuit.setFixedWidth(100)
self.image_lbl = QtGuiWidgets.QLabel(self) self.image_lbl = qt.QLabel(self)
filename = '/usr/share/icons/hicolor/scalable/apps/' \ filename = '/usr/share/icons/hicolor/scalable/apps/' \
'calculate-console.svg' 'calculate-console.svg'
ir = QtGuiWidgets.QImageReader(filename) ir = qt.QImageReader(filename)
diff = ir.size().width() / 140.0 diff = ir.size().width() / 140.0
w = ir.size().width() / diff w = ir.size().width() / diff
h = ir.size().height() / diff h = ir.size().height() / diff
if w > 2 * h: if w > 2 * h:
ir.setScaledSize(QtCore.QSize(1.7 * w, 1.7 * h)) ir.setScaledSize(qt.QSize(1.7 * w, 1.7 * h))
else: else:
ir.setScaledSize(QtCore.QSize(w, h)) ir.setScaledSize(qt.QSize(w, h))
img = ir.read() img = ir.read()
pm2 = QtGuiWidgets.QPixmap().fromImage(img) pm2 = qt.QPixmap().fromImage(img)
self.image_lbl.setPixmap(pm2) self.image_lbl.setPixmap(pm2)
layout = QtGuiWidgets.QGridLayout(self) layout = qt.QGridLayout(self)
layout.setContentsMargins(24,10,24,10) layout.setContentsMargins(24,10,24,10)
layout.setAlignment(QtCore.Qt.AlignTop) layout.setAlignment(qt.Qt.AlignTop)
layout.addWidget(self.image_lbl, 0,0,3,1) layout.addWidget(self.image_lbl, 0,0,3,1)
layout.addWidget(helpLabel,0,1) layout.addWidget(helpLabel,0,1)
layout.addWidget(linkLabel,1,1) layout.addWidget(linkLabel,1,1)
layout.addWidget(helpQuit,2,1, QtCore.Qt.AlignRight) layout.addWidget(helpQuit,2,1, qt.Qt.AlignRight)
self.setLayout(layout) self.setLayout(layout)
helpQuit.clicked.connect(self.close) helpQuit.clicked.connect(self.close)
@ -91,10 +91,10 @@ class HelpWgt(QtGuiWidgets.QWidget):
self.setFixedSize(self.sizeHint().width() + 50, \ self.setFixedSize(self.sizeHint().width() + 50, \
self.sizeHint().height()) self.sizeHint().height())
self.setWindowTitle (_('Calculate Console ')) self.setWindowTitle (_('Calculate Console '))
help_icon = QtGuiWidgets.QIcon \ help_icon = qt.QIcon \
('/usr/share/pixmaps/calculate-console-online.svg') ('/usr/share/pixmaps/calculate-console-online.svg')
if help_icon.isNull(): if help_icon.isNull():
help_icon = QtGuiWidgets.QIcon.fromTheme("help-about") help_icon = qt.QIcon.fromTheme("help-about")
self.setWindowIcon (help_icon) self.setWindowIcon (help_icon)
self.move(parent.window().geometry().x() + \ self.move(parent.window().geometry().x() + \
@ -105,7 +105,7 @@ class HelpWgt(QtGuiWidgets.QWidget):
- self.size().height() / 2) - self.size().height() / 2)
# for clear memory after closed this window # for clear memory after closed this window
self.setAttribute(QtCore.Qt.WA_DeleteOnClose) self.setAttribute(qt.Qt.WA_DeleteOnClose)
class HandBookWgt(HelpWgt): class HandBookWgt(HelpWgt):
def __init__(self, parent, window): def __init__(self, parent, window):
@ -116,56 +116,56 @@ import smtplib, re
import email.utils import email.utils
from email.mime.text import MIMEText from email.mime.text import MIMEText
class BugWgt(QtGuiWidgets.QWidget): class BugWgt(qt.QWidget):
def __init__(self, parent): def __init__(self, parent):
QtGuiWidgets.QWidget.__init__(self) qt.QWidget.__init__(self)
name_lbl = QtGuiWidgets.QLabel(_('Your name:'), self) name_lbl = qt.QLabel(_('Your name:'), self)
self.name_edit = QtGuiWidgets.QLineEdit(self) self.name_edit = qt.QLineEdit(self)
send_mail_lbl = QtGuiWidgets.QLabel(_('Your email:') + ' *', self) send_mail_lbl = qt.QLabel(_('Your email:') + ' *', self)
send_mail_lbl.setToolTip(_('Please enter a valid email. ') + '\n' + \ send_mail_lbl.setToolTip(_('Please enter a valid email. ') + '\n' + \
_('If the email does not exist, you will receive no letter')) _('If the email does not exist, you will receive no letter'))
self.send_mail_edit = QtGuiWidgets.QLineEdit(self) self.send_mail_edit = qt.QLineEdit(self)
self.send_mail_edit.setToolTip(_('Please enter a valid email. ')+'\n'+\ self.send_mail_edit.setToolTip(_('Please enter a valid email. ')+'\n'+\
_('If the email does not exist, you will receive no letter')) _('If the email does not exist, you will receive no letter'))
subject_lbl = QtGuiWidgets.QLabel(_('Subject:'), self) subject_lbl = qt.QLabel(_('Subject:'), self)
self.subject_edit = QtGuiWidgets.QLineEdit(self) self.subject_edit = qt.QLineEdit(self)
message_lbl = QtGuiWidgets.QLabel(_('Message:'), self) message_lbl = qt.QLabel(_('Message:'), self)
self.message_edit = QtGuiWidgets.QTextEdit(self) self.message_edit = qt.QTextEdit(self)
Send_button = QtGuiWidgets.QPushButton(_("Send a Bug"), self) Send_button = qt.QPushButton(_("Send a Bug"), self)
Send_button.setShortcut(QtGuiWidgets.QKeySequence(QtCore.Qt.Key_Return)) Send_button.setShortcut(qt.QKeySequence(qt.Qt.Key_Return))
Send_button.setMinimumWidth(Send_button.sizeHint().width()) Send_button.setMinimumWidth(Send_button.sizeHint().width())
Send_button.clicked.connect(self.send_bug) Send_button.clicked.connect(self.send_bug)
Quit_button = QtGuiWidgets.QPushButton(_("Close"), self) Quit_button = qt.QPushButton(_("Close"), self)
Quit_button.setShortcut(QtGuiWidgets.QKeySequence(QtCore.Qt.Key_Escape)) Quit_button.setShortcut(qt.QKeySequence(qt.Qt.Key_Escape))
Quit_button.clicked.connect(self.close) Quit_button.clicked.connect(self.close)
layout = QtGuiWidgets.QGridLayout(self) layout = qt.QGridLayout(self)
layout.setColumnStretch(0,0) layout.setColumnStretch(0,0)
layout.setColumnStretch(1,1) layout.setColumnStretch(1,1)
layout.addWidget(name_lbl, 0,0, QtCore.Qt.AlignRight) layout.addWidget(name_lbl, 0,0, qt.Qt.AlignRight)
layout.addWidget(self.name_edit, 0, 1, 1, 2) layout.addWidget(self.name_edit, 0, 1, 1, 2)
layout.addWidget(send_mail_lbl, 1,0, QtCore.Qt.AlignRight) layout.addWidget(send_mail_lbl, 1,0, qt.Qt.AlignRight)
layout.addWidget(self.send_mail_edit, 1, 1, 1, 2) layout.addWidget(self.send_mail_edit, 1, 1, 1, 2)
layout.addWidget(subject_lbl, 2,0, QtCore.Qt.AlignRight) layout.addWidget(subject_lbl, 2,0, qt.Qt.AlignRight)
layout.addWidget(self.subject_edit, 2, 1, 1, 2) layout.addWidget(self.subject_edit, 2, 1, 1, 2)
layout.addWidget(message_lbl, 3,0, QtCore.Qt.AlignRight | \ layout.addWidget(message_lbl, 3,0, qt.Qt.AlignRight | \
QtCore.Qt.AlignTop) qt.Qt.AlignTop)
layout.addWidget(self.message_edit, 3,1, 2, 2) layout.addWidget(self.message_edit, 3,1, 2, 2)
button_layout = QtGuiWidgets.QHBoxLayout() button_layout = qt.QHBoxLayout()
button_layout.addWidget(Send_button) button_layout.addWidget(Send_button)
button_layout.addWidget(Quit_button) button_layout.addWidget(Quit_button)
layout.addLayout(button_layout, 5, 1, 1, 2, QtCore.Qt.AlignRight) layout.addLayout(button_layout, 5, 1, 1, 2, qt.Qt.AlignRight)
self.setLayout(layout) self.setLayout(layout)
self.resize(350, 250) self.resize(350, 250)
@ -173,8 +173,8 @@ class BugWgt(QtGuiWidgets.QWidget):
# Set title and icon # Set title and icon
self.setWindowTitle (_('Calculate Console ')) self.setWindowTitle (_('Calculate Console '))
bug_icons = ['tools-report-bug','system-help','help-browser'] bug_icons = ['tools-report-bug','system-help','help-browser']
themeName = QtGuiWidgets.QIcon.themeName() themeName = qt.QIcon.themeName()
bug_icon = QtGuiWidgets.QIcon() bug_icon = qt.QIcon()
for image in bug_icons: for image in bug_icons:
bug_icon.setThemeName(themeName) bug_icon.setThemeName(themeName)
bug_icon = bug_icon.fromTheme(image) bug_icon = bug_icon.fromTheme(image)
@ -196,7 +196,7 @@ class BugWgt(QtGuiWidgets.QWidget):
- self.size().height() / 2) - self.size().height() / 2)
# for clear memory after closed this window # for clear memory after closed this window
self.setAttribute(QtCore.Qt.WA_DeleteOnClose) self.setAttribute(qt.Qt.WA_DeleteOnClose)
def set_message_text(self, text): def set_message_text(self, text):
self.message_edit.setText(text) self.message_edit.setText(text)

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from calculate.consolegui.qtwrapper import QtGuiWidgets, QtCore from calculate.consolegui import qt
from calculate.core.client.function import create_obj, listToArrayArray, \ from calculate.core.client.function import create_obj, listToArrayArray, \
listToArray listToArray
# import analysis # import analysis
@ -48,13 +48,13 @@ def get_size_by_type(sizetype, size):
return str(int(size) / k) return str(int(size) / k)
class CallMethod(QtCore.QThread): class CallMethod(qt.QThread):
'''For using page_offset and page_count''' '''For using page_offset and page_count'''
collect_sig = QtCore.Signal() collect_sig = qt.Signal()
call_meth_sig = QtCore.Signal() call_meth_sig = qt.Signal()
def __init__(self, parent): def __init__(self, parent):
QtCore.QThread.__init__(self, parent) qt.QThread.__init__(self, parent)
def run(self): def run(self):
self.collect_sig.emit() self.collect_sig.emit()
@ -74,9 +74,9 @@ class Table():
tablevalue = TableValue tablevalue = TableValue
class RadioButton(QtGuiWidgets.QRadioButton): class RadioButton(qt.QRadioButton):
def __init__(self, text=None, parent=None): def __init__(self, text=None, parent=None):
QtGuiWidgets.QRadioButton.__init__(self, text, parent) qt.QRadioButton.__init__(self, text, parent)
def set_data(self, data): def set_data(self, data):
self.data = data self.data = data
@ -85,7 +85,7 @@ class RadioButton(QtGuiWidgets.QRadioButton):
return self.data return self.data
class MainFrame(QtGuiWidgets.QWidget): class MainFrame(qt.QWidget):
def __init__(self, parent, ClientObj, view, method_name, \ def __init__(self, parent, ClientObj, view, method_name, \
error_output=True, skip_options=False): error_output=True, skip_options=False):
super(MainFrame, self).__init__(parent) super(MainFrame, self).__init__(parent)
@ -111,7 +111,7 @@ class MainFrame(QtGuiWidgets.QWidget):
self.buttons = [] self.buttons = []
# for clear memory after closed this window # for clear memory after closed this window
self.setAttribute(QtCore.Qt.WA_DeleteOnClose) self.setAttribute(qt.Qt.WA_DeleteOnClose)
# icon_visible(ClientObj.MainWidget, 'Methods', True) # icon_visible(ClientObj.MainWidget, 'Methods', True)
icon_visible(ClientObj.MainWidget, 'Back', True) icon_visible(ClientObj.MainWidget, 'Back', True)
@ -163,8 +163,14 @@ class MainFrame(QtGuiWidgets.QWidget):
debug(11, "! not brief page because has not steps field label") debug(11, "! not brief page because has not steps field label")
return False return False
add_standart_button = QtCore.Signal(object, int, int, bool, str) add_standart_button_signal = qt.Signal(object, int, int, bool, str)
add_custom_button = QtCore.Signal(object, int, int, bool, str) add_custom_button_signal = qt.Signal(object, int, int, bool, str)
def add_standart_button(self, group, x, y, brief=False, next_label=""):
self.add_standart_button_signal.emit(group, x, y, brief, next_label)
def add_custom_button(self, group, x, y, brief=False, next_label=""):
self.add_custom_button_signal.emit(group, x, y, brief, next_label)
def init_params(self, params, method_name): def init_params(self, params, method_name):
if method_name not in params: if method_name not in params:
@ -211,12 +217,12 @@ class MainFrame(QtGuiWidgets.QWidget):
debug(10, "CHANGE OFFSET for", self.method_name) debug(10, "CHANGE OFFSET for", self.method_name)
else: else:
debug(10, "SHOW NEW FRAME for", self.method_name) debug(10, "SHOW NEW FRAME for", self.method_name)
self.common_layout = QtGuiWidgets.QVBoxLayout(self) self.common_layout = qt.QVBoxLayout(self)
self.common_layout.setAlignment(QtCore.Qt.AlignTop) self.common_layout.setAlignment(qt.Qt.AlignTop)
self.common_layout.setContentsMargins(0, 0, 0, 0) self.common_layout.setContentsMargins(0, 0, 0, 0)
self.common_layout.setSpacing(0) self.common_layout.setSpacing(0)
self.grid = QtGuiWidgets.QGridLayout() self.grid = qt.QGridLayout()
self.grid.setSpacing(10) self.grid.setSpacing(10)
self.grid.setColumnStretch(0, 10) self.grid.setColumnStretch(0, 10)
self.grid.setColumnStretch(1, 17) self.grid.setColumnStretch(1, 17)
@ -322,7 +328,7 @@ class MainFrame(QtGuiWidgets.QWidget):
groupname = " " groupname = " "
fontsize = "1px" fontsize = "1px"
self.group_name_label = LabelWordWrap(groupname, self) self.group_name_label = LabelWordWrap(groupname, self)
self.group_name_label.setAlignment(QtCore.Qt.AlignLeft) self.group_name_label.setAlignment(qt.Qt.AlignLeft)
self.group_name_label.setStyleSheet("font-size: %s;" self.group_name_label.setStyleSheet("font-size: %s;"
"font-weight: bold;"%fontsize); "font-weight: bold;"%fontsize);
@ -526,21 +532,18 @@ class MainFrame(QtGuiWidgets.QWidget):
debug(10, "METHOD has next button", self.method_name) debug(10, "METHOD has next button", self.method_name)
if not add_button_flag: if not add_button_flag:
self.add_standart_button.connect( self.add_standart_button_signal.connect(
self._parent.control_button.add_standart_button) self._parent.control_button.add_standart_button)
debug(10, "ADD STANDARD BUTTONS (no brief) (Next name)", debug(10, "ADD STANDARD BUTTONS (no brief) (Next name)",
self.method_name) self.method_name)
self.add_standart_button.emit(Group, x, y, None, None) self.add_standart_button(Group, x, y)
else: else:
self.add_custom_button.connect( self.add_custom_button_signal.connect(
self._parent.control_button.add_custom_button) self._parent.control_button.add_custom_button)
self.add_custom_button.emit(Group, x, y, None, None) self.add_custom_button(Group, x, y)
# self.grid.setSizeConstraint(self.grid.SizeConstraint.SetMinimumSize) self.grid.setSizeConstraint(qt.QLayout.SetMaximumSize)
self.grid.setSizeConstraint(
QtGuiWidgets.QLayout.SizeConstraint.SetMaximumSize)
# hide expert settings # hide expert settings
self.grid.setContentsMargins(28, 28, 28, 28) self.grid.setContentsMargins(28, 28, 28, 28)
# If errors came in parameters # If errors came in parameters
@ -562,16 +565,16 @@ class MainFrame(QtGuiWidgets.QWidget):
self.ClientObj.MainWidget.left_frame.changed_step( self.ClientObj.MainWidget.left_frame.changed_step(
self.ClientObj.param_objects[self.method_name]['step']) self.ClientObj.param_objects[self.method_name]['step'])
if not lastTable: if not lastTable:
self.grid.addItem(QtGuiWidgets.QSpacerItem( self.grid.addItem(qt.QSpacerItem(
0, 0, QtGuiWidgets.QSizePolicy.Expanding, 0, 0, qt.QSizePolicy.Expanding,
QtGuiWidgets.QSizePolicy.Expanding), qt.QSizePolicy.Expanding),
x + 1, y, 1, 2) x + 1, y, 1, 2)
self.common_layout.addLayout(self.grid) self.common_layout.addLayout(self.grid)
# add spacer # add spacer
# self.common_layout.addItem(QtGuiWidgets.QSpacerItem( 0, 0, \ # self.common_layout.addItem(qt.QSpacerItem( 0, 0, \
# QtGuiWidgets.QSizePolicy.Expanding, QtGuiWidgets.QSizePolicy.Expanding)) # qt.QSizePolicy.Expanding, qt.QSizePolicy.Expanding))
self.update() self.update()
self.ClientObj.app.processEvents() self.ClientObj.app.processEvents()
self.updateGeometry() self.updateGeometry()
@ -705,23 +708,23 @@ class MainFrame(QtGuiWidgets.QWidget):
self.grid.addWidget(self.label_dict[field.name], x, y) self.grid.addWidget(self.label_dict[field.name], x, y)
self.view_dict[field.name] = QtGuiWidgets.QLineEdit(self) self.view_dict[field.name] = qt.QLineEdit(self)
if field.value: if field.value:
self.view_dict[field.name].setText(field.value) self.view_dict[field.name].setText(field.value)
if field.type == 'int': if field.type == 'int':
self.rx = QtCore.QRegExp("^[\d]{1,50}$") self.rx = qt.QRegExp("^[\d]{1,50}$")
self.validator = QtGuiWidgets.QRegExpValidator(self.rx, self) self.validator = qt.QRegExpValidator(self.rx, self)
self.view_dict[field.name].setValidator(self.validator) self.view_dict[field.name].setValidator(self.validator)
elif field.type == 'float': elif field.type == 'float':
self.rx = QtCore.QRegExp("^[\d]{1,50}[.][\d]{1,50}$") self.rx = qt.QRegExp("^[\d]{1,50}[.][\d]{1,50}$")
self.validator = QtGuiWidgets.QRegExpValidator(self.rx, self) self.validator = qt.QRegExpValidator(self.rx, self)
self.view_dict[field.name].setValidator(self.validator) self.view_dict[field.name].setValidator(self.validator)
# password input # password input
elif "password" in field.type: elif "password" in field.type:
self.view_dict[field.name].setEchoMode(QtGuiWidgets.QLineEdit.Password) self.view_dict[field.name].setEchoMode(qt.QLineEdit.Password)
exp = QtGuiWidgets.QSizePolicy.Policy.Expanding exp = qt.QSizePolicy.Expanding
pref = QtGuiWidgets.QSizePolicy.Policy.Preferred pref = qt.QSizePolicy.Preferred
self.view_dict[field.name].setSizePolicy(exp, pref) self.view_dict[field.name].setSizePolicy(exp, pref)
# advanced settings (expert) # advanced settings (expert)
if self.expert: if self.expert:
@ -761,7 +764,7 @@ class MainFrame(QtGuiWidgets.QWidget):
def add_element_check(self, field, x, y, brief=False): def add_element_check(self, field, x, y, brief=False):
self.error_label_dict[field.name] = ErrorLabel(self) self.error_label_dict[field.name] = ErrorLabel(self)
self.label_dict[field.name] = QtGuiWidgets.QLabel(field.label, self) self.label_dict[field.name] = qt.QLabel(field.label, self)
# set disable item if uncompatible # set disable item if uncompatible
if field.uncompatible: if field.uncompatible:
self.label_dict[field.name].setToolTip(field.uncompatible) self.label_dict[field.name].setToolTip(field.uncompatible)
@ -773,30 +776,28 @@ class MainFrame(QtGuiWidgets.QWidget):
if brief: if brief:
self.view_dict[field.name] = ReadonlyCheckBox(self) self.view_dict[field.name] = ReadonlyCheckBox(self)
else: else:
self.view_dict[field.name] = QtGuiWidgets.QCheckBox(self) self.view_dict[field.name] = qt.QCheckBox(self)
#self.view_dict[field.name].setStyleSheet( #self.view_dict[field.name].setStyleSheet(
# "QCheckBox:hover {background-color:#FFFFFF}") # "QCheckBox:hover {background-color:#FFFFFF}")
self.view_dict[field.name].setFocusPolicy(QtCore.Qt.NoFocus) self.view_dict[field.name].setFocusPolicy(qt.Qt.NoFocus)
if field.element.lower() == 'check_tristate' or self.expert: if field.element.lower() == 'check_tristate' or self.expert:
self.view_dict[field.name].setTristate() self.view_dict[field.name].setTristate()
if field.value == 'on': if field.value == 'on':
self.view_dict[field.name].setCheckState(QtCore.Qt.CheckState. \ self.view_dict[field.name].setCheckState(qt.Qt. \
Checked) Checked)
elif field.value == 'off': elif field.value == 'off':
self.view_dict[field.name].setCheckState(QtCore.Qt.CheckState. \ self.view_dict[field.name].setCheckState(qt.Qt. \
Unchecked) Unchecked)
elif field.value == 'auto': elif field.value == 'auto':
self.view_dict[field.name].setCheckState(QtCore.Qt.CheckState. \ self.view_dict[field.name].setCheckState(qt.Qt.PartiallyChecked)
PartiallyChecked)
else: else:
if field.value == 'on': if field.value == 'on':
self.view_dict[field.name].setChecked(True) self.view_dict[field.name].setChecked(True)
if self.expert: if self.expert:
if field.default and not field.name in self.error_fields_name: if field.default and not field.name in self.error_fields_name:
self.view_dict[field.name].setCheckState(QtCore.Qt.CheckState. \ self.view_dict[field.name].setCheckState(qt.Qt.PartiallyChecked)
PartiallyChecked)
if field.default: if field.default:
self.expert_list.append(field.name) self.expert_list.append(field.name)
else: else:
@ -812,11 +813,11 @@ class MainFrame(QtGuiWidgets.QWidget):
self.view_dict[field.name].setDisabled(True) self.view_dict[field.name].setDisabled(True)
self.view_dict[field.name].setContentsMargins(0, 0, 0, 0) self.view_dict[field.name].setContentsMargins(0, 0, 0, 0)
check_widget = QtGuiWidgets.QLabel(self) check_widget = qt.QLabel(self)
exp = QtGuiWidgets.QSizePolicy.Policy.Expanding exp = qt.QSizePolicy.Expanding
pref = QtGuiWidgets.QSizePolicy.Policy.Preferred pref = qt.QSizePolicy.Preferred
check_widget.setSizePolicy(exp, pref) check_widget.setSizePolicy(exp, pref)
check_layout = QtGuiWidgets.QHBoxLayout(check_widget) check_layout = qt.QHBoxLayout(check_widget)
check_layout.setContentsMargins(0, 0, 0, 0) check_layout.setContentsMargins(0, 0, 0, 0)
self.view_dict[field.name].setFixedWidth \ self.view_dict[field.name].setFixedWidth \
(self.view_dict[field.name].sizeHint().width() + 4) (self.view_dict[field.name].sizeHint().width() + 4)
@ -825,7 +826,7 @@ class MainFrame(QtGuiWidgets.QWidget):
check_layout.addWidget(self.view_dict[field.name]) check_layout.addWidget(self.view_dict[field.name])
check_widget.setFixedHeight \ check_widget.setFixedHeight \
(self.view_dict[field.name].size().height()) (self.view_dict[field.name].size().height())
check_layout.setAlignment(QtCore.Qt.AlignLeft) check_layout.setAlignment(qt.Qt.AlignLeft)
if brief: if brief:
self.brief_grid.addWidget(check_widget, x, y + 1) self.brief_grid.addWidget(check_widget, x, y + 1)
@ -843,7 +844,7 @@ class MainFrame(QtGuiWidgets.QWidget):
def changed_expert_check(self, field_name): def changed_expert_check(self, field_name):
def wrapper(): def wrapper():
if self.view_dict[field_name].checkState() == \ if self.view_dict[field_name].checkState() == \
QtCore.Qt.CheckState.PartiallyChecked: qt.Qt.PartiallyChecked:
self.add_expert(field_name) self.add_expert(field_name)
else: else:
self.remove_expert(field_name) self.remove_expert(field_name)
@ -851,7 +852,7 @@ class MainFrame(QtGuiWidgets.QWidget):
return wrapper return wrapper
def add_element_radio(self, field, x, y): def add_element_radio(self, field, x, y):
self.label_dict[field.name] = QtGuiWidgets.QLabel(self) self.label_dict[field.name] = qt.QLabel(self)
if field.uncompatible: if field.uncompatible:
self.label_dict[field.name].setToolTip(field.uncompatible) self.label_dict[field.name].setToolTip(field.uncompatible)
self.label_dict[field.name].setDisabled(True) self.label_dict[field.name].setDisabled(True)
@ -862,7 +863,7 @@ class MainFrame(QtGuiWidgets.QWidget):
if field.comments: if field.comments:
comments = field.comments[0] comments = field.comments[0]
self.GroupBox = QtGuiWidgets.QGroupBox(field.label, self) self.GroupBox = qt.QGroupBox(field.label, self)
self.GroupBox.setStyleSheet( self.GroupBox.styleSheet() + self.GroupBox.setStyleSheet( self.GroupBox.styleSheet() +
"QGroupBox {" "QGroupBox {"
'padding-top: 24px; padding-bottom: 0px;' 'padding-top: 24px; padding-bottom: 0px;'
@ -883,8 +884,8 @@ class MainFrame(QtGuiWidgets.QWidget):
'background-color: transparent;' 'background-color: transparent;'
'subcontrol-position: top center;' 'subcontrol-position: top center;'
'margin-top: 6px;}') 'margin-top: 6px;}')
self.ButGrp_dict[field.name] = QtGuiWidgets.QButtonGroup(self) self.ButGrp_dict[field.name] = qt.QButtonGroup(self)
layout = QtGuiWidgets.QVBoxLayout(self.GroupBox) layout = qt.QVBoxLayout(self.GroupBox)
radiolist = [] radiolist = []
if field.value == None: if field.value == None:
@ -892,7 +893,7 @@ class MainFrame(QtGuiWidgets.QWidget):
for i in range(0, len(choice)): for i in range(0, len(choice)):
radio_but = RadioButton(self) radio_but = RadioButton(self)
radio_but.setFocusPolicy(QtCore.Qt.NoFocus) radio_but.setFocusPolicy(qt.Qt.NoFocus)
if choice[i] == None: if choice[i] == None:
choice[i] = '' choice[i] = ''
try: try:
@ -960,7 +961,7 @@ class MainFrame(QtGuiWidgets.QWidget):
choice.append(field.value) choice.append(field.value)
# add label # add label
self.label_dict[field.name] = QtGuiWidgets.QLabel(field.label, self) self.label_dict[field.name] = qt.QLabel(field.label, self)
if field.uncompatible: if field.uncompatible:
self.label_dict[field.name].setToolTip(field.uncompatible) self.label_dict[field.name].setToolTip(field.uncompatible)
self.label_dict[field.name].setDisabled(True) self.label_dict[field.name].setDisabled(True)
@ -991,8 +992,8 @@ class MainFrame(QtGuiWidgets.QWidget):
self.ComboBox.currentIndexChanged.connect \ self.ComboBox.currentIndexChanged.connect \
(combo_checked(self, field.name)) (combo_checked(self, field.name))
exp = QtGuiWidgets.QSizePolicy.Policy.Expanding exp = qt.QSizePolicy.Expanding
pref = QtGuiWidgets.QSizePolicy.Policy.Preferred pref = qt.QSizePolicy.Preferred
self.ComboBox.setSizePolicy(exp, pref) self.ComboBox.setSizePolicy(exp, pref)
self.view_dict[field.name] = self.ComboBox self.view_dict[field.name] = self.ComboBox
if self.expert: if self.expert:
@ -1051,7 +1052,7 @@ class MainFrame(QtGuiWidgets.QWidget):
choice.append(field.value) choice.append(field.value)
# add label # add label
self.label_dict[field.name] = QtGuiWidgets.QLabel(field.label, self) self.label_dict[field.name] = qt.QLabel(field.label, self)
if field.uncompatible: if field.uncompatible:
self.label_dict[field.name].setToolTip(field.uncompatible) self.label_dict[field.name].setToolTip(field.uncompatible)
self.label_dict[field.name].setDisabled(True) self.label_dict[field.name].setDisabled(True)
@ -1060,7 +1061,7 @@ class MainFrame(QtGuiWidgets.QWidget):
self.ComboBox = QComboWgt(self) self.ComboBox = QComboWgt(self)
self.ComboBox.setDuplicatesEnabled(False) self.ComboBox.setDuplicatesEnabled(False)
self.ComboBox.setEditable(True) self.ComboBox.setEditable(True)
#le = QtGuiWidgets.QLineEdit(self) #le = qt.QLineEdit(self)
#le.setStyleSheet('QLineEdit {background:white;margin: 1px;}') #le.setStyleSheet('QLineEdit {background:white;margin: 1px;}')
#self.ComboBox.setLineEdit(le) #self.ComboBox.setLineEdit(le)
for i in range(0, len(choice)): for i in range(0, len(choice)):
@ -1079,8 +1080,8 @@ class MainFrame(QtGuiWidgets.QWidget):
if field.value == choice[i]: if field.value == choice[i]:
self.ComboBox.setCurrentIndex(i) self.ComboBox.setCurrentIndex(i)
exp = QtGuiWidgets.QSizePolicy.Policy.Expanding exp = qt.QSizePolicy.Expanding
pref = QtGuiWidgets.QSizePolicy.Policy.Preferred pref = qt.QSizePolicy.Preferred
self.ComboBox.setSizePolicy(exp, pref) self.ComboBox.setSizePolicy(exp, pref)
self.view_dict[field.name] = self.ComboBox self.view_dict[field.name] = self.ComboBox
if self.expert: if self.expert:
@ -1132,7 +1133,7 @@ class MainFrame(QtGuiWidgets.QWidget):
comments, add_ability, comments, add_ability,
self.expert) self.expert)
# add label # add label
self.label_dict[field.name] = QtGuiWidgets.QLabel(field.label, self) self.label_dict[field.name] = qt.QLabel(field.label, self)
if self.expert: if self.expert:
if field.default: if field.default:
self.expert_list.append(field.name) self.expert_list.append(field.name)
@ -1217,7 +1218,7 @@ class MainFrame(QtGuiWidgets.QWidget):
# return wrapper # return wrapper
def add_element_openfile(self, field, x, y): def add_element_openfile(self, field, x, y):
self.label_dict[field.name] = QtGuiWidgets.QLabel(field.label, self) self.label_dict[field.name] = qt.QLabel(field.label, self)
self.grid.addWidget(self.label_dict[field.name], x, y) self.grid.addWidget(self.label_dict[field.name], x, y)
# field.type in ['file','files','dir'] # field.type in ['file','files','dir']
@ -1251,7 +1252,7 @@ class MainFrame(QtGuiWidgets.QWidget):
self.grid.addWidget(self.error_label_dict[field.name], x + 1, y, 1, 2) self.grid.addWidget(self.error_label_dict[field.name], x + 1, y, 1, 2)
def add_element_file(self, field, x, y): def add_element_file(self, field, x, y):
self.label_dict[field.name] = QtGuiWidgets.QLabel(field.label, self) self.label_dict[field.name] = qt.QLabel(field.label, self)
self.grid.addWidget(self.label_dict[field.name], x, y) self.grid.addWidget(self.label_dict[field.name], x, y)
try: try:
@ -1362,7 +1363,7 @@ class MainFrame(QtGuiWidgets.QWidget):
self.view_dict[field.name].clicked.connect( self.view_dict[field.name].clicked.connect(
self.set_disabled_expert(field.name, False)) self.set_disabled_expert(field.name, False))
expert_signal = QtCore.Signal() expert_signal = qt.Signal()
def set_disabled_expert(self, field_name, disabled=True): def set_disabled_expert(self, field_name, disabled=True):
def wrapper(): def wrapper():
@ -1436,7 +1437,7 @@ class MainFrame(QtGuiWidgets.QWidget):
reply = show_question(self, text, cursor_pos=True, reply = show_question(self, text, cursor_pos=True,
title=_('Calculate Console')) title=_('Calculate Console'))
if reply == QtGuiWidgets.QMessageBox.Yes or not self.changed_expert_list: if reply == qt.QMessageBox.Yes or not self.changed_expert_list:
for field_name in self.changed_expert_list: for field_name in self.changed_expert_list:
if field_name not in self.expert_list: if field_name not in self.expert_list:
self.expert_list.append(field_name) self.expert_list.append(field_name)
@ -1556,9 +1557,9 @@ class MainFrame(QtGuiWidgets.QWidget):
self.ClientObj.process_dict[meth_result[0].message] \ self.ClientObj.process_dict[meth_result[0].message] \
['name'] = method_name ['name'] = method_name
self.ClientObj.process_dict[meth_result[0].message] \ self.ClientObj.process_dict[meth_result[0].message] \
['layout'] = QtGuiWidgets.QVBoxLayout() ['layout'] = qt.QVBoxLayout()
self.ClientObj.process_dict[meth_result[0].message] \ self.ClientObj.process_dict[meth_result[0].message] \
['layout'].setAlignment(QtCore.Qt.AlignTop) ['layout'].setAlignment(qt.Qt.AlignTop)
# set new window title # set new window title
if self.ClientObj.method_names.has_key(method_name): if self.ClientObj.method_names.has_key(method_name):
@ -1654,8 +1655,8 @@ class MainFrame(QtGuiWidgets.QWidget):
self.add_table_items(table, field, lenColumn, self.table_widget, \ self.add_table_items(table, field, lenColumn, self.table_widget, \
brief) brief)
minimum = QtGuiWidgets.QSizePolicy.Minimum minimum = qt.QSizePolicy.Minimum
expanding = QtGuiWidgets.QSizePolicy.Expanding expanding = qt.QSizePolicy.Expanding
self.table_widget.setSizePolicy(minimum, expanding) self.table_widget.setSizePolicy(minimum, expanding)
self.view_dict[field.name] = self.table_widget self.view_dict[field.name] = self.table_widget
@ -1682,34 +1683,34 @@ class MainFrame(QtGuiWidgets.QWidget):
self.grid.addWidget(self.label_dict[field.name], x, y, 1, 2) self.grid.addWidget(self.label_dict[field.name], x, y, 1, 2)
x += 1 x += 1
widget_for_grid = QtGuiWidgets.QWidget(self) widget_for_grid = qt.QWidget(self)
if brief: if brief:
widget_for_grid.setStyleSheet("background: transparent;") widget_for_grid.setStyleSheet("background: transparent;")
wfg_layout = QtGuiWidgets.QVBoxLayout(widget_for_grid) wfg_layout = qt.QVBoxLayout(widget_for_grid)
wfg_layout.setSpacing(0) wfg_layout.setSpacing(0)
wfg_layout.setContentsMargins(0, 0, 0, 0) wfg_layout.setContentsMargins(0, 0, 0, 0)
# add 2 button if field type = writable # add 2 button if field type = writable
if field.type == 'writable': if field.type == 'writable':
self.view_dict[field.name].horizontalHeader().setClickable(False) self.view_dict[field.name].horizontalHeader().setClickable(False)
unit_widget = QtGuiWidgets.QWidget(self) unit_widget = qt.QWidget(self)
unit_layout = QtGuiWidgets.QHBoxLayout(unit_widget) unit_layout = qt.QHBoxLayout(unit_widget)
unit_layout.setContentsMargins(0, 0, 0, 0) unit_layout.setContentsMargins(0, 0, 0, 0)
unit_layout.setSpacing(3) unit_layout.setSpacing(3)
plus_but = QtGuiWidgets.QPushButton(self) plus_but = qt.QPushButton(self)
try: try:
plus_but.setIcon(QtGuiWidgets.QIcon.fromTheme('list-add')) plus_but.setIcon(qt.QIcon.fromTheme('list-add'))
except: except:
plus_but.setText('+') plus_but.setText('+')
plus_but.setToolTip(_('Add a row')) plus_but.setToolTip(_('Add a row'))
plus_but.setFixedWidth(30) plus_but.setFixedWidth(30)
self.view_dict[field.name].minus_but = QtGuiWidgets.QPushButton(self) self.view_dict[field.name].minus_but = qt.QPushButton(self)
try: try:
self.view_dict[field.name].minus_but.setIcon \ self.view_dict[field.name].minus_but.setIcon \
(QtGuiWidgets.QIcon.fromTheme('list-remove')) (qt.QIcon.fromTheme('list-remove'))
except: except:
self.view_dict[field.name].minus_but.setText('-') self.view_dict[field.name].minus_but.setText('-')
self.view_dict[field.name].minus_but.setToolTip \ self.view_dict[field.name].minus_but.setToolTip \
@ -1717,18 +1718,18 @@ class MainFrame(QtGuiWidgets.QWidget):
self.view_dict[field.name].minus_but.setFixedWidth(30) self.view_dict[field.name].minus_but.setFixedWidth(30)
self.view_dict[field.name].minus_but.setDisabled(True) self.view_dict[field.name].minus_but.setDisabled(True)
refresh_but = QtGuiWidgets.QPushButton(self) refresh_but = qt.QPushButton(self)
try: try:
refresh_but.setIcon(QtGuiWidgets.QIcon.fromTheme('edit-undo')) refresh_but.setIcon(qt.QIcon.fromTheme('edit-undo'))
except: except:
refresh_but.setText('R') refresh_but.setText('R')
refresh_but.setToolTip(_('Recover the table')) refresh_but.setToolTip(_('Recover the table'))
refresh_but.setFixedWidth(30) refresh_but.setFixedWidth(30)
clear_but = QtGuiWidgets.QPushButton(self) clear_but = qt.QPushButton(self)
try: try:
clear_but.setIcon(QtGuiWidgets.QIcon.fromTheme('edit-clear')) clear_but.setIcon(qt.QIcon.fromTheme('edit-clear'))
except: except:
clear_but.setText('C') clear_but.setText('C')
@ -1751,7 +1752,7 @@ class MainFrame(QtGuiWidgets.QWidget):
unit_layout.addWidget(refresh_but) unit_layout.addWidget(refresh_but)
unit_layout.addWidget(clear_but) unit_layout.addWidget(clear_but)
unit_layout.setAlignment(QtCore.Qt.AlignLeft) unit_layout.setAlignment(qt.Qt.AlignLeft)
wfg_layout.addWidget(unit_widget) wfg_layout.addWidget(unit_widget)
# self.grid.addWidget(unit_widget, x, y) # self.grid.addWidget(unit_widget, x, y)
# x +=1 # x +=1
@ -1770,13 +1771,9 @@ class MainFrame(QtGuiWidgets.QWidget):
else: else:
self.view_dict[field.name].hideColumn(0) self.view_dict[field.name].hideColumn(0)
# set width column
# self.view_dict[field.name].horizontalHeader().resizeSections\
# (QtGuiWidgets.QHeaderView.ResizeMode.ResizeToContents)
# No Selection # No Selection
self.view_dict[field.name].setSelectionMode \ self.view_dict[field.name].setSelectionMode(
(QtGuiWidgets.QAbstractItemView.SelectionMode.NoSelection) qt.QAbstractItemView.NoSelection)
if field.uncompatible: if field.uncompatible:
self.label_dict[field.name].setToolTip(field.uncompatible) self.label_dict[field.name].setToolTip(field.uncompatible)
@ -1808,36 +1805,36 @@ class MainFrame(QtGuiWidgets.QWidget):
col = column + 1 col = column + 1
if not table.values: if not table.values:
table_widget.setEditTriggers \ table_widget.setEditTriggers \
(QtGuiWidgets.QAbstractItemView.NoEditTriggers) (qt.QAbstractItemView.NoEditTriggers)
for row in range(len(table.body.stringArray)): for row in range(len(table.body.stringArray)):
tablewidgetitem = QtGuiWidgets.QTableWidgetItem \ tablewidgetitem = qt.QTableWidgetItem \
(table.body.stringArray[row].string[column]) (table.body.stringArray[row].string[column])
table_widget.setItem(row, col, tablewidgetitem) table_widget.setItem(row, col, tablewidgetitem)
elif column > (len(table.values.ChoiceValue) - 1): elif column > (len(table.values.ChoiceValue) - 1):
for row in range(len(table.body.stringArray)): for row in range(len(table.body.stringArray)):
tablewidgetitem = QtGuiWidgets.QTableWidgetItem \ tablewidgetitem = qt.QTableWidgetItem \
(table.body.stringArray[row].string[column]) (table.body.stringArray[row].string[column])
table_widget.setItem(row, col, tablewidgetitem) table_widget.setItem(row, col, tablewidgetitem)
table_widget.item(row, col).setFlags( table_widget.item(row, col).setFlags(
QtCore.Qt.ItemIsEditable) qt.Qt.ItemIsEditable)
brush = QtGuiWidgets.QBrush( brush = qt.QBrush(
self.palette().color(QtGuiWidgets.QPalette.Text)) self.palette().color(qt.QPalette.Text))
table_widget.item(row, col).setForeground(brush) table_widget.item(row, col).setForeground(brush)
elif brief and table.values.ChoiceValue[column].typefield in \ elif brief and table.values.ChoiceValue[column].typefield in \
['combo', 'comboEdit', 'multichoice', \ ['combo', 'comboEdit', 'multichoice', \
'multichoice_add', 'input', 'password']: 'multichoice_add', 'input', 'password']:
table_widget.setEditTriggers \ table_widget.setEditTriggers \
(QtGuiWidgets.QAbstractItemView.NoEditTriggers) (qt.QAbstractItemView.NoEditTriggers)
for row in range(len(table.body.stringArray)): for row in range(len(table.body.stringArray)):
if table.values.ChoiceValue[column].typefield == \ if table.values.ChoiceValue[column].typefield == \
'password' and table.body.stringArray \ 'password' and table.body.stringArray \
[row].string[column]: [row].string[column]:
tablewidgetitem = QtGuiWidgets.QTableWidgetItem('***') tablewidgetitem = qt.QTableWidgetItem('***')
else: else:
tablewidgetitem = QtGuiWidgets.QTableWidgetItem \ tablewidgetitem = qt.QTableWidgetItem \
(table.body.stringArray[row].string[column]) (table.body.stringArray[row].string[column])
table_widget.setItem(row, col, tablewidgetitem) table_widget.setItem(row, col, tablewidgetitem)
@ -1855,13 +1852,13 @@ class MainFrame(QtGuiWidgets.QWidget):
if ind < len(ChoiceValue.comments.string): if ind < len(ChoiceValue.comments.string):
val = ChoiceValue.comments.string[ind] val = ChoiceValue.comments.string[ind]
tablewidgetitem = QtGuiWidgets.QTableWidgetItem(val) tablewidgetitem = qt.QTableWidgetItem(val)
table_widget.setItem(row, col, tablewidgetitem) table_widget.setItem(row, col, tablewidgetitem)
table_widget.item(row, col).setFlags \ table_widget.item(row, col).setFlags \
(QtCore.Qt.ItemIsEditable) (qt.Qt.ItemIsEditable)
brush = QtGuiWidgets.QBrush( brush = qt.QBrush(
self.palette().color(QtGuiWidgets.QPalette.Text)) self.palette().color(qt.QPalette.Text))
table_widget.item(row, col).setForeground(brush) table_widget.item(row, col).setForeground(brush)
elif table.values.ChoiceValue[column].typefield in \ elif table.values.ChoiceValue[column].typefield in \
@ -1890,13 +1887,13 @@ class MainFrame(QtGuiWidgets.QWidget):
value_dict[choice[i]] = choice[i] value_dict[choice[i]] = choice[i]
val = ','.join(map(lambda x: value_dict[x], default)) val = ','.join(map(lambda x: value_dict[x], default))
tablewidgetitem = QtGuiWidgets.QTableWidgetItem(val) tablewidgetitem = qt.QTableWidgetItem(val)
table_widget.setItem(row, col, tablewidgetitem) table_widget.setItem(row, col, tablewidgetitem)
table_widget.item(row, col).setFlags \ table_widget.item(row, col).setFlags \
(QtCore.Qt.ItemIsEditable) (qt.Qt.ItemIsEditable)
brush = QtGuiWidgets.QBrush( brush = qt.QBrush(
self.palette().color(QtGuiWidgets.QPalette.Text)) self.palette().color(qt.QPalette.Text))
table_widget.item(row, col).setForeground(brush) table_widget.item(row, col).setForeground(brush)
elif table.values.ChoiceValue[column].typefield in \ elif table.values.ChoiceValue[column].typefield in \
@ -1914,14 +1911,14 @@ class MainFrame(QtGuiWidgets.QWidget):
elif not val and brief: elif not val and brief:
data = '' data = ''
val = '' val = ''
tablewidgetitem = QtGuiWidgets.QTableWidgetItem(val) tablewidgetitem = qt.QTableWidgetItem(val)
tablewidgetitem.setData(1, data) tablewidgetitem.setData(1, data)
table_widget.setItem(row, col, tablewidgetitem) table_widget.setItem(row, col, tablewidgetitem)
table_widget.item(row, col).setFlags( table_widget.item(row, col).setFlags(
QtCore.Qt.ItemIsEditable) qt.Qt.ItemIsEditable)
brush = QtGuiWidgets.QBrush( brush = qt.QBrush(
self.palette().color(QtGuiWidgets.QPalette.Text)) self.palette().color(qt.QPalette.Text))
table_widget.item(row, col).setForeground(brush) table_widget.item(row, col).setForeground(brush)
elif table.values.ChoiceValue[column].typefield in \ elif table.values.ChoiceValue[column].typefield in \
@ -1929,27 +1926,27 @@ class MainFrame(QtGuiWidgets.QWidget):
for row in range(len(table.body.stringArray)): for row in range(len(table.body.stringArray)):
val = table.body.stringArray[row].string[column] val = table.body.stringArray[row].string[column]
tablewidgetitem = QtGuiWidgets.QTableWidgetItem(val) tablewidgetitem = qt.QTableWidgetItem(val)
table_widget.setItem(row, col, tablewidgetitem) table_widget.setItem(row, col, tablewidgetitem)
table_widget.item(row, col).setFlags( table_widget.item(row, col).setFlags(
QtCore.Qt.ItemIsEditable) qt.Qt.ItemIsEditable)
brush = QtGuiWidgets.QBrush( brush = qt.QBrush(
self.palette().color(QtGuiWidgets.QPalette.Text)) self.palette().color(qt.QPalette.Text))
table_widget.item(row, col).setForeground(brush) table_widget.item(row, col).setForeground(brush)
elif table.values.ChoiceValue[column].typefield == 'password': elif table.values.ChoiceValue[column].typefield == 'password':
for row in range(len(table.body.stringArray)): for row in range(len(table.body.stringArray)):
passwd = table.body.stringArray[row].string[column] passwd = table.body.stringArray[row].string[column]
val = '***' if passwd else '' val = '***' if passwd else ''
tablewidgetitem = QtGuiWidgets.QTableWidgetItem(val) tablewidgetitem = qt.QTableWidgetItem(val)
tablewidgetitem.setData(1, passwd) tablewidgetitem.setData(1, passwd)
table_widget.setItem(row, col, tablewidgetitem) table_widget.setItem(row, col, tablewidgetitem)
table_widget.item(row, col).setFlags( table_widget.item(row, col).setFlags(
QtCore.Qt.ItemIsEditable) qt.Qt.ItemIsEditable)
brush = QtGuiWidgets.QBrush( brush = qt.QBrush(
self.palette().color(QtGuiWidgets.QPalette.Text)) self.palette().color(qt.QPalette.Text))
table_widget.item(row, col).setForeground(brush) table_widget.item(row, col).setForeground(brush)
def add_select_check(self, table): def add_select_check(self, table):
@ -1966,9 +1963,9 @@ class MainFrame(QtGuiWidgets.QWidget):
for row in range(table.rowCount()): for row in range(table.rowCount()):
if not table.cellWidget(row, 0): if not table.cellWidget(row, 0):
tablewidgetitem = QtGuiWidgets.QTableWidgetItem() tablewidgetitem = qt.QTableWidgetItem()
table.setItem(row, 0, tablewidgetitem) table.setItem(row, 0, tablewidgetitem)
# table.item(row, 0).setFlags(QtCore.Qt.ItemIsEditable) # table.item(row, 0).setFlags(qt.Qt.ItemIsEditable)
ch = CentralCheckBox(self.table_widget, False, ind_col=True) ch = CentralCheckBox(self.table_widget, False, ind_col=True)
ch.setToolTip(_('Delete the row')) ch.setToolTip(_('Delete the row'))
@ -1981,7 +1978,7 @@ class MainFrame(QtGuiWidgets.QWidget):
def plus_row(self, table, field): def plus_row(self, table, field):
def wrapper(): def wrapper():
self.PlusWgt = PlusRow(self, table, field) self.PlusWgt = PlusRow(self, table, field)
self.PlusWgt.setAttribute(QtCore.Qt.WA_ShowModal) self.PlusWgt.setWindowModality(qt.Qt.WindowModal)
self.PlusWgt.show() self.PlusWgt.show()
return wrapper return wrapper
@ -1991,7 +1988,7 @@ class MainFrame(QtGuiWidgets.QWidget):
if not item.column(): if not item.column():
return return
self.PlusWgt = PlusRow(self, table, field, True, item.row()) self.PlusWgt = PlusRow(self, table, field, True, item.row())
self.PlusWgt.setAttribute(QtCore.Qt.WA_ShowModal) self.PlusWgt.setWindowModality(qt.Qt.WindowModal)
self.PlusWgt.show() self.PlusWgt.show()
return wrapper return wrapper
@ -2042,8 +2039,8 @@ class MainFrame(QtGuiWidgets.QWidget):
for row_in_table in range(table.rowCount()): for row_in_table in range(table.rowCount()):
h += table.rowHeight(row_in_table) h += table.rowHeight(row_in_table)
table.setFixedHeight(h) table.setFixedHeight(h)
table.horizontalHeader().resizeSections \ table.horizontalHeader().resizeSections(
(QtGuiWidgets.QHeaderView.ResizeMode.ResizeToContents) qt.QHeaderView.ResizeToContents)
table.setColumnWidth(0, 40) table.setColumnWidth(0, 40)
############# End add Table ############# End add Table
@ -2075,10 +2072,10 @@ class MainFrame(QtGuiWidgets.QWidget):
self.grid.addWidget(help_lbl, x, y, 1, 2) self.grid.addWidget(help_lbl, x, y, 1, 2)
x += 1 x += 1
# brief_sa = QtGuiWidgets.QScrollArea(self) # brief_sa = qt.QScrollArea(self)
brief_widget = QtGuiWidgets.QWidget(self) brief_widget = qt.QWidget(self)
self.brief_grid = QtGuiWidgets.QGridLayout(brief_widget) self.brief_grid = qt.QGridLayout(brief_widget)
# self.brief_grid.setContentsMargins(10,10,10,10) # self.brief_grid.setContentsMargins(10,10,10,10)
self.brief_grid.setContentsMargins(0, 0, 0, 0) self.brief_grid.setContentsMargins(0, 0, 0, 0)
self.brief_grid.setSpacing(10) self.brief_grid.setSpacing(10)
@ -2093,7 +2090,7 @@ class MainFrame(QtGuiWidgets.QWidget):
brief_widget.setStyleSheet("#Brief_w " brief_widget.setStyleSheet("#Brief_w "
"{background-color: transparent;}") "{background-color: transparent;}")
exp = QtGuiWidgets.QSizePolicy.Policy.Expanding exp = qt.QSizePolicy.Expanding
expert_brief = ExpertWidget(_('View options'), self) expert_brief = ExpertWidget(_('View options'), self)
expert_brief.setFlat(True) expert_brief.setFlat(True)
@ -2109,19 +2106,18 @@ class MainFrame(QtGuiWidgets.QWidget):
debug(10, "ADD STANDARD BUTTONS (brief) (%s)" % next_button_text, debug(10, "ADD STANDARD BUTTONS (brief) (%s)" % next_button_text,
self.method_name) self.method_name)
self.add_standart_button.connect( self.add_standart_button_signal.connect(
self._parent.control_button.add_standart_button) self._parent.control_button.add_standart_button)
self.add_standart_button.emit(GroupField[-1], x, y, True, \ self.add_standart_button(GroupField[-1], x, y, True, \
next_button_text) next_button_text)
# add image # add image
self.add_image() self.add_image()
# add spacer # add spacer
self.spacer_item = QtGuiWidgets.QSpacerItem(0, 0, exp, exp) self.spacer_item = qt.QSpacerItem(0, 0, exp, exp)
self.grid.addItem(self.spacer_item) self.grid.addItem(self.spacer_item)
self.grid.setSizeConstraint \ self.grid.setSizeConstraint(qt.QLayout.SetMaximumSize)
(QtGuiWidgets.QLayout.SizeConstraint.SetMaximumSize)
self.common_layout.addLayout(self.grid) self.common_layout.addLayout(self.grid)
# Show Control Buttons widget # Show Control Buttons widget
@ -2154,7 +2150,7 @@ class MainFrame(QtGuiWidgets.QWidget):
if not Group.fields: if not Group.fields:
return grid_x return grid_x
# self.group_name_label = LabelWordWrap(Group.name, self) # self.group_name_label = LabelWordWrap(Group.name, self)
GroupBox = QtGuiWidgets.QGroupBox(Group.name) GroupBox = qt.QGroupBox(Group.name)
GroupBox.setObjectName('GroupBoxBrief') GroupBox.setObjectName('GroupBoxBrief')
# brief_widget.setStyleSheet("#Brief_w " # brief_widget.setStyleSheet("#Brief_w "
GroupBox.setStyleSheet( GroupBox.setStyleSheet(
@ -2180,7 +2176,7 @@ class MainFrame(QtGuiWidgets.QWidget):
'margin-top: 6px;}') 'margin-top: 6px;}')
else: else:
return grid_x return grid_x
gb_layout = QtGuiWidgets.QGridLayout(GroupBox) gb_layout = qt.QGridLayout(GroupBox)
gb_layout.setContentsMargins(10, 10, 10, 10) gb_layout.setContentsMargins(10, 10, 10, 10)
gb_layout.setSpacing(4) gb_layout.setSpacing(4)
@ -2289,8 +2285,8 @@ class MainFrame(QtGuiWidgets.QWidget):
else: else:
uncompatible_count += 1 uncompatible_count += 1
minimum = QtGuiWidgets.QSizePolicy.Minimum minimum = qt.QSizePolicy.Minimum
maximum = QtGuiWidgets.QSizePolicy.Maximum maximum = qt.QSizePolicy.Maximum
GroupBox.setSizePolicy(minimum, maximum) GroupBox.setSizePolicy(minimum, maximum)
if uncompatible_count != len(Fields): if uncompatible_count != len(Fields):
@ -2402,7 +2398,7 @@ class MainFrame(QtGuiWidgets.QWidget):
debug(10, "SKIP uncompatible", field.name) debug(10, "SKIP uncompatible", field.name)
continue continue
if type(self.view_dict[field.name]) == QtGuiWidgets.QGroupBox: if type(self.view_dict[field.name]) == qt.QGroupBox:
if self.ButGrp_dict[field.name].checkedButton(): if self.ButGrp_dict[field.name].checkedButton():
param_object[paramname] = ( param_object[paramname] = (
self.ButGrp_dict[field.name].checkedButton( self.ButGrp_dict[field.name].checkedButton(
@ -2417,13 +2413,13 @@ class MainFrame(QtGuiWidgets.QWidget):
else: else:
param_object[paramname] = False param_object[paramname] = False
elif type(self.view_dict[field.name]) == QtGuiWidgets.QCheckBox: elif type(self.view_dict[field.name]) == qt.QCheckBox:
if self.view_dict[field.name].isTristate(): if self.view_dict[field.name].isTristate():
if self.view_dict[field.name].checkState() \ if self.view_dict[field.name].checkState() \
== QtCore.Qt.CheckState.PartiallyChecked: == qt.Qt.PartiallyChecked:
param_object[paramname] = None param_object[paramname] = None
elif self.view_dict[field.name].checkState() \ elif self.view_dict[field.name].checkState() \
== QtCore.Qt.CheckState.Checked: == qt.Qt.Checked:
param_object[paramname] = True param_object[paramname] = True
else: else:
param_object[paramname] = False param_object[paramname] = False
@ -2433,7 +2429,7 @@ class MainFrame(QtGuiWidgets.QWidget):
self.view_dict[field.name].isChecked() self.view_dict[field.name].isChecked()
elif type(self.view_dict[field.name]) in \ elif type(self.view_dict[field.name]) in \
[QtGuiWidgets.QComboBox, QComboWgt]: [qt.QComboBox, QComboWgt]:
ind = self.view_dict[field.name].currentIndex() ind = self.view_dict[field.name].currentIndex()
text = self.view_dict[field.name].currentText() text = self.view_dict[field.name].currentText()
choice = [] choice = []
@ -2462,7 +2458,7 @@ class MainFrame(QtGuiWidgets.QWidget):
param_object[paramname] = \ param_object[paramname] = \
self.view_dict[field.name].currentText() self.view_dict[field.name].currentText()
elif type(self.view_dict[field.name]) == QtGuiWidgets.QLineEdit: elif type(self.view_dict[field.name]) == qt.QLineEdit:
val = self.view_dict[field.name].text() or '' val = self.view_dict[field.name].text() or ''
param_object[paramname] = self.fix_string_value(val) param_object[paramname] = self.fix_string_value(val)
@ -2670,8 +2666,8 @@ class MainFrame(QtGuiWidgets.QWidget):
d = self.ClientObj.process_dict[meth_result[0].message] d = self.ClientObj.process_dict[meth_result[0].message]
d['result'] = meth_result[0] d['result'] = meth_result[0]
d['name'] = self.method_name d['name'] = self.method_name
d['layout'] = QtGuiWidgets.QVBoxLayout() d['layout'] = qt.QVBoxLayout()
d['layout'].setAlignment(QtCore.Qt.AlignTop) d['layout'].setAlignment(qt.Qt.AlignTop)
# set new window title # set new window title
temp = self.ClientObj._parent.windowTitle().split('-') temp = self.ClientObj._parent.windowTitle().split('-')
@ -2700,8 +2696,8 @@ class MainFrame(QtGuiWidgets.QWidget):
return wrapper return wrapper
left_check_step = QtCore.Signal(str, int) left_check_step = qt.Signal(str, int)
left_check_step_after = QtCore.Signal() left_check_step_after = qt.Signal()
def refresh_view(self, step=0, expert=False, from_left_frame=False): def refresh_view(self, step=0, expert=False, from_left_frame=False):
""" """
@ -2808,38 +2804,38 @@ class MainFrame(QtGuiWidgets.QWidget):
self.highlight_element_error(errorfield) self.highlight_element_error(errorfield)
def unhighliht_element_errors(self, field_name): def unhighliht_element_errors(self, field_name):
if type(self.view_dict[field_name]) in [QtGuiWidgets.QGroupBox, SelectList]: if type(self.view_dict[field_name]) in [qt.QGroupBox, SelectList]:
self.view_dict[field_name].setStyleSheet( \ self.view_dict[field_name].setStyleSheet( \
self.view_dict[field_name].styleSheet().replace('red', 'gray')) self.view_dict[field_name].styleSheet().replace('red', 'gray'))
elif type(self.view_dict[field_name]) in [SelectedTableWidget]: elif type(self.view_dict[field_name]) in [SelectedTableWidget]:
# self.view_dict[field_name].setStyleSheet('QTableWidget { ' # self.view_dict[field_name].setStyleSheet('QTableWidget { '
# 'border: 1px solid red;}') # 'border: 1px solid red;}')
self.view_dict[field_name].unsetErrorBorder() self.view_dict[field_name].unsetErrorBorder()
elif type(self.view_dict[field_name]) in [QtGuiWidgets.QComboBox]: elif type(self.view_dict[field_name]) in [qt.QComboBox]:
self.view_dict[field_name].setStyleSheet('QComboBox { ' self.view_dict[field_name].setStyleSheet('QComboBox { '
'border: 0px solid red;}') 'border: 0px solid red;}')
elif type(self.view_dict[field_name]) in [ComboFileWgt, QComboWgt]: elif type(self.view_dict[field_name]) in [ComboFileWgt, QComboWgt]:
self.view_dict[field_name].unsetErrorBorder() self.view_dict[field_name].unsetErrorBorder()
elif type(self.view_dict[field_name]) == QtGuiWidgets.QCheckBox: elif type(self.view_dict[field_name]) == qt.QCheckBox:
self.view_dict[field_name].setStyleSheet('QCheckBox { ' self.view_dict[field_name].setStyleSheet('QCheckBox { '
'border: 0px solid red;}') 'border: 0px solid red;}')
else: else:
self.view_dict[field_name].setStyleSheet("") self.view_dict[field_name].setStyleSheet("")
def highlight_element_error(self, field_name): def highlight_element_error(self, field_name):
if type(self.view_dict[field_name]) in [QtGuiWidgets.QGroupBox, SelectList]: if type(self.view_dict[field_name]) in [qt.QGroupBox, SelectList]:
self.view_dict[field_name].setStyleSheet( \ self.view_dict[field_name].setStyleSheet( \
self.view_dict[field_name].styleSheet().replace('gray', 'red')) self.view_dict[field_name].styleSheet().replace('gray', 'red'))
elif type(self.view_dict[field_name]) in [SelectedTableWidget]: elif type(self.view_dict[field_name]) in [SelectedTableWidget]:
# self.view_dict[field_name].setStyleSheet('QTableWidget { ' # self.view_dict[field_name].setStyleSheet('QTableWidget { '
# 'border: 1px solid red;}') # 'border: 1px solid red;}')
self.view_dict[field_name].setErrorBorder() self.view_dict[field_name].setErrorBorder()
elif type(self.view_dict[field_name]) in [QtGuiWidgets.QComboBox]: elif type(self.view_dict[field_name]) in [qt.QComboBox]:
self.view_dict[field_name].setStyleSheet('QComboBox { ' self.view_dict[field_name].setStyleSheet('QComboBox { '
'border: 1px solid red;}') 'border: 1px solid red;}')
elif type(self.view_dict[field_name]) in [ComboFileWgt, QComboWgt]: elif type(self.view_dict[field_name]) in [ComboFileWgt, QComboWgt]:
self.view_dict[field_name].setErrorBorder() self.view_dict[field_name].setErrorBorder()
elif type(self.view_dict[field_name]) == QtGuiWidgets.QCheckBox: elif type(self.view_dict[field_name]) == qt.QCheckBox:
self.view_dict[field_name].setStyleSheet('QCheckBox { ' self.view_dict[field_name].setStyleSheet('QCheckBox { '
'border: 1px solid red;}') 'border: 1px solid red;}')
else: else:
@ -2923,8 +2919,7 @@ class MainFrame(QtGuiWidgets.QWidget):
if type(self.view_dict[field.name].cellWidget(row, col)) == \ if type(self.view_dict[field.name].cellWidget(row, col)) == \
CentralCheckBox: CentralCheckBox:
self.view_dict[field.name].cellWidget(row, col). \ self.view_dict[field.name].cellWidget(row, col). \
setCheckState(QtCore.Qt.CheckState. \ setCheckState(qt.Qt.PartiallyChecked)
PartiallyChecked)
return wrapper return wrapper
@ -2932,7 +2927,7 @@ class MainFrame(QtGuiWidgets.QWidget):
'''remove value''' '''remove value'''
if self.view_dict[field.name].item(row, i): if self.view_dict[field.name].item(row, i):
self.view_dict[field.name].item(row, i).setText('') self.view_dict[field.name].item(row, i).setText('')
elif type(self.view_dict[field.name].cellWidget(row, i)) == QtGuiWidgets.QComboBox: elif type(self.view_dict[field.name].cellWidget(row, i)) == qt.QComboBox:
try: try:
self.view_dict[field.name].cellWidget(row, i).setEditText('') self.view_dict[field.name].cellWidget(row, i).setEditText('')
except: except:
@ -2958,7 +2953,7 @@ class MainFrame(QtGuiWidgets.QWidget):
except Exception, e: except Exception, e:
# _print ('EXCEPT', e) # _print ('EXCEPT', e)
pass pass
elif type(self.view_dict[field.name].cellWidget(row, i)) == QtGuiWidgets.QComboBox: elif type(self.view_dict[field.name].cellWidget(row, i)) == qt.QComboBox:
for q in (table.body.stringArray): for q in (table.body.stringArray):
try: try:
ind = q.string.index(text) ind = q.string.index(text)

@ -15,16 +15,16 @@
# limitations under the License. # limitations under the License.
from calculate.consolegui.qtwrapper import QtGuiWidgets, QtCore from calculate.consolegui import qt
from more import TopMenu, HelpMenu#, FlowLayout from more import TopMenu, HelpMenu#, FlowLayout
class MainMenu(QtGuiWidgets.QWidget): class MainMenu(qt.QWidget):
def __init__(self, parent): def __init__(self, parent):
QtGuiWidgets.QWidget.__init__(self, parent) qt.QWidget.__init__(self, parent)
# self.hlayout = FlowLayout(self) # self.hlayout = FlowLayout(self)
QtGuiWidgets.QIcon.setThemeName('Calculate') qt.QIcon.setThemeName('Calculate')
self.hlayout = QtGuiWidgets.QHBoxLayout(self) self.hlayout = qt.QHBoxLayout(self)
self.hlayout.setAlignment(QtCore.Qt.AlignLeft) self.hlayout.setAlignment(qt.Qt.AlignLeft)
######### Back on one step ######### Back on one step
self.Back = TopMenu(_('All Settings'), self.Back = TopMenu(_('All Settings'),
@ -126,7 +126,7 @@ class MainMenu(QtGuiWidgets.QWidget):
# self.setFixedHeight(48) # self.setFixedHeight(48)
self.setFixedHeight(self.hlayout.sizeHint().height()) self.setFixedHeight(self.hlayout.sizeHint().height())
self.setAttribute(QtCore.Qt.WA_DeleteOnClose) self.setAttribute(qt.Qt.WA_DeleteOnClose)
def refresh(self): def refresh(self):
######### Back on one step ######### Back on one step

File diff suppressed because it is too large Load Diff

@ -15,7 +15,7 @@
# limitations under the License. # limitations under the License.
from more import get_sid from more import get_sid
from calculate.consolegui.qtwrapper import QtGuiWidgets from calculate.consolegui import qt
from ReturnMessage import ReturnedMessage from ReturnMessage import ReturnedMessage
import urllib2 import urllib2
@ -25,7 +25,7 @@ import urllib2
# self.message = pid # self.message = pid
def show_msg(text, title = None, parent = None): def show_msg(text, title = None, parent = None):
msgBox = QtGuiWidgets.QMessageBox(parent) msgBox = qt.QMessageBox(parent)
if title: if title:
msgBox.setWindowTitle(title) msgBox.setWindowTitle(title)
if not text: if not text:
@ -39,8 +39,8 @@ def show_msg(text, title = None, parent = None):
temp += str(i)+' ' temp += str(i)+' '
text = temp text = temp
msgBox.setText(text) msgBox.setText(text)
msgBox.setStandardButtons(QtGuiWidgets.QMessageBox.Ok) msgBox.setStandardButtons(qt.QMessageBox.Ok)
msgBox.setWindowIcon (QtGuiWidgets.QIcon('calculate-install.svg')) msgBox.setWindowIcon (qt.QIcon('calculate-install.svg'))
msgBox.exec_() msgBox.exec_()
client_types = "gui" client_types = "gui"
@ -96,7 +96,7 @@ def pid_inf(ClientObj, client, sid, pids):
ClientObj.process_dict[pid_str]['status'] = s[0][1] ClientObj.process_dict[pid_str]['status'] = s[0][1]
ClientObj.process_dict[pid_str]['result'] = \ ClientObj.process_dict[pid_str]['result'] = \
ReturnedMessage("pid", None, pid_str) ReturnedMessage("pid", None, pid_str)
# ClientObj.process_dict[pid_str]['layout'] = QtGuiWidgets.QVBoxLayout() # ClientObj.process_dict[pid_str]['layout'] = qt.QVBoxLayout()
def client_pid_info(ClientObj, client, pid): def client_pid_info(ClientObj, client, pid):
""" get information about selected process (or about all) """ """ get information about selected process (or about all) """

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from calculate.consolegui.qtwrapper import QtGuiWidgets, QtCore from calculate.consolegui import qt
import urllib2 import urllib2
from calculate.lib.utils.tools import Locker from calculate.lib.utils.tools import Locker
@ -73,10 +73,10 @@ def client_post_cert (client, lang):
except: except:
pass pass
class ViewSessionInfo (QtGuiWidgets.QWidget): class ViewSessionInfo (qt.QWidget):
def __init__(self, parent, client, window): def __init__(self, parent, client, window):
QtGuiWidgets.QWidget.__init__(self) qt.QWidget.__init__(self)
self.layout = QtGuiWidgets.QGridLayout() self.layout = qt.QGridLayout()
sid = get_sid(client) sid = get_sid(client)
try: try:
@ -119,13 +119,13 @@ class ViewSessionInfo (QtGuiWidgets.QWidget):
self), 8,0,1,2) self), 8,0,1,2)
# Add clear cache Button # Add clear cache Button
self.clear_cache_button = QtGuiWidgets.QPushButton \ self.clear_cache_button = qt.QPushButton \
(_("Clear the session cache"), self) (_("Clear the session cache"), self)
self.clear_cache_button.clicked.connect(self.clear_cache(client, sid)) self.clear_cache_button.clicked.connect(self.clear_cache(client, sid))
self.layout.addWidget(self.clear_cache_button, 9,0) self.layout.addWidget(self.clear_cache_button, 9,0)
Quit_button = QtGuiWidgets.QPushButton(_("Close"), self) Quit_button = qt.QPushButton(_("Close"), self)
Quit_button.setShortcut(QtGuiWidgets.QKeySequence(QtCore.Qt.Key_Escape)) Quit_button.setShortcut(qt.QKeySequence(qt.Qt.Key_Escape))
self.layout.addWidget(Quit_button, 9, 1) self.layout.addWidget(Quit_button, 9, 1)
Quit_button.clicked.connect(self.close) Quit_button.clicked.connect(self.close)
@ -133,7 +133,7 @@ class ViewSessionInfo (QtGuiWidgets.QWidget):
self.setFixedSize(260,200) self.setFixedSize(260,200)
self.setLayout(self.layout) self.setLayout(self.layout)
self.setWindowIcon(QtGuiWidgets.QIcon.fromTheme("document-edit-verify")) self.setWindowIcon(qt.QIcon.fromTheme("document-edit-verify"))
self.setWindowTitle(_('Session information')) self.setWindowTitle(_('Session information'))
self.move(window.geometry().x() + window.geometry().width() / 2 \ self.move(window.geometry().x() + window.geometry().width() / 2 \

@ -14,33 +14,33 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from calculate.consolegui.qtwrapper import QtGuiWidgets, QtCore from calculate.consolegui import qt
class StatusLabel(QtGuiWidgets.QLabel): class StatusLabel(qt.QLabel):
def __init__(self, name, parent): def __init__(self, name, parent):
QtGuiWidgets.QLabel.__init__(self, name, parent) qt.QLabel.__init__(self, name, parent)
self.setWordWrap(True) self.setWordWrap(True)
self.setAttribute(QtCore.Qt.WA_DeleteOnClose) self.setAttribute(qt.Qt.WA_DeleteOnClose)
class StatusFieldWgt(QtGuiWidgets.QWidget): class StatusFieldWgt(qt.QWidget):
def __init__(self, parent, layout): def __init__(self, parent, layout):
super(StatusFieldWgt, self).__init__(parent) super(StatusFieldWgt, self).__init__(parent)
self.setLayout(layout) self.setLayout(layout)
self.setAttribute(QtCore.Qt.WA_DeleteOnClose) self.setAttribute(qt.Qt.WA_DeleteOnClose)
class StatusField (QtGuiWidgets.QScrollArea): class StatusField (qt.QScrollArea):
# bottom in main frame # bottom in main frame
def __init__(self, parent, ClientObj): def __init__(self, parent, ClientObj):
QtGuiWidgets.QScrollArea.__init__(self, parent) qt.QScrollArea.__init__(self, parent)
self.layout = QtGuiWidgets.QVBoxLayout() self.layout = qt.QVBoxLayout()
self.status_widget = StatusFieldWgt(self, self.layout) self.status_widget = StatusFieldWgt(self, self.layout)
self.setWidget(self.status_widget) self.setWidget(self.status_widget)
# for clear memory after closed this window # for clear memory after closed this window
self.setAttribute(QtCore.Qt.WA_DeleteOnClose) self.setAttribute(qt.Qt.WA_DeleteOnClose)
def addMessage(self, text): def addMessage(self, text):
self.layout.addWidget(StatusLabel(_(text), self)) self.layout.addWidget(StatusLabel(_(text), self))

@ -16,17 +16,17 @@
import os import os
from calculate.consolegui.qtwrapper import QtGuiWidgets, QtCore from calculate.consolegui import qt
from more import LabelWordWrap, FileOpenWgt, show_msg, show_question, \ from more import LabelWordWrap, FileOpenWgt, show_msg, show_question, \
client_list_methods client_list_methods
class ToolsWidget (QtGuiWidgets.QWidget): class ToolsWidget (qt.QWidget):
def __init__(self, parent, ClientObj, window): def __init__(self, parent, ClientObj, window):
QtGuiWidgets.QWidget.__init__(self) qt.QWidget.__init__(self)
self.vlayout = QtGuiWidgets.QVBoxLayout(self) self.vlayout = qt.QVBoxLayout(self)
self.vlayout.setAlignment(QtCore.Qt.AlignTop) self.vlayout.setAlignment(qt.Qt.AlignTop)
self.vlayout.setAlignment(QtCore.Qt.AlignRight) self.vlayout.setAlignment(qt.Qt.AlignRight)
# self.move(100+parent.frameGeometry().x(), \ # self.move(100+parent.frameGeometry().x(), \
# 100+parent.frameGeometry().y()) # 100+parent.frameGeometry().y())
@ -34,10 +34,10 @@ class ToolsWidget (QtGuiWidgets.QWidget):
self.setFixedSize(450, 220) self.setFixedSize(450, 220)
self.setWindowTitle(_('Preferences')) self.setWindowTitle(_('Preferences'))
self.setWindowIcon(QtGuiWidgets.QIcon.fromTheme("preferences-other")) self.setWindowIcon(qt.QIcon.fromTheme("preferences-other"))
# for clear memory after closed this window # for clear memory after closed this window
self.setAttribute(QtCore.Qt.WA_ShowModal) self.setWindowModality(qt.Qt.WindowModal)
self.setAttribute(QtCore.Qt.WA_DeleteOnClose) self.setAttribute(qt.Qt.WA_DeleteOnClose)
self.create(parent, ClientObj) self.create(parent, ClientObj)
@ -45,8 +45,8 @@ class ToolsWidget (QtGuiWidgets.QWidget):
- self.size().width() / 2, \ - self.size().width() / 2, \
window.geometry().y() + window.geometry().height() / 2 \ window.geometry().y() + window.geometry().height() / 2 \
- self.size().height() / 2) - self.size().height() / 2)
gui_signal = QtCore.Signal() gui_signal = qt.Signal()
other_signal = QtCore.Signal() other_signal = qt.Signal()
def create(self, parent, ClientObj): def create(self, parent, ClientObj):
if self.layout(): if self.layout():
@ -57,8 +57,8 @@ class ToolsWidget (QtGuiWidgets.QWidget):
del (child) del (child)
# Add clear config button # Add clear config button
clear_icon = QtGuiWidgets.QIcon.fromTheme("edit-delete-page") clear_icon = qt.QIcon.fromTheme("edit-delete-page")
clear_button = QtGuiWidgets.QPushButton (clear_icon, clear_button = qt.QPushButton (clear_icon,
_('Clear the configuration file'),self) _('Clear the configuration file'),self)
clear_button.clicked.connect(self.clear_config(parent, ClientObj)) clear_button.clicked.connect(self.clear_config(parent, ClientObj))
@ -69,27 +69,27 @@ class ToolsWidget (QtGuiWidgets.QWidget):
self.vlayout.addWidget(tab) self.vlayout.addWidget(tab)
# add ok, apply and cancel button # add ok, apply and cancel button
botton_wgt = QtGuiWidgets.QWidget(self) botton_wgt = qt.QWidget(self)
self.botton_layout = QtGuiWidgets.QHBoxLayout(botton_wgt) self.botton_layout = qt.QHBoxLayout(botton_wgt)
self.botton_layout.setContentsMargins(0,0,0,0) self.botton_layout.setContentsMargins(0,0,0,0)
self.botton_layout.setAlignment(QtCore.Qt.AlignRight) self.botton_layout.setAlignment(qt.Qt.AlignRight)
toolOk = QtGuiWidgets.QPushButton(_('Ok'), self) toolOk = qt.QPushButton(_('Ok'), self)
toolOk.setFixedWidth(50) toolOk.setFixedWidth(50)
toolOk.setShortcut(QtGuiWidgets.QKeySequence(QtCore.Qt.Key_Return)) toolOk.setShortcut(qt.QKeySequence(qt.Qt.Key_Return))
toolOk.clicked.connect(self.save_changes(ClientObj, tab)) toolOk.clicked.connect(self.save_changes(ClientObj, tab))
toolOk.clicked.connect(self.close) toolOk.clicked.connect(self.close)
self.botton_layout.addWidget(toolOk) self.botton_layout.addWidget(toolOk)
toolApply = QtGuiWidgets.QPushButton(_('Apply'), self) toolApply = qt.QPushButton(_('Apply'), self)
toolApply.setFixedWidth(100) toolApply.setFixedWidth(100)
toolApply.clicked.connect(self.save_changes(ClientObj, tab)) toolApply.clicked.connect(self.save_changes(ClientObj, tab))
self.botton_layout.addWidget(toolApply) self.botton_layout.addWidget(toolApply)
toolQuit = QtGuiWidgets.QPushButton(_('Cancel'), self) toolQuit = qt.QPushButton(_('Cancel'), self)
toolQuit.setFixedWidth(100) toolQuit.setFixedWidth(100)
toolQuit.clicked.connect(self.close) toolQuit.clicked.connect(self.close)
toolQuit.setShortcut(QtGuiWidgets.QKeySequence(QtCore.Qt.Key_Escape)) toolQuit.setShortcut(qt.QKeySequence(qt.Qt.Key_Escape))
self.botton_layout.addWidget(toolQuit) self.botton_layout.addWidget(toolQuit)
self.gui_signal.connect(tab.GuiWidget.save_changes(ClientObj)) self.gui_signal.connect(tab.GuiWidget.save_changes(ClientObj))
@ -123,20 +123,20 @@ class ToolsWidget (QtGuiWidgets.QWidget):
self.create(parent, ClientObj) self.create(parent, ClientObj)
return wrapper return wrapper
class ToolTabWidget(QtGuiWidgets.QTabWidget): class ToolTabWidget(qt.QTabWidget):
def __init__(self, parent, ClientObj): def __init__(self, parent, ClientObj):
QtGuiWidgets.QTabWidget.__init__(self, parent) qt.QTabWidget.__init__(self, parent)
self.ClientObj = ClientObj self.ClientObj = ClientObj
self.GuiWidget = ToolGui(self, ClientObj) self.GuiWidget = ToolGui(self, ClientObj)
self.OtherWidget = ToolOther(self, ClientObj) self.OtherWidget = ToolOther(self, ClientObj)
self.gui_icon = QtGuiWidgets.QIcon.fromTheme("video-display") self.gui_icon = qt.QIcon.fromTheme("video-display")
self.other_icon = QtGuiWidgets.QIcon.fromTheme("preferences-other") self.other_icon = qt.QIcon.fromTheme("preferences-other")
if self.other_icon.isNull(): if self.other_icon.isNull():
self.other_icon = QtGuiWidgets.QIcon.fromTheme("preferences-desctop") self.other_icon = qt.QIcon.fromTheme("preferences-desctop")
self.addTab(self.GuiWidget, self.gui_icon ,_('GUI')) self.addTab(self.GuiWidget, self.gui_icon ,_('GUI'))
self.addTab(self.OtherWidget, self.other_icon, _('Other')) self.addTab(self.OtherWidget, self.other_icon, _('Other'))
@ -146,10 +146,10 @@ class ToolTabWidget(QtGuiWidgets.QTabWidget):
self.changed_flag = False self.changed_flag = False
self.currentChanged.connect(self.save_mess) self.currentChanged.connect(self.save_mess)
self.setAttribute(QtCore.Qt.WA_DeleteOnClose) self.setAttribute(qt.Qt.WA_DeleteOnClose)
gui_signal = QtCore.Signal() gui_signal = qt.Signal()
other_signal = QtCore.Signal() other_signal = qt.Signal()
def save_mess(self, tab_num): def save_mess(self, tab_num):
# change tab with unsaved changes # change tab with unsaved changes
@ -163,7 +163,7 @@ class ToolTabWidget(QtGuiWidgets.QTabWidget):
reply = show_question(self.parent(), text, informative_text, reply = show_question(self.parent(), text, informative_text,
title = _('Saving changes')) title = _('Saving changes'))
if reply == QtGuiWidgets.QMessageBox.Yes: if reply == qt.QMessageBox.Yes:
if self.cur_tab_num == 0: if self.cur_tab_num == 0:
self.gui_signal.connect \ self.gui_signal.connect \
(self.GuiWidget.save_changes(self.ClientObj)) (self.GuiWidget.save_changes(self.ClientObj))
@ -189,25 +189,25 @@ class ToolTabWidget(QtGuiWidgets.QTabWidget):
self.changed_flag = False self.changed_flag = False
# Gui tools in ToolTabWidget # Gui tools in ToolTabWidget
class ToolGui(QtGuiWidgets.QWidget): class ToolGui(qt.QWidget):
def __init__(self, parent, ClientObj): def __init__(self, parent, ClientObj):
QtGuiWidgets.QWidget.__init__(self, parent) qt.QWidget.__init__(self, parent)
self.user_config = ClientObj.user_config self.user_config = ClientObj.user_config
self._parent = parent self._parent = parent
self.grid = QtGuiWidgets.QGridLayout(self) self.grid = qt.QGridLayout(self)
self.grid.setContentsMargins(2,2,2,2) self.grid.setContentsMargins(2,2,2,2)
self.grid.setSpacing(2) self.grid.setSpacing(2)
self.grid.setColumnStretch(0,3) self.grid.setColumnStretch(0,3)
self.grid.setColumnStretch(1,5) self.grid.setColumnStretch(1,5)
# self.grid.setAlignment(QtCore.Qt.AlignLeft) # self.grid.setAlignment(qt.Qt.AlignLeft)
# add height image in grid # add height image in grid
self.h_image_lbl = LabelWordWrap(_('Image height'), self) self.h_image_lbl = LabelWordWrap(_('Image height'), self)
self.h_image_lbl.setMaximumWidth(self.h_image_lbl.sizeHint().width()) self.h_image_lbl.setMaximumWidth(self.h_image_lbl.sizeHint().width())
self.h_image_lineedit = QtGuiWidgets.QLineEdit(self) self.h_image_lineedit = qt.QLineEdit(self)
self.h_image_lineedit.setToolTip(_('Set a fixed height image for ' self.h_image_lineedit.setToolTip(_('Set a fixed height image for '
'actions')+' '+_('0: hide images')) 'actions')+' '+_('0: hide images'))
@ -221,7 +221,7 @@ class ToolGui(QtGuiWidgets.QWidget):
self.count_row_lbl.setMaximumWidth \ self.count_row_lbl.setMaximumWidth \
(self.count_row_lbl.sizeHint().width()) (self.count_row_lbl.sizeHint().width())
self.count_row_lineedit = QtGuiWidgets.QLineEdit(self) self.count_row_lineedit = qt.QLineEdit(self)
self.count_row_lineedit.setText(str(ClientObj.count_row_res_table)) self.count_row_lineedit.setText(str(ClientObj.count_row_res_table))
@ -229,8 +229,8 @@ class ToolGui(QtGuiWidgets.QWidget):
self.grid.addWidget(self.count_row_lineedit, 2, 1) self.grid.addWidget(self.count_row_lineedit, 2, 1)
# add spacer # add spacer
self.grid.addItem(QtGuiWidgets.QSpacerItem(0,0, QtGuiWidgets.QSizePolicy.Expanding, \ self.grid.addItem(qt.QSpacerItem(0,0, qt.QSizePolicy.Expanding, \
QtGuiWidgets.QSizePolicy.Expanding ), 3, 0, 1, 2) qt.QSizePolicy.Expanding ), 3, 0, 1, 2)
# connect all with change value slot # connect all with change value slot
self.h_image_lineedit.textChanged.connect(self.changed_val) self.h_image_lineedit.textChanged.connect(self.changed_val)
@ -332,13 +332,13 @@ class ToolGui(QtGuiWidgets.QWidget):
return wrapper return wrapper
# Other tools in ToolTabWidget # Other tools in ToolTabWidget
class ToolOther(QtGuiWidgets.QWidget): class ToolOther(qt.QWidget):
def __init__(self, parent, ClientObj): def __init__(self, parent, ClientObj):
QtGuiWidgets.QWidget.__init__(self, parent) qt.QWidget.__init__(self, parent)
self.user_config = ClientObj.user_config self.user_config = ClientObj.user_config
self._parent = parent self._parent = parent
self.grid = QtGuiWidgets.QGridLayout(self) self.grid = qt.QGridLayout(self)
self.grid.setContentsMargins(2,2,2,2) self.grid.setContentsMargins(2,2,2,2)
self.grid.setSpacing(2) self.grid.setSpacing(2)
@ -349,7 +349,7 @@ class ToolOther(QtGuiWidgets.QWidget):
self.lang_lbl = LabelWordWrap(_('Select Language'), self) self.lang_lbl = LabelWordWrap(_('Select Language'), self)
self.lang_lbl.setMaximumWidth(self.lang_lbl.sizeHint().width()) self.lang_lbl.setMaximumWidth(self.lang_lbl.sizeHint().width())
self.lang_ComboBox = QtGuiWidgets.QComboBox(self) self.lang_ComboBox = qt.QComboBox(self)
lang_dict = {'en': _('English'),'ru': _('Russian'),'fr':_('French'), lang_dict = {'en': _('English'),'ru': _('Russian'),'fr':_('French'),
'uk':_('Ukrainian')} 'uk':_('Ukrainian')}
@ -382,7 +382,7 @@ class ToolOther(QtGuiWidgets.QWidget):
# self.timeout_lbl = LabelWordWrap(_('Timeout'), self) # self.timeout_lbl = LabelWordWrap(_('Timeout'), self)
# self.timeout_lbl.setMaximumWidth(self.timeout_lbl.sizeHint().width()) # self.timeout_lbl.setMaximumWidth(self.timeout_lbl.sizeHint().width())
# #
# self.timeout_lineedit = QtGuiWidgets.QLineEdit(self) # self.timeout_lineedit = qt.QLineEdit(self)
# #
# self.timeout_lineedit.setText(str(ClientObj.timeout)) # self.timeout_lineedit.setText(str(ClientObj.timeout))
# #
@ -390,15 +390,15 @@ class ToolOther(QtGuiWidgets.QWidget):
# self.grid.addWidget(self.timeout_lineedit, 2, 1) # self.grid.addWidget(self.timeout_lineedit, 2, 1)
# add spacer # add spacer
self.grid.addItem(QtGuiWidgets.QSpacerItem(0,0, QtGuiWidgets.QSizePolicy.Expanding, \ self.grid.addItem(qt.QSpacerItem(0,0, qt.QSizePolicy.Expanding, \
QtGuiWidgets.QSizePolicy.Expanding ), 5, 0, 1, 2) qt.QSizePolicy.Expanding ), 5, 0, 1, 2)
# connect all with change value slot # connect all with change value slot
self.lang_ComboBox.currentIndexChanged.connect(self.changed_val) self.lang_ComboBox.currentIndexChanged.connect(self.changed_val)
self.fd_cert.textChanged.connect(self.changed_val) self.fd_cert.textChanged.connect(self.changed_val)
# self.timeout_lineedit.editTextChanged.connect(self.changed_val) # self.timeout_lineedit.editTextChanged.connect(self.changed_val)
self.setAttribute(QtCore.Qt.WA_DeleteOnClose) self.setAttribute(qt.Qt.WA_DeleteOnClose)
def changed_val(self): def changed_val(self):
self._parent.changed_flag = True self._parent.changed_flag = True

@ -0,0 +1,86 @@
#-*- coding: utf-8 -*-
# Copyright 2018 Mir Calculate. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#from PySide import QtGui as QtGui, QtCore as QtCore
from PyQt5 import QtGui, QtCore, QtWidgets
QAbstractItemView = QtWidgets.QAbstractItemView
QAction = QtWidgets.QAction
QApplication = QtWidgets.QApplication
QBrush = QtGui.QBrush
QButtonGroup = QtWidgets.QButtonGroup
QCheckBox = QtWidgets.QCheckBox
QColor = QtGui.QColor
QComboBox = QtWidgets.QComboBox
QCompleter = QtWidgets.QCompleter
QCursor = QtGui.QCursor
QDesktopServices = QtGui.QDesktopServices
QDialog = QtWidgets.QDialog
QFileDialog = QtWidgets.QFileDialog
QFontMetrics = QtGui.QFontMetrics
QFont = QtGui.QFont
QFrame = QtWidgets.QFrame
QGridLayout = QtWidgets.QGridLayout
QGroupBox = QtWidgets.QGroupBox
QHBoxLayout = QtWidgets.QHBoxLayout
QHeaderView = QtWidgets.QHeaderView
QIcon = QtGui.QIcon
QImageReader = QtGui.QImageReader
QIntValidator = QtGui.QIntValidator
QKeySequence = QtGui.QKeySequence
QLabel = QtWidgets.QLabel
QLayout = QtWidgets.QLayout
QLineEdit = QtWidgets.QLineEdit
QListWidget = QtWidgets.QListWidget
QMainWindow = QtWidgets.QMainWindow
QMenu = QtWidgets.QMenu
QMessageBox = QtWidgets.QMessageBox
QPainter = QtGui.QPainter
QPalette = QtGui.QPalette
QPixmap = QtGui.QPixmap
QProgressBar = QtWidgets.QProgressBar
QPushButton = QtWidgets.QPushButton
QRadioButton = QtWidgets.QRadioButton
QRegExpValidator = QtGui.QRegExpValidator
QScrollArea = QtWidgets.QScrollArea
QSizePolicy = QtWidgets.QSizePolicy
QSpacerItem = QtWidgets.QSpacerItem
QStyledItemDelegate = QtWidgets.QStyledItemDelegate
QStyleOptionViewItemV4 = QtWidgets.QStyleOptionViewItem
QStyle = QtWidgets.QStyle
QSystemTrayIcon = QtWidgets.QSystemTrayIcon
QTabBar = QtWidgets.QTabBar
QTableView = QtWidgets.QTableView
QTableWidgetItem = QtWidgets.QTableWidgetItem
QTableWidget = QtWidgets.QTableWidget
QTabWidget = QtWidgets.QTabWidget
QTextEdit = QtWidgets.QTextEdit
QToolButton = QtWidgets.QToolButton
QTransform = QtGui.QTransform
QVBoxLayout = QtWidgets.QVBoxLayout
QWidget = QtWidgets.QWidget
QObject = QtCore.QObject
QPoint = QtCore.QPoint
QRect = QtCore.QRect
QRegExp = QtCore.QRegExp
QSize = QtCore.QSize
Qt = QtCore.Qt
QThread = QtCore.QThread
QTimer = QtCore.QTimer
QUrl = QtCore.QUrl
Signal = QtCore.pyqtSignal

@ -1,88 +0,0 @@
#-*- coding: utf-8 -*-
# Copyright 2018 Mir Calculate. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from PySide import QtGui as QtGuiOrig, QtCore as QtCoreOrig
class QtGuiWidgets(object):
QAbstractItemView = QtGuiOrig.QAbstractItemView
QAction = QtGuiOrig.QAction
QApplication = QtGuiOrig.QApplication
QBrush = QtGuiOrig.QBrush
QButtonGroup = QtGuiOrig.QButtonGroup
QCheckBox = QtGuiOrig.QCheckBox
QColor = QtGuiOrig.QColor
QComboBox = QtGuiOrig.QComboBox
QCompleter = QtGuiOrig.QCompleter
QCursor = QtGuiOrig.QCursor
QDesktopServices = QtGuiOrig.QDesktopServices
QDialog = QtGuiOrig.QDialog
QFileDialog = QtGuiOrig.QFileDialog
QFontMetrics = QtGuiOrig.QFontMetrics
QFont = QtGuiOrig.QFont
QFrame = QtGuiOrig.QFrame
QGridLayout = QtGuiOrig.QGridLayout
QGroupBox = QtGuiOrig.QGroupBox
QHBoxLayout = QtGuiOrig.QHBoxLayout
QHeaderView = QtGuiOrig.QHeaderView
QIcon = QtGuiOrig.QIcon
QImageReader = QtGuiOrig.QImageReader
QIntValidator = QtGuiOrig.QIntValidator
QKeySequence = QtGuiOrig.QKeySequence
QKeySequence = QtGuiOrig.QKeySequence
QLabel = QtGuiOrig.QLabel
QLayout = QtGuiOrig.QLayout
QLineEdit = QtGuiOrig.QLineEdit
QListWidget = QtGuiOrig.QListWidget
QMainWindow = QtGuiOrig.QMainWindow
QMenu = QtGuiOrig.QMenu
QMessageBox = QtGuiOrig.QMessageBox
QPainter = QtGuiOrig.QPainter
QPalette = QtGuiOrig.QPalette
QPixmap = QtGuiOrig.QPixmap
QProgressBar = QtGuiOrig.QProgressBar
QPushButton = QtGuiOrig.QPushButton
QRadioButton = QtGuiOrig.QRadioButton
QRegExpValidator = QtGuiOrig.QRegExpValidator
QScrollArea = QtGuiOrig.QScrollArea
QSizePolicy = QtGuiOrig.QSizePolicy
QSpacerItem = QtGuiOrig.QSpacerItem
QStyledItemDelegate = QtGuiOrig.QStyledItemDelegate
QStyleOptionViewItemV4 = QtGuiOrig.QStyleOptionViewItemV4
QStyle = QtGuiOrig.QStyle
QSystemTrayIcon = QtGuiOrig.QSystemTrayIcon
QTabBar = QtGuiOrig.QTabBar
QTableView = QtGuiOrig.QTableView
QTableWidgetItem = QtGuiOrig.QTableWidgetItem
QTableWidget = QtGuiOrig.QTableWidget
QTabWidget = QtGuiOrig.QTabWidget
QTextEdit = QtGuiOrig.QTextEdit
QToolButton = QtGuiOrig.QToolButton
QTransform = QtGuiOrig.QTransform
QVBoxLayout = QtGuiOrig.QVBoxLayout
QWidget = QtGuiOrig.QWidget
class QtCore(object):
QObject = QtCoreOrig.QObject
QPoint = QtCoreOrig.QPoint
QRect = QtCoreOrig.QRect
QRegExp = QtCoreOrig.QRegExp
QSize = QtCoreOrig.QSize
Qt = QtCoreOrig.Qt
QThread = QtCoreOrig.QThread
QTimer = QtCoreOrig.QTimer
QUrl = QtCoreOrig.QUrl
Signal = QtCoreOrig.Signal
Loading…
Cancel
Save