renamed package to libriis

.gitignore

@@ -1,5 +1,5 @@
 assets/scss/*.css
 __pycache__
 build
-cascade.egg-info
+libriis.egg-info
 .eggs

MANIFEST.in

@@ -1,2 +1,2 @@
-recursive-include cascade/assets *
-recursive-include cascade/templates *
+recursive-include libriis/assets *
+recursive-include libriis/templates *

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())

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())
 

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

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())

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

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)

libriis/templates/main.tpl.html

@@ -2,7 +2,7 @@
 <html class="normal" lang="fr">
   <head>
     <meta charset="utf-8">
-    <title>Cascade</title>
+    <title>Libriis</title>
 
     <link rel="stylesheet" href="/assets/css/main.css">
 

libriis/templates/newproject/.config/docsettings.json

@@ -1,8 +1,8 @@
 {
-  "git.user.name":"Cascade",
-  "git.user.email":"cascade@figureslibres.io",
-	"ho": "Cascade, default header odd",
-	"he": "Cascade, default header even",
+  "git.user.name":"libriis",
+  "git.user.email":"libriis@figureslibres.io",
+	"ho": "Libriis, default header odd",
+	"he": "Libriis, default header even",
   "np": 1,
   "pw": 210,
   "ph": 297,

libriis/templates/newproject/assets/css/setup.scss

@@ -59,5 +59,5 @@ $page-margin-bottom: mm2pt(10);
 
 $line-height: mm2pt(4);
 
-$header-odd: "Cascade, default header";
-$header-even: "Cascade, default header";
+$header-odd: "Libriis, default header";
+$header-even: "Libriis, default header";

libriis/templates/newproject/assets/js/script.js

@@ -1,5 +1,5 @@
 jQuery(document).ready(function($) {
 
-  console.log("Hello Cascade");
+  console.log("Hello Libriis");
 
 });

libriis/templates/newproject/index.html

@@ -2,11 +2,11 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>Cascade</title>
+    <title>Libriis</title>
     <link rel="stylesheet" href="assets/css/main.css">
   </head>
   <body>
-    <h1>Cascade</h1>
+    <h1>Libriis</h1>
     <h2>A Markup Cascading Printing software</h2>
   </body>
 </html>

readme.md

@@ -1,8 +1,8 @@
-# Cascade
+# Libriis
 
 ![icon](assets/images/icon.png)
 
-A Markup Cascading Printing software
+A Markup Cascading Styles Printing software.
 
 ## Design Stack
 ![Design Stack](assets/images/Screenshot_stackdesign.png)

setup.py

@@ -1,42 +1,35 @@
 from setuptools import setup
 
 setup(
-   name="cascade",
+   name="libriis",
    version="0.1",
-
+   author = "Bachir Soussi Chiadmi",
+   author_email = "bach@figureslibres.io",
    packages=[
-      'cascade',
-      'cascade.classes',
+      'libriis',
+      'libriis.classes',
    ],
-
    scripts = [
-      'bin/cascade',
+      'bin/libriis',
    ],
-
-
    include_package_data=True,
    package_data={
       # If any package contains *.txt or *.rst files, include them:
       '': ['*.png', '*.html', '*.zip', '*.scss', '*.js', '*.md'],
-      '': ['cascade.assets','cascade.assets.images'],
+      '': ['libriis.assets','libriis.assets.images'],
       '': [
-            'cascade.templates',
-            'cascade.templates.newproject',
-            'cascade.templates.newproject..config',
-            'cascade.templates.newproject.assets',
-            'cascade.templates.newproject.assets.css',
-            'cascade.templates.newproject.assets.images',
-            'cascade.templates.newproject.assets.js',
-            'cascade.templates.newproject.assets.lib',
-            'cascade.templates.newproject.contents'
+            'libriis.templates',
+            'libriis.templates.newproject',
+            'libriis.templates.newproject..config',
+            'libriis.templates.newproject.assets',
+            'libriis.templates.newproject.assets.css',
+            'libriis.templates.newproject.assets.images',
+            'libriis.templates.newproject.assets.js',
+            'libriis.templates.newproject.assets.lib',
+            'libriis.templates.newproject.contents'
          ]
    },
-   # TODO: entry point is not working
-   # entry_points={
-   #    'gui_scripts': [ 'cascade = cascade.main:__main__', ]
-   # },
-   # TODO: dependencies are not installed :(
-   # install_requires=[
-   #    'pyphen','sass',
-   # ],
+   install_requires=[
+      'pyphen','sass',
+   ],
 )