From fb1cdcba0cd57e51a6cc2ce56141ac6347a728e4 Mon Sep 17 00:00:00 2001
From: Huluti <hugo.posnic@gmail.com>
Date: Sun, 4 Dec 2016 22:38:53 +0100
Subject: [PATCH] Change layout to handle pages

---
 src/manjaro-hello.glade | 66 ++++++++++++++++++++++++-----------------
 src/manjaro-hello.py    | 14 ++-------
 2 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/src/manjaro-hello.glade b/src/manjaro-hello.glade
index 6bdc41c..651c969 100644
--- a/src/manjaro-hello.glade
+++ b/src/manjaro-hello.glade
@@ -428,16 +428,20 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we
                     <property name="can_focus">True</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkTextView" id="readmetext">
+                      <object class="GtkViewport">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="editable">False</property>
-                        <property name="wrap_mode">word</property>
-                        <property name="left_margin">10</property>
-                        <property name="right_margin">10</property>
-                        <property name="top_margin">10</property>
-                        <property name="bottom_margin">10</property>
-                        <property name="cursor_visible">False</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkLabel" id="readmetext">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_left">10</property>
+                            <property name="margin_right">10</property>
+                            <property name="margin_top">10</property>
+                            <property name="margin_bottom">10</property>
+                            <property name="wrap">True</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
@@ -461,16 +465,20 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we
                     <property name="can_focus">True</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkTextView" id="releasetext">
+                      <object class="GtkViewport">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="editable">False</property>
-                        <property name="wrap_mode">word</property>
-                        <property name="left_margin">10</property>
-                        <property name="right_margin">10</property>
-                        <property name="top_margin">10</property>
-                        <property name="bottom_margin">10</property>
-                        <property name="cursor_visible">False</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkLabel" id="releasetext">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_left">10</property>
+                            <property name="margin_right">10</property>
+                            <property name="margin_top">10</property>
+                            <property name="margin_bottom">10</property>
+                            <property name="wrap">True</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
@@ -517,16 +525,20 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we
                     <property name="can_focus">True</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkTextView" id="involvedtext">
+                      <object class="GtkViewport">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="editable">False</property>
-                        <property name="wrap_mode">word</property>
-                        <property name="left_margin">10</property>
-                        <property name="right_margin">10</property>
-                        <property name="top_margin">10</property>
-                        <property name="bottom_margin">10</property>
-                        <property name="cursor_visible">False</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkLabel" id="involvedtext">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_left">10</property>
+                            <property name="margin_right">10</property>
+                            <property name="margin_top">10</property>
+                            <property name="margin_bottom">10</property>
+                            <property name="wrap">True</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
diff --git a/src/manjaro-hello.py b/src/manjaro-hello.py
index aca90b7..b6b8e1d 100644
--- a/src/manjaro-hello.py
+++ b/src/manjaro-hello.py
@@ -43,17 +43,9 @@ class ManjaroHello(Gtk.Window):
 
         self.builder.get_object("headerbar").props.subtitle = self.infos["codename"] + " " + self.infos["release"] + " " + self.infos["arch"]
 
-        text_buffer = Gtk.TextBuffer()
-        text_buffer.set_text(self.read_data("readme"), -1)
-        self.builder.get_object("readmetext").set_buffer(text_buffer)
-
-        text_buffer = Gtk.TextBuffer()
-        text_buffer.set_text(self.read_data("release"), -1)
-        self.builder.get_object("releasetext").set_buffer(text_buffer)
-
-        text_buffer = Gtk.TextBuffer()
-        text_buffer.set_text(self.read_data("involved"), -1)
-        self.builder.get_object("involvedtext").set_buffer(text_buffer)
+        self.builder.get_object("readmetext").set_text(self.read_data("readme"))
+        self.builder.get_object("releasetext").set_text(self.read_data("release"))
+        self.builder.get_object("involvedtext").set_text(self.read_data("involved"))
 
         self.builder.get_object("autostart").set_active(self.preferences["autostart"])