Merge pull request #270 from torikulhabib/master

Remove withspace

src/AddUrl.vala

@@ -147,6 +147,12 @@ namespace Gabut {
             }
         }
 
+        public string linked {
+            get {
+                return link_entry.text;
+            }
+        }
+
         public AddUrl (Gtk.Application application) {
             Object (application: application,
                     dialogtype: DialogType.ADDURL,
@@ -635,18 +641,11 @@ namespace Gabut {
                     box_action.set_end_widget (close_button);
                     break;
             }
-
-            var maingrid = new Gtk.Grid () {
-                orientation = Gtk.Orientation.VERTICAL,
-                halign = Gtk.Align.CENTER,
-                hexpand = true,
-                margin_start = 10,
-                margin_end = 10
-            };
-            maingrid.attach (stack, 0, 0);
-            maingrid.attach (box_action, 0, 1);
-
-            child = maingrid;
+            var boxarea = get_content_area ();
+            boxarea.margin_start = 10;
+            boxarea.margin_end = 10;
+            boxarea.append (stack);
+            boxarea.append (box_action);
 
             view_mode.notify["selected"].connect (() => {
                 switch (view_mode.selected) {
@@ -852,10 +851,6 @@ namespace Gabut {
             status_image.gicon = new ThemedIcon (icon);
         }
 
-        public string get_link () {
-            return link_entry.text;
-        }
-
         public void server_link (MatchInfo match_info) {
             link_entry.text = match_info.fetch (PostServer.URL);
             name_entry.text = match_info.fetch (PostServer.FILENAME);
@@ -966,4 +961,4 @@ namespace Gabut {
             }
         }
     }
-}
+}

src/AlertView.vala

@@ -1,5 +1,5 @@
 namespace Gabut {
-    public class AlertView : Gtk.Box {
+    public class AlertView : Gtk.Grid {
         public string title {
             get {
                 return title_label.label;
@@ -37,7 +37,7 @@ namespace Gabut {
         private Gtk.Image image;
 
         public AlertView (string title, string description, string icon_name) {
-            Object (title: title, description: description, icon_name: icon_name);
+            Object (title: title, description: description, icon_name: icon_name, column_spacing: 12, row_spacing: 6, halign: Gtk.Align.CENTER, valign: Gtk.Align.CENTER,vexpand: true);
         }
 
         construct {
@@ -66,20 +66,9 @@ namespace Gabut {
                 icon_size = Gtk.IconSize.LARGE,
                 pixel_size = 64
             };
-
-            var layout = new Gtk.Grid () {
-                column_spacing = 12,
-                row_spacing = 6,
-                halign = Gtk.Align.CENTER,
-                valign = Gtk.Align.CENTER,
-                vexpand = true
-            };
-
-            layout.attach (image, 1, 1, 1, 2);
-            layout.attach (title_label, 2, 1, 1, 1);
-            layout.attach (description_label, 2, 2, 1, 1);
-
-            append (layout);
+            attach (image, 1, 1, 1, 2);
+            attach (title_label, 2, 1, 1, 1);
+            attach (description_label, 2, 2, 1, 1);
         }
     }
 }

src/Application.vala

@@ -320,7 +320,7 @@ namespace Gabut {
         private bool url_active (string url) {
             bool active = false;
             addurls.foreach ((urls)=> {
-                if (urls.get_link () == url) {
+                if (urls.linked == url) {
                     active = true;
                 }
             });
@@ -432,4 +432,4 @@ namespace Gabut {
             return app.run (args);
         }
     }
-}
+}

src/BTEncrypt.vala

@@ -40,4 +40,4 @@ namespace Gabut {
             show ();
         }
     }
-}
+}

src/CanonicalDbusmenu.vala

@@ -130,4 +130,4 @@ namespace Gabut {
             id_errors = {};
         }
     }
-}
+}

src/ChecksumType.vala

@@ -40,4 +40,4 @@ namespace Gabut {
             show ();
         }
     }
-}
+}

src/DbusIndicator.vala

@@ -125,4 +125,4 @@ namespace Gabut {
         public void secondary_activate (int x, int y) throws GLib.Error {}
         public void x_ayatana_secondary_activate (uint timestamp) throws GLib.Error {}
     }
-}
+}

src/DbusmenuItem.vala

@@ -130,4 +130,4 @@ namespace Gabut {
             });
         }
     }
-}
+}

src/DownloadRow.vala

@@ -716,4 +716,4 @@ namespace Gabut {
             return urisel_popover;
         }
     }
-}
+}

src/Downloader.vala

@@ -446,6 +446,7 @@ namespace Gabut {
 
             var boxstatus = new Gtk.Grid () {
                 halign = Gtk.Align.CENTER,
+                valign = Gtk.Align.CENTER,
                 hexpand = true,
                 orientation = Gtk.Orientation.VERTICAL
             };
@@ -521,15 +522,12 @@ namespace Gabut {
                 transition_type = Gtk.RevealerTransitionType.SWING_DOWN,
                 child = connpeers
             };
-
-            var maingrid = new Gtk.Box (Gtk.Orientation.VERTICAL, 0) {
-                hexpand = true,
-                margin_start = 10,
-                margin_end = 10
-            };
-            maingrid.append (boxstatus);
-            maingrid.append (centerbox);
-            maingrid.append (revcon);
+            var boxarea = get_content_area ();
+            boxarea.margin_start = 10;
+            boxarea.margin_end = 10;
+            boxarea.append (boxstatus);
+            boxarea.append (centerbox);
+            boxarea.append (revcon);
 
             notify["switch-rev"].connect (()=> {
                 if (switch_rev) {
@@ -559,7 +557,6 @@ namespace Gabut {
                         break;
                 }
             });
-            child = maingrid;
         }
 
         public override void show () {
@@ -803,4 +800,4 @@ namespace Gabut {
             return exist;
         }
     }
-}
+}

src/FileAllocation.vala

@@ -41,4 +41,4 @@ namespace Gabut {
             show ();
         }
     }
-}
+}

src/GabutServer.vala

@@ -632,4 +632,4 @@ namespace Gabut {
             }
         }
     }
-}
+}

src/GabutSucces.vala

@@ -59,4 +59,4 @@ namespace Gabut {
             return builder.str;
         }
     }
-}
+}

src/GabutWindow.vala

@@ -1312,4 +1312,4 @@ namespace Gabut {
             listrow.sort (sort_dm);
         }
     }
-}
+}

src/GdmMenu.vala

@@ -45,4 +45,4 @@ namespace Gabut {
             show ();
         }
     }
-}
+}

src/GdmOutstream.vala

@@ -37,4 +37,4 @@ namespace Gabut {
 			return stream.close ();
 		}
 	}
-}
+}

src/GdmPaint.vala

@@ -46,4 +46,4 @@ namespace Gabut {
             snapshot (snaps, width, height);
         }
     }
-}
+}

src/LoginUser.vala

@@ -40,4 +40,4 @@ namespace Gabut {
             show ();
         }
     }
-}
+}

src/MediaEntry.vala

@@ -97,4 +97,4 @@ namespace Gabut {
             text = value.get_string ();
         }
     }
-}
+}

src/ModeButton.vala

@@ -109,4 +109,4 @@ namespace Gabut {
             }
         }
     }
-}
+}

src/PeersRow.vala

@@ -188,4 +188,4 @@ namespace Gabut {
             child = grid;
         }
     }
-}
+}

src/PieceSelector.vala

@@ -41,4 +41,4 @@ namespace Gabut {
             show ();
         }
     }
-}
+}

src/Preferences.vala

@@ -885,22 +885,17 @@ namespace Gabut {
                 margin_bottom = 10,
                 column_spacing = 10,
                 column_homogeneous = true,
-                halign = Gtk.Align.CENTER,
-                orientation = Gtk.Orientation.HORIZONTAL
+                halign = Gtk.Align.CENTER
             };
             box_action.attach (save_button, 0, 0);
             box_action.attach (close_button, 1, 0);
 
-            var maingrid = new Gtk.Grid () {
-                orientation = Gtk.Orientation.VERTICAL,
-                halign = Gtk.Align.CENTER,
-                margin_start = 10,
-                margin_end = 10
-            };
-            maingrid.attach (stack, 0, 0);
-            maingrid.attach (box_action, 0, 1);
-
-            child = maingrid;
+            var boxarea = get_content_area ();
+            boxarea.margin_start = 10;
+            boxarea.margin_end = 10;
+            boxarea.halign = Gtk.Align.CENTER;
+            boxarea.append (stack);
+            boxarea.append (box_action);
             view_mode.notify["selected"].connect (() => {
                 switch (view_mode.selected) {
                     case 1:
@@ -922,4 +917,4 @@ namespace Gabut {
             });
         }
     }
-}
+}

src/ProgressPaint.vala

@@ -45,4 +45,4 @@ namespace Gabut {
             cr.stroke ();
         }
     }
-}
+}

src/ProxyMethod.vala

@@ -40,4 +40,4 @@ namespace Gabut {
             show ();
         }
     }
-}
+}

src/ProxyType.vala

@@ -40,4 +40,4 @@ namespace Gabut {
             show ();
         }
     }
-}
+}

src/QrCode.vala

@@ -199,4 +199,4 @@ namespace Gabut {
             imageqr.paintable = snapshot.free_to_paintable (grapinsize);
         }
     }
-}
+}

src/ServerComplete.vala

@@ -110,4 +110,4 @@ namespace Gabut {
         </html>
     ";
     }
-}
+}

src/ServerCss.vala

@@ -453,4 +453,4 @@ namespace Gabut {
             }
         }";
     }
-}
+}

src/ServerDM.vala

@@ -168,4 +168,4 @@ namespace Gabut {
         </html>
         ";
     }
-}
+}

src/ServerHome.vala

@@ -90,4 +90,4 @@ namespace Gabut {
         </html>
         ";
     }
-}
+}

src/ServerNotFound.vala

@@ -202,4 +202,4 @@ namespace Gabut {
         </html>
     ";
     }
-}
+}

src/ServerRow.vala

@@ -114,4 +114,4 @@ namespace Gabut {
             child = grid;
         }
     }
-}
+}

src/ServerShare.vala

@@ -80,4 +80,4 @@ namespace Gabut {
         </html>
     ";
     }
-}
+}