diff --git a/.gitignore b/.gitignore index 67409e4..f74e5d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ assets/scss/*.css classes/__pycache__ build +Cascade.egg-info diff --git a/classes/__init__.py b/cascade/__init__.py similarity index 100% rename from classes/__init__.py rename to cascade/__init__.py diff --git a/assets/images/Screenshot_stackcontents.png b/cascade/assets/images/Screenshot_stackcontents.png similarity index 100% rename from assets/images/Screenshot_stackcontents.png rename to cascade/assets/images/Screenshot_stackcontents.png diff --git a/assets/images/Screenshot_stackdesign.png b/cascade/assets/images/Screenshot_stackdesign.png similarity index 100% rename from assets/images/Screenshot_stackdesign.png rename to cascade/assets/images/Screenshot_stackdesign.png diff --git a/assets/images/icon.png b/cascade/assets/images/icon.png similarity index 100% rename from assets/images/icon.png rename to cascade/assets/images/icon.png diff --git a/assets/images/mockups.png b/cascade/assets/images/mockups.png similarity index 100% rename from assets/images/mockups.png rename to cascade/assets/images/mockups.png diff --git a/cascade/classes/__init__.py b/cascade/classes/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/cascade/classes/__pycache__/__init__.cpython-36.pyc b/cascade/classes/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..b265960 Binary files /dev/null and b/cascade/classes/__pycache__/__init__.cpython-36.pyc differ diff --git a/cascade/classes/__pycache__/content.cpython-36.pyc b/cascade/classes/__pycache__/content.cpython-36.pyc new file mode 100644 index 0000000..ddb8031 Binary files /dev/null and b/cascade/classes/__pycache__/content.cpython-36.pyc differ diff --git a/cascade/classes/__pycache__/core.cpython-36.pyc b/cascade/classes/__pycache__/core.cpython-36.pyc new file mode 100644 index 0000000..aafeb97 Binary files /dev/null and b/cascade/classes/__pycache__/core.cpython-36.pyc differ diff --git a/cascade/classes/__pycache__/design.cpython-36.pyc b/cascade/classes/__pycache__/design.cpython-36.pyc new file mode 100644 index 0000000..406cb0c Binary files /dev/null and b/cascade/classes/__pycache__/design.cpython-36.pyc differ diff --git a/cascade/classes/__pycache__/docsetdialog.cpython-36.pyc b/cascade/classes/__pycache__/docsetdialog.cpython-36.pyc new file mode 100644 index 0000000..2208135 Binary files /dev/null and b/cascade/classes/__pycache__/docsetdialog.cpython-36.pyc differ diff --git a/cascade/classes/__pycache__/highlighter.cpython-36.pyc b/cascade/classes/__pycache__/highlighter.cpython-36.pyc new file mode 100644 index 0000000..cf75636 Binary files /dev/null and b/cascade/classes/__pycache__/highlighter.cpython-36.pyc differ diff --git a/cascade/classes/__pycache__/mainwindow.cpython-36.pyc b/cascade/classes/__pycache__/mainwindow.cpython-36.pyc new file mode 100644 index 0000000..7f0f777 Binary files /dev/null and b/cascade/classes/__pycache__/mainwindow.cpython-36.pyc differ diff --git a/cascade/classes/__pycache__/md2html.cpython-36.pyc b/cascade/classes/__pycache__/md2html.cpython-36.pyc new file mode 100644 index 0000000..1e1fc52 Binary files /dev/null and b/cascade/classes/__pycache__/md2html.cpython-36.pyc differ diff --git a/cascade/classes/__pycache__/sasscompiler.cpython-36.pyc b/cascade/classes/__pycache__/sasscompiler.cpython-36.pyc new file mode 100644 index 0000000..e2d0f7e Binary files /dev/null and b/cascade/classes/__pycache__/sasscompiler.cpython-36.pyc differ diff --git a/cascade/classes/__pycache__/server.cpython-36.pyc b/cascade/classes/__pycache__/server.cpython-36.pyc new file mode 100644 index 0000000..aa847a7 Binary files /dev/null and b/cascade/classes/__pycache__/server.cpython-36.pyc differ diff --git a/classes/content.py b/cascade/classes/content.py similarity index 98% rename from classes/content.py rename to cascade/classes/content.py index cb4a23f..545a4b7 100644 --- a/classes/content.py +++ b/cascade/classes/content.py @@ -18,7 +18,7 @@ from PyQt5.QtWidgets import QWidget, QLabel, QHBoxLayout, QVBoxLayout, QSplitter from classes import highlighter -import markdown2 +import markdown import json @@ -247,8 +247,8 @@ class MarkdownEditor(QWidget): # self.tabs.setTabText(i, "* "+self.tabs.tabText(i)) def refreshViewer(self): - markdown = self.editor.toPlainText() - html = markdown2.markdown(markdown) + md = self.editor.toPlainText() + html = markdown.markdown(md) self.viewer.setHtml(html) def save(self): diff --git a/classes/core.py b/cascade/classes/core.py similarity index 98% rename from classes/core.py rename to cascade/classes/core.py index 77fbdda..0439ae6 100644 --- a/classes/core.py +++ b/cascade/classes/core.py @@ -14,7 +14,8 @@ from PyQt5 import QtCore from PyQt5.QtCore import QSettings, QCoreApplication import json -import git +# import git +# from pygit2 import Repository from classes import server, sasscompiler, md2html @@ -210,6 +211,7 @@ class Core(): self.changeCWD(cwd) self.loadDocSettings() self.summary = json.loads(open(os.path.join(cwd,'.config/summary.json')).read()) + # TODO: try python-pygit2 arch package # self.repository = git.Repo.init(cwd) # TODO: set git config user.name & user.email # self.repository diff --git a/classes/design.py b/cascade/classes/design.py similarity index 100% rename from classes/design.py rename to cascade/classes/design.py diff --git a/classes/docsetdialog.py b/cascade/classes/docsetdialog.py similarity index 100% rename from classes/docsetdialog.py rename to cascade/classes/docsetdialog.py diff --git a/classes/highlighter.py b/cascade/classes/highlighter.py similarity index 100% rename from classes/highlighter.py rename to cascade/classes/highlighter.py diff --git a/classes/mainwindow.py b/cascade/classes/mainwindow.py similarity index 100% rename from classes/mainwindow.py rename to cascade/classes/mainwindow.py diff --git a/classes/md2html.py b/cascade/classes/md2html.py similarity index 100% rename from classes/md2html.py rename to cascade/classes/md2html.py diff --git a/classes/sasscompiler.py b/cascade/classes/sasscompiler.py similarity index 100% rename from classes/sasscompiler.py rename to cascade/classes/sasscompiler.py diff --git a/classes/server.py b/cascade/classes/server.py similarity index 100% rename from classes/server.py rename to cascade/classes/server.py diff --git a/app.py b/cascade/main.py similarity index 100% rename from app.py rename to cascade/main.py diff --git a/templates/main.tpl.html b/cascade/templates/main.tpl.html similarity index 100% rename from templates/main.tpl.html rename to cascade/templates/main.tpl.html diff --git a/templates/newproject/.config/docsettings.json b/cascade/templates/newproject/.config/docsettings.json similarity index 100% rename from templates/newproject/.config/docsettings.json rename to cascade/templates/newproject/.config/docsettings.json diff --git a/templates/newproject/.config/summary.json b/cascade/templates/newproject/.config/summary.json similarity index 100% rename from templates/newproject/.config/summary.json rename to cascade/templates/newproject/.config/summary.json diff --git a/templates/newproject/assets/css/debug.scss b/cascade/templates/newproject/assets/css/debug.scss similarity index 100% rename from templates/newproject/assets/css/debug.scss rename to cascade/templates/newproject/assets/css/debug.scss diff --git a/templates/newproject/assets/css/grid.scss b/cascade/templates/newproject/assets/css/grid.scss similarity index 100% rename from templates/newproject/assets/css/grid.scss rename to cascade/templates/newproject/assets/css/grid.scss diff --git a/templates/newproject/assets/css/html2print.scss b/cascade/templates/newproject/assets/css/html2print.scss similarity index 100% rename from templates/newproject/assets/css/html2print.scss rename to cascade/templates/newproject/assets/css/html2print.scss diff --git a/templates/newproject/assets/css/layout.scss b/cascade/templates/newproject/assets/css/layout.scss similarity index 100% rename from templates/newproject/assets/css/layout.scss rename to cascade/templates/newproject/assets/css/layout.scss diff --git a/templates/newproject/assets/css/main.scss b/cascade/templates/newproject/assets/css/main.scss similarity index 100% rename from templates/newproject/assets/css/main.scss rename to cascade/templates/newproject/assets/css/main.scss diff --git a/templates/newproject/assets/css/mixins.scss b/cascade/templates/newproject/assets/css/mixins.scss similarity index 100% rename from templates/newproject/assets/css/mixins.scss rename to cascade/templates/newproject/assets/css/mixins.scss diff --git a/templates/newproject/assets/css/setup.scss b/cascade/templates/newproject/assets/css/setup.scss similarity index 100% rename from templates/newproject/assets/css/setup.scss rename to cascade/templates/newproject/assets/css/setup.scss diff --git a/templates/newproject/assets/css/styles.scss b/cascade/templates/newproject/assets/css/styles.scss similarity index 100% rename from templates/newproject/assets/css/styles.scss rename to cascade/templates/newproject/assets/css/styles.scss diff --git a/templates/newproject/assets/js/html2print.js b/cascade/templates/newproject/assets/js/html2print.js similarity index 100% rename from templates/newproject/assets/js/html2print.js rename to cascade/templates/newproject/assets/js/html2print.js diff --git a/templates/newproject/assets/js/script.js b/cascade/templates/newproject/assets/js/script.js similarity index 100% rename from templates/newproject/assets/js/script.js rename to cascade/templates/newproject/assets/js/script.js diff --git a/templates/newproject/assets/js/setup.js b/cascade/templates/newproject/assets/js/setup.js similarity index 100% rename from templates/newproject/assets/js/setup.js rename to cascade/templates/newproject/assets/js/setup.js diff --git a/templates/newproject/assets/lib/css-regions-polyfill.min.js b/cascade/templates/newproject/assets/lib/css-regions-polyfill.min.js similarity index 100% rename from templates/newproject/assets/lib/css-regions-polyfill.min.js rename to cascade/templates/newproject/assets/lib/css-regions-polyfill.min.js diff --git a/templates/newproject/assets/lib/jquery.min.js b/cascade/templates/newproject/assets/lib/jquery.min.js similarity index 100% rename from templates/newproject/assets/lib/jquery.min.js rename to cascade/templates/newproject/assets/lib/jquery.min.js diff --git a/templates/newproject/contents/default.md b/cascade/templates/newproject/contents/default.md similarity index 100% rename from templates/newproject/contents/default.md rename to cascade/templates/newproject/contents/default.md diff --git a/templates/newproject/index.html b/cascade/templates/newproject/index.html similarity index 100% rename from templates/newproject/index.html rename to cascade/templates/newproject/index.html diff --git a/setup.py b/setup.py index 8cc2656..276d03d 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,12 @@ from setuptools import setup, find_packages + setup( name="Cascade", version="0.0.1", packages=find_packages(), + entry_points={ + 'gui_scripts': [ + 'cascade = cascade.main:__main__', + ] + } )