Skip to content

Commit

Permalink
move files
Browse files Browse the repository at this point in the history
  • Loading branch information
Licini committed Jun 28, 2024
1 parent b0b2552 commit 4114aa4
Show file tree
Hide file tree
Showing 17 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,8 @@ where = ["src"]

[tool.setuptools.package-data]
compas_viewer = ['config.json']
"compas_viewer.icons" = ["*.svg", "*.png"]
"compas_viewer.assets" = ["*.svg", "*.png", "*.ttf"]
"compas_viewer.renderer.shaders" = ["*.vert", "*.frag"]
"compas_viewer.configurations.default_config" = ["*.json", "*.ttf"]

# ============================================================================
# replace pytest.ini
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
2 changes: 1 addition & 1 deletion src/compas_viewer/components/button.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@


def set_icon_path(icon_name: str) -> str:
path = QtGui.QIcon(str(pathlib.Path(__file__).parent.parent / "icons" / icon_name))
path = QtGui.QIcon(str(pathlib.Path(__file__).parent.parent / "assets" / "icons" / icon_name))
return path


Expand Down
2 changes: 1 addition & 1 deletion src/compas_viewer/scene/tagobject.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

from .sceneobject import ViewerSceneObject

FONT = path.join(HERE, "configurations", "default_config", "FreeSans.ttf")
FONT = path.join(HERE, "assets", "fonts", "FreeSans.ttf")


class Tag(Geometry):
Expand Down
2 changes: 1 addition & 1 deletion src/compas_viewer/viewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def __init__(self, config: Optional[Config] = None, **kwargs):
self.app = QApplication(sys.argv)
self.app.setApplicationName("COMPAS Viewer")
self.app.setApplicationDisplayName("COMPAS Viewer")
self.app.setWindowIcon(QIcon(os.path.join(HERE, "icons", "compas_icon_white.png")))
self.app.setWindowIcon(QIcon(os.path.join(HERE, "assets", "icons", "compas_icon_white.png")))

self._scene = None

Expand Down

0 comments on commit 4114aa4

Please sign in to comment.