Skip to content

Commit

Permalink
Merge pull request #53 from mottosso/master
Browse files Browse the repository at this point in the history
0.2.4 - Property Page
  • Loading branch information
mottosso committed Mar 1, 2015
2 parents 9e41bfb + 5eacdb2 commit 6eedede
Show file tree
Hide file tree
Showing 42 changed files with 1,580 additions and 527 deletions.
17 changes: 17 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
Changelog
=========

Version 0.2.4
-------------

- Implementing basic Properties page
- Implementing independent Endpoint server for testing
- Added Pyblish.TextArea
- Added Pyblish.ActionBar
- Added Pyblish.Action
- Added Pyblish.IconButton
- Improved feedback when clicking
- Improved feedback when hovering
- Made package executable
- Fixed issue 155
- Fixed issue 156
- Fixed issue 158
- Refactoring

Version 0.2.3
-------------

Expand Down
32 changes: 32 additions & 0 deletions generate_resources.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import os
import re

exclude = "\.py$"


def parse():
template = """<!DOCTYPE RCC><RCC version="1.0">
<qresource>
%s
</qresource>
</RCC>"""

base = r"pyblish_qml\qml"
qrc_files = []
for root, dirs, files in os.walk(base):
for f in files:
if re.findall(exclude, f):
continue

qrc_files.append(os.path.join(root[len(base) + 1:], f))

return template % "\n".join(("\t\t<file>%s</file>" % f for f in qrc_files))


def write(qrc):
with open("resources.qrc", "w") as f:
f.write(qrc)


if __name__ == '__main__':
write(parse())
4 changes: 4 additions & 0 deletions pyblish_qml/__main__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import sys
import app

sys.exit(app.main())
Loading

0 comments on commit 6eedede

Please sign in to comment.