Fixed expanding windows and hide luks password

Antergos · Dec 2, 2013 · 1d6f0d8 · 1d6f0d8
1 parent 3c38d8b
commit 1d6f0d8
Show file tree

Hide file tree

Showing 8 changed files with 279 additions and 221 deletions.
diff --git a/data/languages.png b/data/languages.png
diff --git a/src/desktop.py b/src/desktop.py
@@ -132,10 +132,7 @@ def translate_ui(self, desktop):
             "without any type of graphical interface. After the installation you can " \
             "customize Antergos by installing packages with the command-line package manager.")
             txt = "<span weight='bold'>Command-line system</span>\n" + txt
-
-        label.set_line_wrap(True)
-        label.set_justify(Gtk.Justification.FILL)
-        label.set_size_request(-1, 100)
+
         label.set_markup(txt)
 
         image.set_from_file(self.desktops_dir + desktop + ".png")

diff --git a/src/info.py b/src/info.py
@@ -20,7 +20,7 @@
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 #  MA 02110-1301, USA.
 
-cnchi_VERSION = "0.4.2"
+cnchi_VERSION = "0.4.3"
 cnchi_LAST_STABLE = "0.4.1"
 cnchi_WEBSITE = "http://www.antergos.com"
 cnchi_AUTHORS = "faidoc, karasu, skinner, arcnexus, omelchek"

diff --git a/ui/desktop.ui b/ui/desktop.ui
@@ -1,38 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Sun Nov  3 16:36:16 2013 -->
+<!-- Generated with glade 3.16.0 on Mon Dec  2 01:06:22 2013 -->
 <interface>
-  <!-- interface-requires gtk+ 3.6 -->
+  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkBox" id="desktop">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="margin_top">10</property>
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="margin_left">80</property>
         <property name="margin_right">20</property>
+        <property name="margin_top">10</property>
         <property name="spacing">40</property>
         <child>
           <object class="GtkBox" id="box2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkEventBox" id="eventbox1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkScrolledWindow" id="scrolledwindow1">
                 <property name="width_request">150</property>
@@ -85,6 +71,8 @@
           <object class="GtkImage" id="image_desktop">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="valign">start</property>
+            <property name="margin_left">20</property>
             <property name="stock">gtk-missing-image</property>
           </object>
           <packing>
@@ -105,10 +93,14 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="margin_left">20</property>
-        <property name="margin_right">20</property>
+        <property name="margin_right">10</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes">label</property>
         <property name="use_markup">True</property>
+        <property name="justify">fill</property>
+        <property name="wrap">True</property>
+        <property name="width_chars">85</property>
+        <property name="max_width_chars">85</property>
       </object>
       <packing>
         <property name="expand">False</property>

diff --git a/ui/features.ui b/ui/features.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Tue Oct 29 22:19:31 2013 -->
+<!-- Generated with glade 3.16.0 on Mon Dec  2 02:44:32 2013 -->
 <interface>
-  <!-- interface-requires gtk+ 3.6 -->
+  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkBox" id="features">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -16,7 +16,7 @@
           <object class="GtkImage" id="image_firewall">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">80</property>
+            <property name="margin_left">40</property>
             <property name="pixel_size">48</property>
             <property name="icon_name">network-server</property>
           </object>
@@ -54,6 +54,13 @@
                 <property name="xalign">0</property>
                 <property name="xpad">20</property>
                 <property name="label" translatable="yes">Control the incoming and outgoing network traffic.</property>
+                <property name="justify">fill</property>
+                <property name="wrap">True</property>
+                <property name="width_chars">50</property>
+                <property name="max_width_chars">50</property>
+                <attributes>
+                  <attribute name="font-desc" value="Sans 8"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -73,7 +80,8 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="valign">center</property>
-            <property name="margin_right">80</property>
+            <property name="margin_left">90</property>
+            <property name="margin_right">20</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -96,7 +104,7 @@
           <object class="GtkImage" id="image_cups">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">80</property>
+            <property name="margin_left">40</property>
             <property name="pixel_size">48</property>
             <property name="icon_name">printer</property>
           </object>
@@ -134,6 +142,13 @@
                 <property name="xalign">0</property>
                 <property name="xpad">20</property>
                 <property name="label" translatable="yes">Installation of printer drivers and management tools.</property>
+                <property name="justify">fill</property>
+                <property name="wrap">True</property>
+                <property name="width_chars">50</property>
+                <property name="max_width_chars">50</property>
+                <attributes>
+                  <attribute name="font-desc" value="Sans 8"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -153,7 +168,8 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="valign">center</property>
-            <property name="margin_right">80</property>
+            <property name="margin_left">90</property>
+            <property name="margin_right">20</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -176,7 +192,7 @@
           <object class="GtkImage" id="image_bluetooth">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">80</property>
+            <property name="margin_left">40</property>
             <property name="pixel_size">48</property>
             <property name="icon_name">bluetooth</property>
           </object>
@@ -214,6 +230,13 @@
                 <property name="xalign">0</property>
                 <property name="xpad">20</property>
                 <property name="label" translatable="yes">Enables your system to make wireless connections via Bluetooth.</property>
+                <property name="justify">fill</property>
+                <property name="wrap">True</property>
+                <property name="width_chars">50</property>
+                <property name="max_width_chars">50</property>
+                <attributes>
+                  <attribute name="font-desc" value="Sans 8"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -233,7 +256,8 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="valign">center</property>
-            <property name="margin_right">80</property>
+            <property name="margin_left">90</property>
+            <property name="margin_right">20</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -256,7 +280,7 @@
           <object class="GtkImage" id="image_visual">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">80</property>
+            <property name="margin_left">40</property>
             <property name="pixel_size">48</property>
             <property name="icon_name">video-display</property>
           </object>
@@ -294,6 +318,13 @@
                 <property name="xalign">0</property>
                 <property name="xpad">20</property>
                 <property name="label" translatable="yes">Enable 3D acceleration for transparency, shadows, and other desktop effects.</property>
+                <property name="justify">fill</property>
+                <property name="wrap">True</property>
+                <property name="width_chars">50</property>
+                <property name="max_width_chars">50</property>
+                <attributes>
+                  <attribute name="font-desc" value="Sans 8"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -313,7 +344,8 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="valign">center</property>
-            <property name="margin_right">80</property>
+            <property name="margin_left">90</property>
+            <property name="margin_right">20</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -336,7 +368,7 @@
           <object class="GtkImage" id="image_office">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">80</property>
+            <property name="margin_left">40</property>
             <property name="pixel_size">48</property>
             <property name="icon_name">accessories-text-editor</property>
           </object>
@@ -374,6 +406,13 @@
                 <property name="xalign">0</property>
                 <property name="xpad">20</property>
                 <property name="label" translatable="yes">Open source office suite that supports editing MS Office files.</property>
+                <property name="justify">fill</property>
+                <property name="wrap">True</property>
+                <property name="width_chars">50</property>
+                <property name="max_width_chars">50</property>
+                <attributes>
+                  <attribute name="font-desc" value="Sans 8"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -393,7 +432,8 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="valign">center</property>
-            <property name="margin_right">80</property>
+            <property name="margin_left">90</property>
+            <property name="margin_right">20</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -416,7 +456,7 @@
           <object class="GtkImage" id="image_third_party">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">80</property>
+            <property name="margin_left">40</property>
             <property name="pixel_size">48</property>
             <property name="icon_name">system-software-update</property>
           </object>
@@ -454,6 +494,13 @@
                 <property name="xalign">0</property>
                 <property name="xpad">20</property>
                 <property name="label" translatable="yes">Third-party software to play Flash videos, MP3 audio, and other media.</property>
+                <property name="justify">fill</property>
+                <property name="wrap">True</property>
+                <property name="width_chars">50</property>
+                <property name="max_width_chars">50</property>
+                <attributes>
+                  <attribute name="font-desc" value="Sans 8"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -473,7 +520,8 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="valign">center</property>
-            <property name="margin_right">80</property>
+            <property name="margin_left">90</property>
+            <property name="margin_right">20</property>
           </object>
           <packing>
             <property name="expand">False</property>

diff --git a/ui/installation_automatic.ui b/ui/installation_automatic.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Sun Nov  3 15:57:59 2013 -->
+<!-- Generated with glade 3.16.0 on Mon Dec  2 02:52:36 2013 -->
 <interface>
   <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkBox" id="installation_automatic">
@@ -191,6 +191,7 @@ and click the button below to start the process.</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="margin_right">6</property>
+                    <property name="visibility">False</property>
                     <property name="input_purpose">password</property>
                     <signal name="changed" handler="on_luks_password_changed" swapped="no"/>
                   </object>
@@ -229,6 +230,7 @@ and click the button below to start the process.</property>
                   <object class="GtkEntry" id="entry_luks_password_confirm">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="visibility">False</property>
                     <property name="input_purpose">password</property>
                     <signal name="changed" handler="on_luks_password_changed" swapped="no"/>
                   </object>