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

Исправлена загрузка иконок

Browse Source
master-3.5 3.5.8.3
Хирецкий Михаил 6 years ago
parent ab8509dc53
commit 09121d443f
16 changed files with 190 additions and 295 deletions
Show Stats Download Patch File Download Diff File

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

@ -32,7 +32,7 @@ from session_function import ViewSessionInfo
from CertificateClass import CertClass
from pid_information import client_list_pid
from more import icon_visible, client_del_sid, show_msg
from more import icon_visible, client_del_sid, show_msg, get_icon
DEBUG_LEVEL = 0
@ -438,7 +438,7 @@ class MainWgt(qt.QMainWindow):
msgBox.button(msgBox.Cancel).setText(_('Cancel'))
msgBox.setDefaultButton(qt.QMessageBox.Cancel)
msgBox.setWindowIcon(qt.QIcon.fromTheme("application-exit"))
msgBox.setWindowIcon(get_icon("application-exit"))
reply = msgBox.exec_()
return reply

4
pym/consolegui/application/CertificateClass.py
Unescape View File

@ -18,7 +18,7 @@ from calculate.consolegui import qt
import urllib2
import OpenSSL, hashlib
from more import show_msg, LabelWordWrap, show_question, get_ip_mac
from more import show_msg, LabelWordWrap, show_question, get_ip_mac, get_icon
from create_cert import RequestCreate
from client_class import HTTPSClientCertTransport, Client_suds
import os
@ -88,7 +88,7 @@ class CertClass (qt.QWidget):
- self.size().height() / 2 - 50)
self.setWindowTitle (_('Certificates'))
self.setWindowIcon (qt.QIcon.fromTheme("view-certificate"))
self.setWindowIcon (get_icon("view-certificate"))
def send(self):
### client_post_request analog

31
pym/consolegui/application/ConnectionTabs.py
Unescape View File

@ -25,7 +25,7 @@ import ConfigParser
from TrayIcon import TrayIcon
from more import get_sid, get_view_params, _print
from more import get_sid, get_view_params, _print, get_icon
from MainClass import ApiClient
from calculate.consolegui.datavars import DataVarsGui
from pid_information import client_pid_info
@ -55,10 +55,8 @@ class SelectedMethodWgt(qt.QWidget):
layout.setSpacing(0)
layout.addWidget(self.MethodWidget)
qt.QIcon.setThemeName('Calculate')
icon = qt.QIcon.fromTheme('cl-console-gui-%s'%self.method.replace("_","-"))
if icon.isNull():
icon = qt.QIcon.fromTheme('calculate-%s'%self.method.replace("_","-"))
icon = get_icon('cl-console-gui-%s'%self.method.replace("_","-"),
'calculate-%s'%self.method.replace("_","-"))
self.setWindowIcon(icon)
qt.QApplication.setWindowIcon(icon)
@ -208,12 +206,12 @@ class SelectedMethodWgt(qt.QWidget):
# translate
msgBox.button(msgBox.Yes).setText(_('Yes'))
msgBox.button(msgBox.No).setText(_('No'))
if qt.QIcon.hasThemeIcon('dialog-close'):
msgBox.button(msgBox.No).setIcon \
(qt.QIcon.fromTheme('dialog-close'))
icon = get_icon('dialog-close')
if not icon.isNull():
msgBox.button(msgBox.No).setIcon(icon)
msgBox.setDefaultButton(qt.QMessageBox.No)
msgBox.setWindowIcon(qt.QIcon.fromTheme("application-exit"))
msgBox.setWindowIcon(get_icon("application-exit"))
reply = msgBox.exec_()
return reply
@ -293,12 +291,9 @@ class ToolTabWidget(qt.QTabWidget):
self.tabbar = MyTabBar(self)
self.setTabBar(self.tabbar)
qt.QIcon.setThemeName('Calculate')
self.gui_icon = qt.QIcon.fromTheme("video-display")
self.gui_icon = get_icon("video-display")
self.other_icon = qt.QIcon.fromTheme("list-add")
if self.other_icon.isNull():
self.other_icon = qt.QIcon.fromTheme("preferences-desctop")
self.other_icon = get_icon("list-add", "preferences-desktop")
self.addTab(self.FirstWidget, self.gui_icon , self.new_con_txt)
self.addTab(self.PlusWidget, self.other_icon, '')
@ -380,14 +375,14 @@ class ToolTabWidget(qt.QTabWidget):
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'))
self.setWindowIcon(get_icon(
'/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'))
self.setWindowIcon(get_icon(
'/usr/share/pixmaps/calculate-console-online.svg'))
def connect_count_changed(self, host, port, count):
if count:

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

@ -17,7 +17,8 @@
from calculate.consolegui import qt
from more import ButtonMenu, FlowLayout, get_sid, ClientServiceThread, \
get_view_params, show_msg, client_list_methods, get_system_rgb
get_view_params, show_msg, client_list_methods, get_system_rgb, \
get_icon
class DisplayMethod(qt.QWidget):
def __init__(self, parent, ClientObj):
@ -356,7 +357,7 @@ class ConnectLostLabel (qt.QWidget):
if reconnect:
self.reconnect_button = qt.QPushButton(_('Reconnect'), self)
self.reconnect_button.setIcon(qt.QIcon.fromTheme('view-refresh'))
self.reconnect_button.setIcon(get_icon('view-refresh'))
self.reconnect_button.setStyleSheet('''
QPushButton {
border: 2px solid #8f8f91;

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

@ -295,16 +295,6 @@ class LeftMenu(qt.QScrollArea):
for num_step in range(len(steps)):
self.button_list.append(StepLabel(steps[num_step], self))
# if len(icons) > num_step:
# themeName = qt.QIcon.themeName()
# icon = qt.QIcon()
# icon.setThemeName(themeName)
# icon = icon.fromTheme(icons[num_step])
# if icon.isNull():
# icon.setThemeName('Tango')
# icon = icon.fromTheme(icons[num_step])
# if not icon.isNull():
# self.button_list[num_step].setIcon(icon)
# collect parameters object
self.button_list[num_step].clicked.connect(self.collect_object \
(method_name, num_step))

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

@ -33,7 +33,7 @@ from calculate.lib.utils.tools import imap_regexp
from more import WorkPalette, ParameterWindow, get_system_rgb
from more import get_sid, ClientServiceThread, show_msg, TaskWidget, ErrorWgt,\
ResultLayout, get_view_params
ResultLayout, get_view_params, get_icon
from more import LabelWordWrap as Label
from SelectTable import SelectedTableWidget
@ -47,9 +47,10 @@ class LabelWordWrap(Label):
class PlusButton(qt.QPushButton):
def __init__(self, parent, ClientObj, method, disable_method=None):
qt.QPushButton.__init__(self, parent)
try:
self.setIcon(qt.QIcon.fromTheme('list-add'))
except:
icon = get_icon('list-add')
if not icon.isNull():
self.setIcon(icon)
else:
self.setText('+')
self._parent = parent
self.ClientObj = ClientObj
@ -297,7 +298,7 @@ class MainFrameRes(qt.QWidget):
begin_offset = qt.QPushButton(offset_buttons)
begin_offset.setIcon(qt.QIcon.fromTheme('go-first'))
begin_offset.setIcon(get_icon('go-first'))
begin_offset.setToolTip('First page')
begin_offset.clicked.connect(self.disable_buttons)
begin_offset.clicked.connect(self.call_method_with_offset(0, True))
@ -307,7 +308,7 @@ class MainFrameRes(qt.QWidget):
layout.addWidget(begin_offset)
minus_offset = qt.QPushButton(offset_buttons)
minus_offset.setIcon(qt.QIcon.fromTheme('go-previous'))
minus_offset.setIcon(get_icon('go-previous'))
minus_offset.setToolTip('Previous page')
minus_offset.clicked.connect(self.disable_buttons)
minus_offset.clicked.connect(self.call_method_with_offset(
@ -322,7 +323,7 @@ class MainFrameRes(qt.QWidget):
plus_offset = qt.QPushButton(offset_buttons)
plus_offset.setIcon(qt.QIcon.fromTheme('go-next'))
plus_offset.setIcon(get_icon('go-next'))
plus_offset.setToolTip('Next page')
plus_offset.clicked.connect(self.disable_buttons)
plus_offset.clicked.connect(self.call_method_with_offset(
@ -332,7 +333,7 @@ class MainFrameRes(qt.QWidget):
self.buttons.append(plus_offset)
last_offset = qt.QPushButton(offset_buttons)
last_offset.setIcon(qt.QIcon.fromTheme('go-last'))
last_offset.setIcon(get_icon('go-last'))
last_offset.setToolTip('Last page')
last_offset.clicked.connect(self.disable_buttons)
last_offset.clicked.connect(self.call_method_with_offset(

26
pym/consolegui/application/TrayIcon.py
Unescape View File

@ -27,7 +27,7 @@ import dbus
from ReturnMessage import ReturnedMessage
from calculate.consolegui.application.pid_information import client_pid_info, \
client_list_pid
from more import show_msg, get_sid, _print
from more import show_msg, get_sid, _print, get_icon
# class MySignal(qt.QObject):
# sig = qt.Signal(str, str)
@ -155,7 +155,7 @@ class TrayIcon(qt.QSystemTrayIcon):
self._parent = parent
self.actions = []
self.setIcon(qt.QIcon(
self.setIcon(get_icon(
'/usr/share/pixmaps/calculate-console-offline.svg'))
self.is_online_icon = False
@ -175,18 +175,6 @@ class TrayIcon(qt.QSystemTrayIcon):
self.update_thread.mes_sig.connect(self.showMessage)
self.update_thread.started_sig.connect(self.showUpdate)
def select_icon(self, icons):
old_theme_name = qt.QIcon.themeName()
try:
for theme_name in (old_theme_name, self.default_theme_name):
qt.QIcon.setThemeName(theme_name)
for image in icons:
if qt.QIcon.hasThemeIcon(image):
return qt.QIcon.fromTheme(image)
return qt.QIcon()
finally:
qt.QIcon.setThemeName(old_theme_name)
def generation_actions(self):
_("About")
_("Report a Bug")
@ -222,9 +210,9 @@ class TrayIcon(qt.QSystemTrayIcon):
}
for action_name, action_data in self.actions.items():
setattr(self, '%s_action' % action_name,
qt.QAction(self.select_icon(action_data['icons']),
_(action_data['label']), self,
triggered=action_data['trigger']))
qt.QAction(get_icon(*action_data['icons']),
_(action_data['label']), self,
triggered=action_data['trigger']))
def create_menu(self, *actions):
menu = qt.QMenu()
@ -249,7 +237,7 @@ class TrayIcon(qt.QSystemTrayIcon):
def set_icon(self, online, has_update=None):
if online:
if not self.is_online_icon:
self.setIcon(qt.QIcon(
self.setIcon(get_icon(
'/usr/share/pixmaps/calculate-console-online.svg'))
# для решения странного размера иконки в mate
self.hide()
@ -257,7 +245,7 @@ class TrayIcon(qt.QSystemTrayIcon):
self.is_online_icon = True
else:
if self.is_online_icon:
self.setIcon(qt.QIcon(
self.setIcon(get_icon(
'/usr/share/pixmaps/calculate-console-offline.svg'))
# для решения странного размера иконки в mate
self.hide()

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

@ -25,7 +25,7 @@ from session_function import client_post_cert
from calculate.core.client.cert_verify import VerifyError
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, get_icon
class LocalhostPasswd(qt.QDialog):
def __init__(self, parent):
@ -123,7 +123,7 @@ class FrameConnection(qt.QWidget):
grid.addWidget(self.text_passwd, 2, 1)
self.cmd_connect = qt.QPushButton(_('Connect'), self)
self.cmd_connect.setIcon(qt.QIcon.fromTheme("network-connect"))
self.cmd_connect.setIcon(get_icon("network-connect"))
self.cmd_connect.setDefault(True)
self.cmd_connect.setAutoDefault(True)
# self.cmd_connect.setMaximumWidth(120)
@ -157,7 +157,7 @@ class FrameConnection(qt.QWidget):
window.geometry().y() + window.geometry().height() / 2 \
- self.sizeHint().height() / 2)
self.setWindowTitle(_('Connection'))
self.setWindowIcon(qt.QIcon.fromTheme("network-connect"))
self.setWindowIcon(get_icon("network-connect"))
def set_disabled(self):

4
pym/consolegui/application/create_cert.py
Unescape View File

@ -17,7 +17,7 @@
import socket
from calculate.consolegui import qt
from more import LabelWordWrap, show_msg
from more import LabelWordWrap, show_msg, get_icon
def passphrase_callback(v):
if type(v) == int or not v:
@ -128,7 +128,7 @@ class RequestCreate (qt.QWidget):
self.setAttribute(qt.Qt.WA_DeleteOnClose)
self.setWindowTitle (_('Create a signature request'))
self.setWindowIcon (qt.QIcon.fromTheme("view-certificate"))
self.setWindowIcon(get_icon("view-certificate"))
self.setFocus()
self.move(50+parent.frameGeometry().x(), \

24
pym/consolegui/application/helpwidget.py
Unescape View File

@ -15,7 +15,7 @@
# limitations under the License.
from calculate.consolegui import qt
from more import LabelWordWrap, show_msg
from more import LabelWordWrap, show_msg, get_icon
import datetime
from calculate.lib.datavars import DataVars
@ -91,10 +91,9 @@ class HelpWgt(qt.QWidget):
self.setFixedSize(self.sizeHint().width() + 50, \
self.sizeHint().height())
self.setWindowTitle (_('Calculate Console '))
help_icon = qt.QIcon \
('/usr/share/pixmaps/calculate-console-online.svg')
if help_icon.isNull():
help_icon = qt.QIcon.fromTheme("help-about")
help_icon = get_icon(
'/usr/share/pixmaps/calculate-console-online.svg',
"help-about")
self.setWindowIcon (help_icon)
self.move(parent.window().geometry().x() + \
@ -173,19 +172,8 @@ class BugWgt(qt.QWidget):
# Set title and icon
self.setWindowTitle (_('Calculate Console '))
bug_icons = ['tools-report-bug','system-help','help-browser']
themeName = qt.QIcon.themeName()
bug_icon = qt.QIcon()
for image in bug_icons:
bug_icon.setThemeName(themeName)
bug_icon = bug_icon.fromTheme(image)
if not bug_icon.isNull():
break
bug_icon.setThemeName('Tango')
bug_icon = bug_icon.fromTheme(image)
if not bug_icon.isNull():
break
self.setWindowIcon(bug_icon)
self.setWindowIcon(get_icon(*bug_icons))
self.setWindowTitle(_("Report a Bug"))
self.move(parent.window().geometry().x() +

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

@ -23,7 +23,7 @@ from more import show_msg, LabelWordWrap, MultipleChoice, SelectTable, \
ComboFileWgt, PasswordWidget, get_sid, ClientServiceThread, \
ExpertWidget, ButtonsWidget, show_question, PlusRow, \
ReadonlyCheckBox, get_view_params, ImageLabel, SelectList, \
QComboWgt, _print, get_system_rgb, ParameterWindow
QComboWgt, _print, get_system_rgb, ParameterWindow, get_icon
from sudsds import WebFault
from calculate.lib.utils.text import _u8
from calculate.lib.utils.tools import Sizes
@ -1702,19 +1702,20 @@ class MainFrame(qt.QWidget):
unit_layout.setSpacing(3)
plus_but = qt.QPushButton(self)
try:
plus_but.setIcon(qt.QIcon.fromTheme('list-add'))
except:
icon = get_icon('list-add')
if not icon.isNull():
plus_but.setIcon(icon)
else:
plus_but.setText('+')
plus_but.setToolTip(_('Add a row'))
plus_but.setFixedSize(30, 30)
self.view_dict[field.name].minus_but = qt.QPushButton(self)
try:
self.view_dict[field.name].minus_but.setIcon \
(qt.QIcon.fromTheme('list-remove'))
except:
icon = get_icon('list-remove')
if not icon.isNull():
self.view_dict[field.name].minus_but.setIcon(icon)
else:
self.view_dict[field.name].minus_but.setText('-')
self.view_dict[field.name].minus_but.setToolTip \
(_('Delete the selected rows'))
@ -1722,18 +1723,20 @@ class MainFrame(qt.QWidget):
self.view_dict[field.name].minus_but.setDisabled(True)
refresh_but = qt.QPushButton(self)
try:
refresh_but.setIcon(qt.QIcon.fromTheme('edit-undo'))
except:
icon = get_icon('edit-undo')
if not icon.isNull():
refresh_but.setIcon(icon)
else:
refresh_but.setText('R')
refresh_but.setToolTip(_('Recover the table'))
refresh_but.setFixedSize(30, 30)
clear_but = qt.QPushButton(self)
try:
clear_but.setIcon(qt.QIcon.fromTheme('edit-clear'))
except:
icon = get_icon('edit-clear')
if not icon.isNull():
clear_but.setIcon(icon)
else:
clear_but.setText('C')
clear_but.setToolTip(_('Clear the table'))

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

@ -22,7 +22,6 @@ class MainMenu(qt.QWidget):
def __init__(self, parent):
qt.QWidget.__init__(self, parent)
# self.hlayout = FlowLayout(self)
qt.QIcon.setThemeName('Calculate')
self.hlayout = qt.QHBoxLayout(self)
self.hlayout.setAlignment(qt.Qt.AlignLeft)

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

@ -37,6 +37,44 @@ def get_system_rgb(obj, pallete_type):
def alphed(rgbstr, value):
return rgbstr.replace(")", ",%d)"%value)
def get_icon(*images):
fimage = images[0]
if fimage.startswith("/") or fimage.endswith(".svg") or fimage.endswith(".png"):
icon = qt.QIcon(fimage)
images = images[1:]
if not icon.isNull():
return icon
else:
icon = qt.QIcon()
themeName = qt.QIcon.themeName()
for image in images:
for theme in (themeName, "Calculate", "Tango", "Adwaita"):
icon.setThemeName(theme)
icon = icon.fromTheme(image)
if not icon.isNull():
return icon
return qt.QIcon()
def get_pixmap(*images, **kw):
pixmap = None
fallback_icon = kw.get('fallback_icon', None)
_size = kw.get('size', 32)
qsize = kw.get('size', qt.QSize(_size,_size))
for image in images:
icon = get_icon(image)
if not icon.isNull():
return icon.pixmap(_size)
elif os.path.isfile(image):
ir = qt.QImageReader(image)
ir.setScaledSize(qsize)
img = ir.read()
return qt.QPixmap().fromImage(img)
else:
if fallback_icon:
return get_icon('applications-system').pixmap(_size)
return None
_('The user must not be root')
class TopMenu(qt.QPushButton):
def __init__(self, label, images, parent = None):
@ -53,17 +91,7 @@ class TopMenu(qt.QPushButton):
self.image_lbl = qt.QLabel(self)
themeName = qt.QIcon.themeName()
icon = qt.QIcon()
for image in images:
icon.setThemeName(themeName)
icon = icon.fromTheme(image)
if not icon.isNull():
break
icon.setThemeName('Tango')
icon = icon.fromTheme(image)
if not icon.isNull():
break
icon = get_icon(*images)
# icon.actualSize(qt.QSize(48,48))
pm1 = icon.pixmap(24)
@ -141,55 +169,23 @@ class HelpMenu(TopMenu):
TopMenu.mousePressEvent(self, event)
menu = qt.QMenu(self)
About_icon = (qt.QIcon \
('/usr/share/pixmaps/calculate-console-online.svg'))
themeName = qt.QIcon.themeName()
if About_icon.isNull():
about_icons = ['help-about','help-browser']
About_icon = qt.QIcon()
for image in about_icons:
About_icon.setThemeName(themeName)
About_icon = About_icon.fromTheme(image)
if not About_icon.isNull():
break
About_icon.setThemeName('Tango')
About_icon = About_icon.fromTheme(image)
if not About_icon.isNull():
break
About_icon = get_icon(
'/usr/share/pixmaps/calculate-console-online.svg',
'help-about', 'help-browser')
about = qt.QAction(About_icon, _("About"), self,
triggered=self.actions.help)
menu.addAction(about)
menu.addSeparator()
handbook_icons = ['help-contents','system-help','help-browser']
handbook_icon = qt.QIcon()
for image in handbook_icons:
handbook_icon.setThemeName(themeName)
handbook_icon = handbook_icon.fromTheme(image)
if not handbook_icon.isNull():
break
handbook_icon.setThemeName('Tango')
handbook_icon = handbook_icon.fromTheme(image)
if not handbook_icon.isNull():
break
handbook_icon = get_icon('help-contents','system-help','help-browser')
handbook = qt.QAction(handbook_icon,_("Info"),\
self, triggered=self.actions.hand_book)
menu.addAction(handbook)
menu.addSeparator()
bug_icons = ['tools-report-bug','system-help','help-browser']
bug_icon = qt.QIcon()
for image in bug_icons:
bug_icon.setThemeName(themeName)
bug_icon = bug_icon.fromTheme(image)
if not bug_icon.isNull():
break
bug_icon.setThemeName('Tango')
bug_icon = bug_icon.fromTheme(image)
if not bug_icon.isNull():
break
bug_icon = get_icon('tools-report-bug','system-help','help-browser')
bug = qt.QAction(bug_icon, _("Report a Bug"), \
self, triggered=self.actions.bug_report)
@ -210,28 +206,9 @@ class ButtonMenu(qt.QPushButton):
if not images:
images = ''
images = images.split(',')
icon_flag = True
qt.QIcon.setThemeName('Calculate')
pm2 = None
for image in images:
icon = qt.QIcon.fromTheme(image)
if not icon.isNull():
pm2 = icon.pixmap(128)
icon_flag = False
break
elif os.path.isfile(image):
ir = qt.QImageReader(image)
ir.setScaledSize(qt.QSize(32, 32))
img = ir.read()
pm2 = qt.QPixmap().fromImage(img)
icon_flag = False
break
if icon_flag:
icon = qt.QIcon.fromTheme('applications-system')
pm2 = icon.pixmap(32)
pm2 = get_pixmap(*images.split(','),
fallback_icon='applications-system',
size=32)
if pm2:
pm2 = pm2.scaled(qt.QSize(32,32), qt.Qt.IgnoreAspectRatio,
@ -306,13 +283,12 @@ class ErrorLabel (qt.QWidget):
self.image_lbl = qt.QLabel(self)
icon = qt.QIcon.fromTheme('dialog-warning')
pm1 = icon.pixmap(16)
pm2 = pm1.scaled(qt.QSize(16, 16), qt.Qt.KeepAspectRatio, \
qt.Qt.SmoothTransformation)
self.image_lbl.setPixmap(pm2)
pm1 = get_pixmap("dialog-warning", size=16)
if pm1:
pm2 = pm1.scaled(qt.QSize(16, 16),
qt.Qt.KeepAspectRatio,
qt.Qt.SmoothTransformation)
self.image_lbl.setPixmap(pm2)
self.image_lbl.setAlignment(qt.Qt.AlignCenter)
# add transparency
@ -354,20 +330,9 @@ class ErrorLabel (qt.QWidget):
self.text_lbl.setText(txt)
if not hasattr(self, 'menu'):
themeName = qt.QIcon.themeName()
self.menu = qt.QMenu(self)
bug_icons = ['tools-report-bug','system-help','help-browser']
bug_icon = qt.QIcon()
for image in bug_icons:
bug_icon.setThemeName(themeName)
bug_icon = bug_icon.fromTheme(image)
if not bug_icon.isNull():
break
bug_icon.setThemeName('Tango')
bug_icon = bug_icon.fromTheme(image)
if not bug_icon.isNull():
break
bug_icon = get_icon('tools-report-bug','system-help','help-browser')
bug = qt.QAction(bug_icon, _("Report a Bug"), self, \
triggered=self.bug_report)
self.menu.addAction(bug)
@ -408,20 +373,9 @@ class ErrorWgt(qt.QWidget):
def add_menu(self):
if not hasattr(self, 'menu'):
themeName = qt.QIcon.themeName()
self.menu = qt.QMenu(self)
bug_icons = ['tools-report-bug','system-help','help-browser']
bug_icon = qt.QIcon()
for image in bug_icons:
bug_icon.setThemeName(themeName)
bug_icon = bug_icon.fromTheme(image)
if not bug_icon.isNull():
break
bug_icon.setThemeName('Tango')
bug_icon = bug_icon.fromTheme(image)
if not bug_icon.isNull():
break
bug_icon = get_icon('tools-report-bug','system-help','help-browser')
bug = qt.QAction(bug_icon, _("Report a Bug"), self, \
triggered=self.bug_report)
# bug.setDisabled(True)
@ -490,9 +444,10 @@ class ClearLineEdit(qt.QLineEdit):
self.button.setCursor(qt.Qt.ArrowCursor)
self.button.hide()
self.button.setFocusPolicy(qt.Qt.NoFocus)
try:
self.button.setIcon(qt.QIcon.fromTheme("edit-clear"))
except:
icon = get_icon("edit-clear")
if not icon.isNull():
self.button.setIcon(icon)
else:
self.button.setText('clear')
self.button.setStyleSheet("border: none;")
self.textChanged.connect(self.changed)
@ -535,9 +490,10 @@ class FileOpenWgt(qt.QWidget):
self.button=qt.QToolButton(self)
self.button.setCursor(qt.Qt.ArrowCursor)
self.button.setFocusPolicy(qt.Qt.NoFocus)
try:
self.button.setIcon(qt.QIcon.fromTheme("document-open"))
except:
icon = get_icon("document-open")
if not icon.isNull():
self.button.setIcon(icon)
else:
self.button.setText(_('Open'))
self.button.setStyleSheet("border: none;")
self.button.clicked.connect(self.file_dialog)
@ -648,9 +604,11 @@ class ComboFileWgt(qt.QWidget):
self.button = qt.QToolButton(self)
self.button.setCursor(qt.Qt.ArrowCursor)
self.button.setFocusPolicy(qt.Qt.NoFocus)
try:
self.button.setIcon(qt.QIcon.fromTheme("document-open"))
except:
icon = get_icon("document-open")
if not icon.isNull():
self.button.setIcon(icon)
else:
self.button.setText(_('Open'))
# self.button.setStyleSheet("QToolButton {border: none;}")
self.button.clicked.connect(self.file_dialog)
@ -883,9 +841,10 @@ class MultipleChoiceDialog (qt.QWidget):
# add "add new items" PushButton
self.add_Button = qt.QPushButton(self)
self.add_Button.setFixedWidth(32)
try:
self.add_Button.setIcon(qt.QIcon.fromTheme("list-add"))
except:
icon = get_icon("list-add")
if not icon.isNull():
self.add_Button.setIcon(icon)
else:
self.add_Button.setText('Add Item')
self.add_Button.setShortcut \
(qt.QKeySequence(qt.Qt.Key_Return))
@ -914,39 +873,30 @@ class MultipleChoiceDialog (qt.QWidget):
# add '++' button
self.plus_all_Button = qt.QPushButton(self)
plus_all_icons = ['go-last-view', 'go-last']
for icon in plus_all_icons:
icon_next = qt.QIcon.fromTheme(icon)
if not icon_next.isNull():
self.plus_all_Button.setIcon(icon_next)
break
if icon_next.isNull():
icon_next = get_icon('go-last-view', 'go-last')
if not icon_next.isNull():
self.plus_all_Button.setIcon(icon_next)
else:
self.plus_all_Button.setText('->\n->')
self.plus_all_Button.clicked.connect(self.plus_all_items)
p_m_layout.addWidget(self.plus_all_Button)
# add '+' button
self.plus_Button = qt.QPushButton(self)
plus_icons = ['go-next-view','go-next']
for icon in plus_icons:
icon_next = qt.QIcon.fromTheme(icon)
if not icon_next.isNull():
self.plus_Button.setIcon(icon_next)
break
if icon_next.isNull():
icon_plus = get_icon('go-next-view', 'go-next')
if not icon_plus.isNull():
self.plus_Button.setIcon(icon_plus)
else:
self.plus_Button.setText('->')
self.plus_Button.clicked.connect(self.plus_item)
p_m_layout.addWidget(self.plus_Button)
# add '-' button
self.minus_Button = qt.QPushButton(self)
minus_icons = ['go-previous-view','go-previous']
for icon in minus_icons:
icon_prev = qt.QIcon.fromTheme(icon)
if not icon_prev.isNull():
self.minus_Button.setIcon(icon_prev)
break
if icon_prev.isNull():
icon_minus = get_icon('go-previous-view', 'go-previous')
if not icon_minus.isNull():
self.minus_Button.setIcon(icon_minus)
else:
self.minus_Button.setText('<-')
self.minus_Button.clicked.connect(self.minus_item)
p_m_layout.addWidget(self.minus_Button)
@ -955,13 +905,10 @@ class MultipleChoiceDialog (qt.QWidget):
# add '--' button
self.minus_all_Button = qt.QPushButton(self)
minus_all_icons = ['go-first-view', 'go-first']
for icon in minus_all_icons:
icon_next = qt.QIcon.fromTheme(icon)
if not icon_next.isNull():
self.minus_all_Button.setIcon(icon_next)
break
if icon_next.isNull():
icon_all_minus = get_icon('go-first-view', 'go-first')
if not icon_all_minus.isNull():
self.minus_all_Button.setIcon(icon_all_minus)
else:
self.minus_all_Button.setText('<-\n<-')
self.minus_all_Button.clicked.connect(self.minus_all_items)
p_m_layout.addWidget(self.minus_all_Button)
@ -1117,9 +1064,10 @@ class MultipleChoice (qt.QWidget):
self.button=qt.QToolButton(self)
# self.button.hide()
self.button.setFocusPolicy(qt.Qt.NoFocus)
try:
self.button.setIcon(qt.QIcon.fromTheme("list-add"))
except:
icon = get_icon("list-add")
if not icon.isNull():
self.button.setIcon(icon)
else:
self.button.setText('+')
self.button.setStyleSheet("border: none;")
self.button.setFixedWidth(24)
@ -1129,9 +1077,10 @@ class MultipleChoice (qt.QWidget):
if expert:
self.clear_button = qt.QPushButton(self)
self.clear_button.setFocusPolicy(qt.Qt.NoFocus)
try:
self.clear_button.setIcon(qt.QIcon.fromTheme('edit-clear'))
except:
icon = get_icon('edit-clear')
if not icon.isNull():
self.clear_button.setIcon(icon)
else:
self.clear_button.setText('C')
self.clear_button.setToolTip(_('Clear the table'))
self.clear_button.setStyleSheet("border: none;")
@ -1231,9 +1180,10 @@ class SelectTable(qt.QWidget):
if add_ability:
plus_but = qt.QPushButton(self)
try:
plus_but.setIcon(qt.QIcon.fromTheme('list-add'))
except:
icon = get_icon('list-add')
if not icon.isNull():
plus_but.setIcon(icon)
else:
plus_but.setText('+')
plus_but.setToolTip(_('Add a row'))
@ -1242,9 +1192,10 @@ class SelectTable(qt.QWidget):
unit_layout.addWidget(plus_but)
self.recover_but = qt.QPushButton(self)
try:
self.recover_but.setIcon(qt.QIcon.fromTheme('edit-clear'))
except:
icon = get_icon('edit-clear')
if not icon.isNull():
self.recover_but.setIcon(icon)
else:
self.recover_but.setText('R')
self.recover_but.setToolTip(_('Recover the table'))
@ -1437,9 +1388,10 @@ class SelectList(qt.QGroupBox):
self.plus_but = qt.QPushButton(self)
self.plus_but.setFocusPolicy(qt.Qt.NoFocus)
self.plus_but.setFixedSize(30, 30)
try:
self.plus_but.setIcon(qt.QIcon.fromTheme('list-add'))
except:
icon = get_icon('list-add')
if not icon.isNull():
self.plus_but.setIcon(icon)
else:
self.plus_but.setText('+')
self.plus_but.setToolTip(_('Add a row'))
self.plus_but.clicked.connect(self.line_add)
@ -1449,9 +1401,10 @@ class SelectList(qt.QGroupBox):
self.recover_but = qt.QPushButton(self)
self.recover_but.setFocusPolicy(qt.Qt.NoFocus)
self.recover_but.setFixedSize(30, 30)
try:
self.recover_but.setIcon(qt.QIcon.fromTheme('edit-undo'))
except:
icon = get_icon('edit-undo')
if not icon.isNull():
self.recover_but.setIcon(icon)
else:
self.recover_but.setText('R')
self.recover_but.setToolTip(_('Reset'))
@ -1630,17 +1583,7 @@ class ExpertWidget (qt.QPushButton):
layout.setAlignment(qt.Qt.AlignLeft | qt.Qt.AlignVCenter)
def set_close(self):
themeName = qt.QIcon.themeName()
self.icon = qt.QIcon()
for image in self.images:
self.icon.setThemeName(themeName)
self.icon = self.icon.fromTheme(image)
if not self.icon.isNull():
break
self.icon.setThemeName('Tango')
self.icon = self.icon.fromTheme(image)
if not self.icon.isNull():
break
self.icon = get_icon(*self.images)
pm = self.icon.pixmap(16)
pm = pm.scaled(qt.QSize(16, 16), qt.Qt.KeepAspectRatio, \
@ -1653,17 +1596,7 @@ class ExpertWidget (qt.QPushButton):
self.image_lbl.setAttribute(qt.Qt.WA_NoSystemBackground)
def set_open(self):
themeName = qt.QIcon.themeName()
self.icon = qt.QIcon()
for image in self.images:
self.icon.setThemeName(themeName)
self.icon = self.icon.fromTheme(image)
if not self.icon.isNull():
break
self.icon.setThemeName('Tango')
self.icon = self.icon.fromTheme(image)
if not self.icon.isNull():
break
self.icon = get_icon(*self.images)
pm = self.icon.pixmap(16)
@ -2414,7 +2347,7 @@ def show_msg(text, title = None, parent = None):
text = temp
msgBox.setText(text)
msgBox.setStandardButtons(qt.QMessageBox.Ok)
msgBox.setWindowIcon (qt.QIcon('calculate-install.svg'))
msgBox.setWindowIcon(get_icon('calculate-install.svg'))
msgBox.exec_()
def show_question(parent, text, informative_text = None, cursor_pos = False,

4
pym/consolegui/application/pid_information.py
Unescape View File

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from more import get_sid
from more import get_sid, get_icon
from calculate.consolegui import qt
from ReturnMessage import ReturnedMessage
@ -40,7 +40,7 @@ def show_msg(text, title = None, parent = None):
text = temp
msgBox.setText(text)
msgBox.setStandardButtons(qt.QMessageBox.Ok)
msgBox.setWindowIcon (qt.QIcon('calculate-install.svg'))
msgBox.setWindowIcon(get_icon('calculate-install.svg'))
msgBox.exec_()
client_types = "gui"

4
pym/consolegui/application/session_function.py
Unescape View File

@ -18,7 +18,7 @@ from calculate.consolegui import qt
import urllib2
from calculate.lib.utils.tools import Locker
from more import show_msg, LabelWordWrap, get_ip_mac, get_sid
from more import show_msg, LabelWordWrap, get_ip_mac, get_sid, get_icon
def client_sid(sid, client, cert_id, lang):
""" get number session from server and write this in file """
@ -133,7 +133,7 @@ class ViewSessionInfo (qt.QWidget):
self.setFixedSize(260,200)
self.setLayout(self.layout)
self.setWindowIcon(qt.QIcon.fromTheme("document-edit-verify"))
self.setWindowIcon(get_icon("document-edit-verify"))
self.setWindowTitle(_('Session information'))
self.move(window.geometry().x() + window.geometry().width() / 2 \

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

@ -19,7 +19,7 @@ import os
from calculate.consolegui import qt
from more import LabelWordWrap, FileOpenWgt, show_msg, show_question, \
client_list_methods
client_list_methods, get_icon
class ToolsWidget (qt.QWidget):
def __init__(self, parent, ClientObj, window):
@ -34,7 +34,7 @@ class ToolsWidget (qt.QWidget):
self.setFixedSize(450, 220)
self.setWindowTitle(_('Preferences'))
self.setWindowIcon(qt.QIcon.fromTheme("preferences-other"))
self.setWindowIcon(get_icon("preferences-other"))
# for clear memory after closed this window
self.setWindowModality(qt.Qt.WindowModal)
self.setAttribute(qt.Qt.WA_DeleteOnClose)
@ -57,9 +57,8 @@ class ToolsWidget (qt.QWidget):
del (child)
# Add clear config button
clear_icon = qt.QIcon.fromTheme("edit-delete-page")
clear_button = qt.QPushButton (clear_icon,
_('Clear the configuration file'),self)
clear_button = qt.QPushButton(get_icon("edit-delete-page"),
_('Clear the configuration file'),self)
clear_button.clicked.connect(self.clear_config(parent, ClientObj))
self.vlayout.addWidget(clear_button)
@ -132,11 +131,9 @@ class ToolTabWidget(qt.QTabWidget):
self.OtherWidget = ToolOther(self, ClientObj)
self.gui_icon = qt.QIcon.fromTheme("video-display")
self.gui_icon = get_icon("video-display")
self.other_icon = qt.QIcon.fromTheme("preferences-other")
if self.other_icon.isNull():
self.other_icon = qt.QIcon.fromTheme("preferences-desctop")
self.other_icon = get_icon("preferences-other", "preferences-desktop")
self.addTab(self.GuiWidget, self.gui_icon ,_('GUI'))
self.addTab(self.OtherWidget, self.other_icon, _('Other'))

Write Preview
Loading…
Cancel
Save