rms/gns3-gui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-gui.git synced 2026-05-17 00:46:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.5

Browse Source
This commit is contained in:
Julien Duponchelle
2016-02-16 18:12:51 +01:00
parent 8613a89264 b1477f5fb5
commit 19ef5b7e1d
5 changed files with 149574 additions and 148875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gns3/topology.py
View File

@@ -27,7 +27,7 @@ import glob
import shutil
import sys
from .qt import QtGui, QtWidgets, qpartial
from .qt import QtGui, QtWidgets, QtSvg, qpartial
from .qt.qimage_svg_renderer import QImageSvgRenderer
from .items.node_item import NodeItem

298444
gns3/ui/resources_rc.py
View File

File diff suppressed because it is too large Load Diff

BIN
resources/images/vmware_fusion_banner.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 31 KiB

BIN
resources/images/vmware_workstation_banner.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 32 KiB

3
scripts/build_pyqt.py
View File

@@ -13,6 +13,7 @@ import argparse
parser = argparse.ArgumentParser()
parser.add_argument("--force", help="force rebuild all files", action="store_true")
parser.add_argument("--ressources", help="force rebuild ressources", action="store_true")
args = parser.parse_args()
if sys.platform.startswith('win'):
@@ -51,7 +52,7 @@ def build_resources(path, target):
source = os.path.join(path, file)
if source.endswith(".qrc"):
target = os.path.join(target, file.replace(".qrc", "_rc.py"))
if not os.access(target, os.F_OK) or (os.stat(source)[stat.ST_MTIME] > os.stat(target)[stat.ST_MTIME]) or args.force:
if not os.access(target, os.F_OK) or (os.stat(source)[stat.ST_MTIME] > os.stat(target)[stat.ST_MTIME]) or args.force or args.ressources:
command = [PYRCC, "-compress", "9", "-o", target, source]
print("Building resources {}".format(source))
if args.force and os.access(target, os.F_OK):