From 644ea62ad436b397b18a7c66cdf2c740de24d880 Mon Sep 17 00:00:00 2001
From: Hugo Posnic <hugo.posnic@protonmail.com>
Date: Fri, 16 Dec 2016 22:21:09 +0100
Subject: [PATCH] Remove menu

---
 po/manjaro-hello.pot                          |  48 ++++++++---------
 src/locale/fr_FR/LC_MESSAGES/manjaro-hello.mo | Bin 2233 -> 2233 bytes
 src/locale/fr_FR/LC_MESSAGES/manjaro-hello.po |  50 +++++++++---------
 src/manjaro-hello.py                          |   7 ---
 ui/manjaro-hello.glade                        |  16 ++----
 5 files changed, 52 insertions(+), 69 deletions(-)

diff --git a/po/manjaro-hello.pot b/po/manjaro-hello.pot
index 07140d3..9801d9e 100644
--- a/po/manjaro-hello.pot
+++ b/po/manjaro-hello.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-10 23:58+0100\n"
+"POT-Creation-Date: 2016-12-16 22:11+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,19 +21,19 @@ msgstr ""
 msgid "About"
 msgstr ""
 
-#: manjaro-hello.glade:13
+#: manjaro-hello.glade:12
 msgid "Welcome screen for Manjaro"
 msgstr ""
 
-#: manjaro-hello.glade:15
+#: manjaro-hello.glade:14
 msgid "Github"
 msgstr ""
 
-#: manjaro-hello.glade:103
+#: manjaro-hello.glade:94
 msgid "Welcome to Manjaro!"
 msgstr ""
 
-#: manjaro-hello.glade:120
+#: manjaro-hello.glade:111
 msgid ""
 "Thank you for joining our community!\n"
 "\n"
@@ -43,78 +43,78 @@ msgid ""
 "your feedback."
 msgstr ""
 
-#: manjaro-hello.glade:137
+#: manjaro-hello.glade:128
 msgid "DOCUMENTATION"
 msgstr ""
 
-#: manjaro-hello.glade:151
+#: manjaro-hello.glade:142
 msgid "SUPPORT"
 msgstr ""
 
-#: manjaro-hello.glade:165
+#: manjaro-hello.glade:156
 msgid "PROJECT"
 msgstr ""
 
-#: manjaro-hello.glade:177 manjaro-hello.glade:537
+#: manjaro-hello.glade:168 manjaro-hello.glade:528
 msgid "Read me"
 msgstr ""
 
-#: manjaro-hello.glade:191 manjaro-hello.glade:577
+#: manjaro-hello.glade:182 manjaro-hello.glade:568
 msgid "Release info"
 msgstr ""
 
-#: manjaro-hello.glade:205
+#: manjaro-hello.glade:196
 msgid "Wiki"
 msgstr ""
 
-#: manjaro-hello.glade:219 manjaro-hello.glade:638
+#: manjaro-hello.glade:210 manjaro-hello.glade:629
 msgid "Get involved"
 msgstr ""
 
-#: manjaro-hello.glade:233
+#: manjaro-hello.glade:224
 msgid "Forums"
 msgstr ""
 
-#: manjaro-hello.glade:247
+#: manjaro-hello.glade:238
 msgid "Chat room"
 msgstr ""
 
-#: manjaro-hello.glade:261
+#: manjaro-hello.glade:252
 msgid "Mailling lists"
 msgstr ""
 
-#: manjaro-hello.glade:275
+#: manjaro-hello.glade:266
 msgid "Build Manjaro"
 msgstr ""
 
-#: manjaro-hello.glade:289
+#: manjaro-hello.glade:280
 msgid "Donate"
 msgstr ""
 
-#: manjaro-hello.glade:401
+#: manjaro-hello.glade:392
 msgid "Launch at start"
 msgstr ""
 
-#: manjaro-hello.glade:438
+#: manjaro-hello.glade:429
 msgid "Use Calamares (Graphic method)"
 msgstr ""
 
-#: manjaro-hello.glade:452
+#: manjaro-hello.glade:443
 msgid "Use CLI-Installer (Command line)"
 msgstr ""
 
-#: manjaro-hello.glade:474
+#: manjaro-hello.glade:465
 msgid "INSTALLATION"
 msgstr ""
 
-#: manjaro-hello.glade:493
+#: manjaro-hello.glade:484
 msgid "Welcome"
 msgstr ""
 
-#: manjaro-hello.glade:593
+#: manjaro-hello.glade:584
 msgid "Documentation"
 msgstr ""
 
-#: manjaro-hello.glade:659
+#: manjaro-hello.glade:650
 msgid "Project"
 msgstr ""
diff --git a/src/locale/fr_FR/LC_MESSAGES/manjaro-hello.mo b/src/locale/fr_FR/LC_MESSAGES/manjaro-hello.mo
index a49fb22b96fffc878249240ff7a93c36aee497fb..9ea10d2b4540ba013020e2131858af911be4fc8b 100644
GIT binary patch
delta 32
hcmdlfxKnV$6&7|g1tTLXL*vP}SrlRH&CIOZm;s`U2;u+$

delta 32
hcmdlfxKnV$6&7{_1tViCQ_IP>SrlRH&CIOZm;s{72<!j=

diff --git a/src/locale/fr_FR/LC_MESSAGES/manjaro-hello.po b/src/locale/fr_FR/LC_MESSAGES/manjaro-hello.po
index b3e54d9..23a26ce 100644
--- a/src/locale/fr_FR/LC_MESSAGES/manjaro-hello.po
+++ b/src/locale/fr_FR/LC_MESSAGES/manjaro-hello.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-10 23:59+0100\n"
-"PO-Revision-Date: 2016-12-10 23:59+0100\n"
+"POT-Creation-Date: 2016-12-16 22:13+0100\n"
+"PO-Revision-Date: 2016-12-16 22:13+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "About"
 msgstr "À propos"
 
-#: manjaro-hello.glade:13
+#: manjaro-hello.glade:12
 msgid "Welcome screen for Manjaro"
 msgstr "Écran de bienvenue pour Manjaro"
 
-#: manjaro-hello.glade:15
+#: manjaro-hello.glade:14
 msgid "Github"
 msgstr "Github"
 
-#: manjaro-hello.glade:103
+#: manjaro-hello.glade:94
 msgid "Welcome to Manjaro!"
 msgstr "Bienvenue sur Manjaro !"
 
-#: manjaro-hello.glade:120
+#: manjaro-hello.glade:111
 msgid ""
 "Thank you for joining our community!\n"
 "\n"
@@ -51,79 +51,79 @@ msgstr ""
 "Alors profitez de l'expérience, et n'hésitez pas à nous faire part de vos "
 "commentaires."
 
-#: manjaro-hello.glade:137
+#: manjaro-hello.glade:128
 msgid "DOCUMENTATION"
 msgstr "DOCUMENTATION"
 
-#: manjaro-hello.glade:151
+#: manjaro-hello.glade:142
 msgid "SUPPORT"
 msgstr "SUPPORT"
 
-#: manjaro-hello.glade:165
+#: manjaro-hello.glade:156
 msgid "PROJECT"
 msgstr "PROJET"
 
-#: manjaro-hello.glade:177 manjaro-hello.glade:537
+#: manjaro-hello.glade:168 manjaro-hello.glade:528
 msgid "Read me"
 msgstr "Lisez moi"
 
-#: manjaro-hello.glade:191 manjaro-hello.glade:577
+#: manjaro-hello.glade:182 manjaro-hello.glade:568
 msgid "Release info"
 msgstr "Informations de version"
 
-#: manjaro-hello.glade:205
+#: manjaro-hello.glade:196
 msgid "Wiki"
 msgstr "Wiki"
 
-#: manjaro-hello.glade:219 manjaro-hello.glade:638
+#: manjaro-hello.glade:210 manjaro-hello.glade:629
 msgid "Get involved"
 msgstr "S'investir"
 
-#: manjaro-hello.glade:233
+#: manjaro-hello.glade:224
 msgid "Forums"
 msgstr "Forums"
 
-#: manjaro-hello.glade:247
+#: manjaro-hello.glade:238
 msgid "Chat room"
 msgstr "Salon de chat"
 
-#: manjaro-hello.glade:261
+#: manjaro-hello.glade:252
 msgid "Mailling lists"
 msgstr "Listes de diffusion"
 
-#: manjaro-hello.glade:275
+#: manjaro-hello.glade:266
 msgid "Build Manjaro"
 msgstr "Construire Manjaro"
 
-#: manjaro-hello.glade:289
+#: manjaro-hello.glade:280
 msgid "Donate"
 msgstr "Faire un don"
 
-#: manjaro-hello.glade:401
+#: manjaro-hello.glade:392
 msgid "Launch at start"
 msgstr "Lancer au démarrage"
 
-#: manjaro-hello.glade:438
+#: manjaro-hello.glade:429
 msgid "Use Calamares (Graphic method)"
 msgstr "Utiliser Calamares (Méthode graphique)"
 
-#: manjaro-hello.glade:452
+#: manjaro-hello.glade:443
 msgid "Use CLI-Installer (Command line)"
 msgstr "Utiliser CLI-Installer (Ligne de commande)"
 
-#: manjaro-hello.glade:474
+#: manjaro-hello.glade:465
 msgid "INSTALLATION"
 msgstr "INSTALLATION"
 
-#: manjaro-hello.glade:493
+#: manjaro-hello.glade:484
 msgid "Welcome"
 msgstr "Bienvenue"
 
-#: manjaro-hello.glade:593
+#: manjaro-hello.glade:584
 msgid "Documentation"
 msgstr "Documentation"
 
-#: manjaro-hello.glade:659
+#: manjaro-hello.glade:650
 msgid "Project"
 msgstr "Projet"
 
diff --git a/src/manjaro-hello.py b/src/manjaro-hello.py
index 04fc722..e6942b0 100644
--- a/src/manjaro-hello.py
+++ b/src/manjaro-hello.py
@@ -14,8 +14,6 @@ from gi.repository import Gtk, GdkPixbuf
 class ManjaroHello():
     def __init__(self):
         # App vars
-        args = str(sys.argv)
-        self.menu = True if "--menu" in args else False
         self.app = "manjaro-hello"
         self.urls = {
             "wiki": "https://wiki.manjaro.org",
@@ -90,11 +88,6 @@ class ManjaroHello():
         # Save locale used in config file
         self.save_preferences()
 
-        # Set menu
-        if self.menu:
-            self.builder.get_object("sidebar").set_visible(True)
-            self.builder.get_object("home").set_visible(False)
-
         # Set window subtitle
         if self.infos["codename"] and self.infos["release"]:
             self.builder.get_object("headerbar").props.subtitle = self.infos["codename"] + " " + self.infos["release"] + " "
diff --git a/ui/manjaro-hello.glade b/ui/manjaro-hello.glade
index cd1a713..b91ca77 100644
--- a/ui/manjaro-hello.glade
+++ b/ui/manjaro-hello.glade
@@ -51,7 +51,7 @@
     <property name="icon_name">help-about-symbolic</property>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="width_request">800</property>
+    <property name="width_request">750</property>
     <property name="can_focus">False</property>
     <property name="window_position">center</property>
     <property name="has_resize_grip">True</property>
@@ -60,21 +60,11 @@
       <object class="GtkGrid" id="grid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <child>
-          <object class="GtkStackSidebar" id="sidebar">
-            <property name="can_focus">False</property>
-            <property name="vexpand">True</property>
-            <property name="stack">stack</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkStack" id="stack">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
             <property name="transition_type">crossfade</property>
             <child>
               <object class="GtkGrid" id="welcome">
@@ -663,7 +653,7 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we
             </child>
           </object>
           <packing>
-            <property name="left_attach">1</property>
+            <property name="left_attach">0</property>
             <property name="top_attach">0</property>
           </packing>
         </child>