diff --git a/.gitignore b/.gitignore index 0ce3d0e..35e1eba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ assets/scss/*.css __pycache__ build -cascade.egg-info +libriis.egg-info .eggs diff --git a/MANIFEST.in b/MANIFEST.in index 2558f37..945ba75 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,2 @@ -recursive-include cascade/assets * -recursive-include cascade/templates * +recursive-include libriis/assets * +recursive-include libriis/templates * diff --git a/bin/cascade b/bin/libriis similarity index 87% rename from bin/cascade rename to bin/libriis index fd491ea..2d67a01 100755 --- a/bin/cascade +++ b/bin/libriis @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- python-mode -*- -"""Cascade: The html2print GUI +"""Libriis: The html2print GUI """ from __future__ import absolute_import, print_function, division, unicode_literals @@ -21,7 +21,7 @@ GNU General Public License for more details. """ -from cascade.main import main # pylint: disable=wrong-import-position +from libriis.main import main # pylint: disable=wrong-import-position if __name__ == '__main__': sys.exit(main()) diff --git a/cascade/__init__.py b/libriis/__init__.py similarity index 100% rename from cascade/__init__.py rename to libriis/__init__.py diff --git a/cascade/assets/images/Screenshot_stackcontents.png b/libriis/assets/images/Screenshot_stackcontents.png similarity index 100% rename from cascade/assets/images/Screenshot_stackcontents.png rename to libriis/assets/images/Screenshot_stackcontents.png diff --git a/cascade/assets/images/Screenshot_stackdesign.png b/libriis/assets/images/Screenshot_stackdesign.png similarity index 100% rename from cascade/assets/images/Screenshot_stackdesign.png rename to libriis/assets/images/Screenshot_stackdesign.png diff --git a/cascade/assets/images/icon.png b/libriis/assets/images/icon.png similarity index 100% rename from cascade/assets/images/icon.png rename to libriis/assets/images/icon.png diff --git a/cascade/assets/images/mockups.png b/libriis/assets/images/mockups.png similarity index 100% rename from cascade/assets/images/mockups.png rename to libriis/assets/images/mockups.png diff --git a/cascade/classes/__init__.py b/libriis/classes/__init__.py similarity index 100% rename from cascade/classes/__init__.py rename to libriis/classes/__init__.py diff --git a/cascade/classes/content.py b/libriis/classes/content.py similarity index 98% rename from cascade/classes/content.py rename to libriis/classes/content.py index c291665..ca5c3ed 100644 --- a/cascade/classes/content.py +++ b/libriis/classes/content.py @@ -295,7 +295,7 @@ class ContentStack(QWidget): def restorePrefs(self): - settings = QSettings('FiguresLibres', 'Cascade') + settings = QSettings('FiguresLibres', 'Libriis') vals = settings.value('content/hsplitter/sizes', None) if vals: sizes = [] @@ -303,7 +303,7 @@ class ContentStack(QWidget): self.hsplitter.setSizes(sizes) def movedSplitter(self): - settings = QSettings('FiguresLibres', 'Cascade') + settings = QSettings('FiguresLibres', 'Libriis') # print(self.hsplitter.sizes()) settings.setValue('content/hsplitter/sizes', self.hsplitter.sizes()) diff --git a/cascade/classes/core.py b/libriis/classes/core.py similarity index 95% rename from cascade/classes/core.py rename to libriis/classes/core.py index 99792d2..0196f89 100644 --- a/cascade/classes/core.py +++ b/libriis/classes/core.py @@ -35,7 +35,7 @@ class Core(): self._mw = False self.temp = tempfile.mkdtemp() # print(self.temp) - self.projectname = "Cascade" + self.projectname = "Libriis" self.tempcwd = False # if ther's not current project folder from restorepref @@ -68,7 +68,7 @@ class Core(): if not self._mw: self._mw = mw if not self.tempcwd: - self._mw.setWindowTitle("Cascade – "+self.cwd) + self._mw.setWindowTitle("Libriis – "+self.cwd) # ____ ____ # / __ \________ / __/____ @@ -77,7 +77,7 @@ class Core(): # /_/ /_/ \___/_/ /____/ def restorePreferences(self): # print("restorePreferences") - settings = QSettings('FiguresLibres', 'Cascade') + settings = QSettings('FiguresLibres', 'Libriis') # settings.clear() # print(settings.allKeys()) @@ -90,7 +90,7 @@ class Core(): def savePreferences(self): # print("savePreferences") - settings = QSettings('FiguresLibres', 'Cascade') + settings = QSettings('FiguresLibres', 'Libriis') # print(settings.allKeys()) if not self.tempcwd: @@ -156,12 +156,12 @@ class Core(): r'\$row-number:\s[0-9|\.]+;', '$row-number: '+self.docsettings['rn']+';', sass) - #$header-odd: "Cascade, default header"; + #$header-odd: "Libriis, default header"; sass = re.sub( r'\$header-odd:\s".+";', '$header-odd: "'+self.docsettings['ho']+'";', sass) - # $header-even: "Cascade, default header"; + # $header-even: "Libriis, default header"; sass = re.sub( r'\$header-even:\s".+";', '$header-even: "'+self.docsettings['he']+'";', @@ -246,7 +246,7 @@ class Core(): self.contentcompiler.reload() if not self.tempcwd: - self._mw.setWindowTitle("Cascade – "+self.cwd) + self._mw.setWindowTitle("Libriis – "+self.cwd) head, tail = os.path.split(self.cwd) print('tail', projectname) self.projectname = tail diff --git a/cascade/classes/design.py b/libriis/classes/design.py similarity index 98% rename from cascade/classes/design.py rename to libriis/classes/design.py index 0c7fdb5..6b75f89 100644 --- a/cascade/classes/design.py +++ b/libriis/classes/design.py @@ -61,7 +61,7 @@ class WebkitView(QWebView): self.printer.setPaperSize(QSizeF(210, 300), QPrinter.Millimeter) # self.printer.setOrientation(QPrinter.Portrait) self.printer.setOutputFormat(QPrinter.PdfFormat) - self.printer.setCreator('Cascade') + self.printer.setCreator('Libriis') self.printer.setDocName(self.core.projectname) self.printer.setOutputFileName(self.core.projectname+".pdf") # self.setFixedWidth(1000) @@ -282,13 +282,13 @@ class WebViewToolBar(QWidget): def recToolbarState(self, prop, val): # print('recToolbarState : '+prop, val) - settings = QSettings('FiguresLibres', 'Cascade') + settings = QSettings('FiguresLibres', 'Libriis') settings.setValue('design/toolbar/'+prop, val) # print('recToolbarState after : '+prop, settings.value('design/toolbar/'+prop)) def onRefresh(self): # apply precedent toolbar state - settings = QSettings('FiguresLibres', 'Cascade') + settings = QSettings('FiguresLibres', 'Libriis') self.preview.setChecked(bool(settings.value('design/toolbar/preview', False, type=bool))) self.debug.setChecked(bool(settings.value('design/toolbar/debug', False, type=bool))) self.grid.setChecked(bool(settings.value('design/toolbar/grid', False, type=bool))) @@ -469,7 +469,7 @@ class DesignStack(QWidget): def restorePrefs(self): - settings = QSettings('FiguresLibres', 'Cascade') + settings = QSettings('FiguresLibres', 'Libriis') print(settings.value('design/vsplitter/sizes', self.vsplitter.sizes())) vals = settings.value('design/vsplitter/sizes', None) if vals: @@ -484,7 +484,7 @@ class DesignStack(QWidget): self.hsplitter.setSizes(sizes) def movedSplitter(self): - settings = QSettings('FiguresLibres', 'Cascade') + settings = QSettings('FiguresLibres', 'Libriis') # print(self.vsplitter.sizes()) settings.setValue('design/vsplitter/sizes', self.vsplitter.sizes()) settings.setValue('design/hsplitter/sizes', self.hsplitter.sizes()) diff --git a/cascade/classes/docsetdialog.py b/libriis/classes/docsetdialog.py similarity index 100% rename from cascade/classes/docsetdialog.py rename to libriis/classes/docsetdialog.py diff --git a/cascade/classes/highlighter.py b/libriis/classes/highlighter.py similarity index 100% rename from cascade/classes/highlighter.py rename to libriis/classes/highlighter.py diff --git a/cascade/classes/mainwindow.py b/libriis/classes/mainwindow.py similarity index 97% rename from cascade/classes/mainwindow.py rename to libriis/classes/mainwindow.py index 9cf5647..e821463 100644 --- a/cascade/classes/mainwindow.py +++ b/libriis/classes/mainwindow.py @@ -26,7 +26,7 @@ class MainWindow(QMainWindow): # load core class self.core = core - self.setWindowTitle("Cascade") + self.setWindowTitle("Libriis") self.setWindowIcon(QIcon(os.path.join(self.core.appcwd,'assets/images/icon.png'))) self.resize(self.core.mw_size) @@ -144,7 +144,7 @@ class MainWindow(QMainWindow): try: head, tail = os.path.split(folder) self.core.dialog_path = head - # TODO: check if is cascade folder + # TODO: check if is libriis folder print(folder) if os.path.isdir(folder): self.core.openproject(folder) @@ -171,7 +171,7 @@ class MainWindow(QMainWindow): self.core.initnewproject(projectname) else: print("folder already exists") - # TODO: check if is cascade folder + # TODO: check if is libriis folder except Exception as e: print('Exception', e) pass @@ -195,7 +195,7 @@ class MainWindow(QMainWindow): self.quit() else: print("folder already exists") - # TODO: check if is cascade folder + # TODO: check if is libriis folder except Exception as e: print('Exception', e) pass diff --git a/cascade/classes/md2html.py b/libriis/classes/md2html.py similarity index 100% rename from cascade/classes/md2html.py rename to libriis/classes/md2html.py diff --git a/cascade/classes/sasscompiler.py b/libriis/classes/sasscompiler.py similarity index 100% rename from cascade/classes/sasscompiler.py rename to libriis/classes/sasscompiler.py diff --git a/cascade/classes/server.py b/libriis/classes/server.py similarity index 100% rename from cascade/classes/server.py rename to libriis/classes/server.py diff --git a/cascade/main.py b/libriis/main.py similarity index 89% rename from cascade/main.py rename to libriis/main.py index 5ffda32..dd6bab1 100755 --- a/cascade/main.py +++ b/libriis/main.py @@ -17,8 +17,8 @@ from .classes import (core, mainwindow) def main(): app = QApplication(sys.argv) - app.setOrganizationName('figli') - app.setApplicationName('Cascade') + app.setOrganizationName('Figureslibres') + app.setApplicationName('Libriis') app.path = os.path.dirname(os.path.abspath(__file__)) mainappcore = core.Core(app.path) mainappwindow = mainwindow.MainWindow(mainappcore) diff --git a/cascade/templates/main.tpl.html b/libriis/templates/main.tpl.html similarity index 97% rename from cascade/templates/main.tpl.html rename to libriis/templates/main.tpl.html index 18afe10..962bd59 100644 --- a/cascade/templates/main.tpl.html +++ b/libriis/templates/main.tpl.html @@ -2,7 +2,7 @@
-