From 442ea57bfe1ca531eaf87ac9709b9ed2b2709151 Mon Sep 17 00:00:00 2001
From: micu <micuintus@gmx.de>
Date: Fri, 1 Dec 2017 19:28:55 +0100
Subject: [PATCH 1/2] Make QreziDemo and c++now_lightning_talk run again

 * Switch to new "text:" API of the Code component
 * Initializing current_frame is not necessary, but also
   not possible anymore
 * Code -> CodeItem
---
 QreziDemo.qml                                         | 6 +++---
 demo_talks/c++now_lightning_talk/Slides/Braces.qml    | 2 +-
 demo_talks/c++now_lightning_talk/Slides/WeirdCast.qml | 4 ++--
 demo_talks/c++now_lightning_talk/main.qml             | 2 --
 modules/Qrezi/CodeWithText.qml                        | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/QreziDemo.qml b/QreziDemo.qml
index 2aee78e..78406d3 100644
--- a/QreziDemo.qml
+++ b/QreziDemo.qml
@@ -95,11 +95,11 @@ Rectangle {
       }
 
 
-      Code {
+      CodeItem {
 
          id:   slide3
 
-         code:
+      text:
 "
 template< typename X >
 struct fency {
@@ -140,7 +140,7 @@ int main() { std::cout << fency::foo() << std::endl;  }
          height:  400
 
          font.pointSize: 30
-         code:
+         text:
 "
 var head = function( xs ) {
    return xs[0]
diff --git a/demo_talks/c++now_lightning_talk/Slides/Braces.qml b/demo_talks/c++now_lightning_talk/Slides/Braces.qml
index 114588f..201f8f0 100644
--- a/demo_talks/c++now_lightning_talk/Slides/Braces.qml
+++ b/demo_talks/c++now_lightning_talk/Slides/Braces.qml
@@ -29,7 +29,7 @@ Item {
         language: "c++"
         font.pointSize: 30
 
-        code:
+        text:
 "int main()
  {
     [](){};
diff --git a/demo_talks/c++now_lightning_talk/Slides/WeirdCast.qml b/demo_talks/c++now_lightning_talk/Slides/WeirdCast.qml
index 830712c..aa5679e 100644
--- a/demo_talks/c++now_lightning_talk/Slides/WeirdCast.qml
+++ b/demo_talks/c++now_lightning_talk/Slides/WeirdCast.qml
@@ -22,7 +22,7 @@ Flipper {
       style:   "obsidian"
       language: "c++"
       font.pointSize: 30
-      code:
+      text:
 "float x = some_value;
 int temp = (-1)[(int *)(&x+1)];
 ...
@@ -38,7 +38,7 @@ int temp = (-1)[(int *)(&x+1)];
       style:   "obsidian"
       language: "c++"
       font.pointSize: 30
-      code:
+      text:
 "float x = some_value;
 int temp = reinterpret_cast<int&>(x);
 ...
diff --git a/demo_talks/c++now_lightning_talk/main.qml b/demo_talks/c++now_lightning_talk/main.qml
index 4baad8f..e007156 100644
--- a/demo_talks/c++now_lightning_talk/main.qml
+++ b/demo_talks/c++now_lightning_talk/main.qml
@@ -48,8 +48,6 @@ Qrezi {
             , this_presi
             ]
 
-   current_frame: title
-
    Frame {
       id: title
 
diff --git a/modules/Qrezi/CodeWithText.qml b/modules/Qrezi/CodeWithText.qml
index 302d5a5..98d954c 100644
--- a/modules/Qrezi/CodeWithText.qml
+++ b/modules/Qrezi/CodeWithText.qml
@@ -5,7 +5,7 @@ Rectangle {
    property alias text:       text_item.text
    property alias text_size:  text_item.s
    property alias text_shadow:text_item.shadow
-   property alias code:       code_item.code
+   property alias code:       code_item.text
    property alias code_size:  code_item.font.pointSize
    property alias language:   code_item.language
    property alias style:      code_item.style

From d88f60859893e0a4fc152d7d2aca046c07c68eb3 Mon Sep 17 00:00:00 2001
From: micu <micuintus@gmx.de>
Date: Fri, 1 Dec 2017 19:31:18 +0100
Subject: [PATCH 2/2] Make the "presentation frameworks" slide fit

-- at least on my screen.

(But maybe its caused by the Qt fontSize
DPI confusion on different systems?!)
---
 demo_talks/c++now_lightning_talk/main.qml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/demo_talks/c++now_lightning_talk/main.qml b/demo_talks/c++now_lightning_talk/main.qml
index e007156..2b1e051 100644
--- a/demo_talks/c++now_lightning_talk/main.qml
+++ b/demo_talks/c++now_lightning_talk/main.qml
@@ -92,18 +92,18 @@ Qrezi {
       height:  config.slide_height
       x: 0
       y: -800
-      scale: 3
+      scale: 2.5
 
       title: "presentation\nframeworks"
 
       x1: 220
-      y1: 160
+      y1: 150
       x2: 100
       y2: 10
 
-      font_size:  42
-      font_size12: 30
-      font_size2:  22
+      font_size:  30
+      font_size12: 22
+      font_size2:  16
 
 
       bullets: