From d730bb4f1307fc1699ac288e6ee8530f26914d94 Mon Sep 17 00:00:00 2001
From: Ace <saadnaseer63@yahoo.de>
Date: Tue, 26 May 2020 19:16:40 +0200
Subject: [PATCH] corrected absolute imports

---
 inkycal/__init__.py        | 13 +++++++++----
 inkycal/config/__init__.py |  4 ++--
 inkycal/config/layout.py   | 14 +++++++-------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/inkycal/__init__.py b/inkycal/__init__.py
index 1955684..23c7e78 100644
--- a/inkycal/__init__.py
+++ b/inkycal/__init__.py
@@ -1,5 +1,10 @@
-from inkycal.modules.inkycal_agenda import agenda
-from inkycal.modules.inkycal_calendar import calendar
-from inkycal.modules.inkycal_weather import weather
-from inkycal.modules.inkycal_rss import rss
+from inkycal.config import layout
+from inkycal.config import settings_parser
+
+
+import inkycal.modules.inkycal_agenda
+import inkycal.modules.inkycal_calendar
+import inkycal.modules.inkycal_weather
+import inkycal.modules.inkycal_rss
+#import inkycal.modules.inkycal_image
 
diff --git a/inkycal/config/__init__.py b/inkycal/config/__init__.py
index 1c877d3..4d83e1d 100644
--- a/inkycal/config/__init__.py
+++ b/inkycal/config/__init__.py
@@ -1,2 +1,2 @@
-from .settings_parser import settings
-from .layout import layout
+from .settings_parser import Settings
+from .layout import Layout
diff --git a/inkycal/config/layout.py b/inkycal/config/layout.py
index 2c2e8ae..77bb7cd 100644
--- a/inkycal/config/layout.py
+++ b/inkycal/config/layout.py
@@ -12,7 +12,7 @@ filename = os.path.basename(__file__).split('.py')[0]
 logger = logging.getLogger(filename)
 logger.setLevel(level=logging.INFO)
 
-class layout:
+class Layout:
   """Page layout handling"""
 
   def __init__(self, model=None, width=None, height=None,
@@ -77,12 +77,12 @@ class layout:
       self.bottom_section_height = (self.display_height -
         self.top_section_height - self.middle_section_height)
 
-    logger.debug('top-section size: {} x {} px'.format(
-      self.top_section_width, self.top_section_height))
-    logger.debug('middle-section size: {} x {} px'.format(
-      self.middle_section_width, self.middle_section_height))
-    logger.debug('bottom-section size: {} x {} px'.format(
-      self.bottom_section_width, self.bottom_section_height))
+    logger.debug(('top-section size: {} x {} px'.format(
+      self.top_section_width, self.top_section_height)))
+    logger.debug(('middle-section size: {} x {} px'.format(
+      self.middle_section_width, self.middle_section_height)))
+    logger.debug(('bottom-section size: {} x {} px'.format(
+      self.bottom_section_width, self.bottom_section_height)))
 
 
   def get_size(self, section):