Skip to content

Commit

Permalink
Merge pull request #1037 from nstelter-slac/add_logo
Browse files Browse the repository at this point in the history
Add logo
  • Loading branch information
jbellister-slac authored Oct 10, 2023
2 parents 43da39e + db0ea66 commit 4354f30
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 18 deletions.
42 changes: 24 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,30 @@
[![Build Status](https://github.com/slaclab/pydm/actions/workflows/run-tests.yml/badge.svg?branch=master)](https://github.com/slaclab/pydm/actions/workflows/run-tests.yml)

![PyDM: Python Display Manager](pydm_banner_full.png)

<p>
<img src="pydm_launcher/icons/pydm_128.png" width="128" height="128" align="right"/>
<h1>PyDM: Python Display Manager</h1>
</p>

<p align="left">
PyDM is a PyQt-based framework for building user interfaces for control systems.
The goal is to provide a no-code, drag-and-drop system to make simple screens,
as well as a straightforward Python framework to build complex applications.
<br>
<br>
</p>
<p align="center">
<h1 align="center">PyDM: Python Display Manager</h1>

<p align="center">
PyDM is a PyQt-based framework for building user interfaces for control systems.
The goal is to provide a no-code, drag-and-drop system to make simple screens,
as well as a straightforward Python framework to build complex applications.
<br>
<br>
<strong>« Explore PyDM <a href="https://slaclab.github.io/pydm/">docs</a> and <a href="https://slaclab.github.io/pydm/tutorials/index.html">tutorials</a> »</strong>
<br>
<a href="https://github.com/slaclab/pydm/issues/new?template=bug-report.md">Report bug</a>
·
<a href="https://github.com/slaclab/pydm/issues/new?template=feature-request.md&labels=request">Request feature</a>
·
<a href="https://github.com/slaclab/pydm/blob/master/.github/CONTRIBUTING.md">How to Contribute</a>
·
<a href="https://github.com/slaclab/pydm/blob/master/.github/SUPPORT.md">Support</a>
</p>
<strong>« Explore PyDM <a href="https://slaclab.github.io/pydm/">docs</a> and <a href="https://slaclab.github.io/pydm/tutorials/index.html">tutorials</a> »</strong>
<br>
<br>
<a href="https://github.com/slaclab/pydm/issues/new?template=bug-report.md">Report bug</a>
·
<a href="https://github.com/slaclab/pydm/issues/new?template=feature-request.md&labels=request">Request feature</a>
·
<a href="https://github.com/slaclab/pydm/blob/master/.github/CONTRIBUTING.md">How to Contribute</a>
·
<a href="https://github.com/slaclab/pydm/blob/master/.github/SUPPORT.md">Support</a>
</p>

<br>
Expand Down
Binary file added pydm_banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pydm_banner_full.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pydm_launcher/icons/pydm_128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pydm_launcher/icons/pydm_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pydm_launcher/icons/pydm_24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pydm_launcher/icons/pydm_256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pydm_launcher/icons/pydm_32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pydm_launcher/icons/pydm_64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions pydm_launcher/main.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import argparse
import cProfile
import logging
import os
import pstats
import sys
import faulthandler
from qtpy import QtCore, QtGui


def main():
Expand Down Expand Up @@ -123,6 +125,20 @@ def main():
home_file=pydm_args.homefile,
)

base_path = os.path.dirname(os.path.realpath(__file__))
icon_path_mask = os.path.join(base_path, "icons", "pydm_{}.png")

app_icon = QtGui.QIcon()
app_icon.addFile(icon_path_mask.format(16), QtCore.QSize(16, 16))
app_icon.addFile(icon_path_mask.format(24), QtCore.QSize(24, 24))
app_icon.addFile(icon_path_mask.format(32), QtCore.QSize(32, 32))
app_icon.addFile(icon_path_mask.format(64), QtCore.QSize(64, 64))
app_icon.addFile(icon_path_mask.format(128), QtCore.QSize(128, 128))
app_icon.addFile(icon_path_mask.format(256), QtCore.QSize(256, 256))

app.setWindowIcon(app_icon)
app.setApplicationName("PyDM")

pydm.utilities.shortcuts.install_connection_inspector(parent=app.main_window)

exit_code = app.exec_()
Expand Down

0 comments on commit 4354f30

Please sign in to comment.