(NewWindow, NewDialog) simplify by using _create_dialog()

1 files changed, 36 insertions, 60 deletions

diff --git a/userdrake b/userdrake
index 3b3a57c..89fefe2 100755
--- a/userdrake
+++ b/userdrake
@@ -300,8 +300,7 @@ sub AddUser() {
     my $w = NewWindow(N("Create New User"));
     my $dontcreatehomedir = 0; my $is_system = 0;
     my %u; 
-    gtkadd($w,
-	   gtkpack_(Gtk2::VBox->new(0, 2),
+    gtkpack_($w->vbox,
 		    0, BuildUui(),
 		    0, Gtk2::HSeparator->new,
 		    0, $us->{o}{createhomedir} = Gtk2::CheckButton->new(N("Create Home Directory")),
@@ -313,9 +312,9 @@ sub AddUser() {
 		    0, $us->{o}{userid} = Gtk2::CheckButton->new(N("Specify user ID manually")),
 		    0, gtkset_sensitive(my $h = Gtk2::HBox->new(0, 4), 0),
 		    0, Gtk2::HSeparator->new,
-                    0, GetFaceIcon(),
-		    0, Gtk2::HSeparator->new,
-		    0, gtkpack(create_hbox('edge'),
+                    0, GetFaceIcon()
+    );
+    gtkadd($w->action_area,
 			       map {
 				   my $r = $_->[1];
 				   gtksignal_connect(Gtk2::Button->new($_->[0]), clicked => sub {
@@ -380,8 +379,7 @@ sub AddUser() {
 							     }
 							 }
 							 !$error and $w->destroy; $error = 0 });
-			       } ([ N("Cancel"), 1 ], [ N("Ok"), 0 ])), 
-		   )
+			       } ([ N("Cancel"), 1 ], [ N("Ok"), 0 ]), 
 	  );
     foreach (qw(privategroup createhomedir)) { $us->{o}{$_}->set_active(1) }
     GrayBox($us->{o}{createhomedir}, $vv, 1);
@@ -396,7 +394,6 @@ sub AddUser() {
     $h->pack_end(Gtk2::Label->new(N("UID: ")), 0, 0, 4);
     GrayBox($us->{o}{userid}, $h, 0);					
     $w->show_all;
-#    $w->main;
 }
 
 sub Add2UsersGroup {
@@ -410,18 +407,17 @@ sub ChooseGroup() {
     my $w = NewWindow(N("Choose group"));
     my $choice;
     my @radio = gtkradio(N("Add to the existing group"), (N("Add to the existing group"), N("Add to the 'users' group")));
-    gtkadd($w,
-	   gtkpack__(Gtk2::VBox->new(0,5),
+    gtkadd($w->vbox,
 		     Gtk2::Label->new(N("A group with this name already exists.  What would you like to do?")),
 		     gtkpack(Gtk2::VBox->new(0,0), @radio),
-		     Gtk2::HSeparator->new,
-		     gtkpack(create_hbox('edge'),
+              );
+    gtkadd($w->action_area,
 			     gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => sub {
 						   each_index { $_->get_active and $choice = $::i } @radio;
 						   $w->destroy;
 						   Gtk2->main_quit;
 					       }), 
-			     gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { $error = 1; $w->destroy; Gtk2->main_quit }))));
+			     gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { $error = 1; $w->destroy; Gtk2->main_quit }));
     $w->show_all;
     Gtk2->main;
     $choice;
@@ -436,14 +432,13 @@ sub GimmeChoice {
 sub AddGroup() {
     my $w = NewWindow(N("Create New Group"));
     my $mode = 0; my %g; my $is_system = 0;
-    gtkadd($w,
-	   gtkpack_(Gtk2::VBox->new(0, 2),
+    gtkpack_($w->vbox,
 		    0, BuildGui(),
 		    0, Gtk2::HSeparator->new,
 		    0, $us->{o}{groupid} = Gtk2::CheckButton->new(N("Specify group ID manually")),
 		    0, gtkset_sensitive(my $h = Gtk2::HBox->new(0, 4), 0),
-		    0, Gtk2::HSeparator->new,
-		    0, gtkpack(create_hbox('edge'),
+             );
+    gtkadd($w->action_area,
 			       map {
 				   my $r = $_->[1];
 				   gtksignal_connect(Gtk2::Button->new($_->[0]), clicked => sub {
@@ -466,16 +461,13 @@ sub AddGroup() {
 							     }
 							 }
 							 !$error and $w->destroy; $error = 0 });
-			       } ([ N("Cancel"), 1 ], [ N("Ok"), 0 ])),
-		   )
+			       } ([ N("Cancel"), 1 ], [ N("Ok"), 0 ])
 	  );
     $us->{o}{gid} = Gtk2::SpinButton->new(Gtk2::Adjustment->new(500, 1, 65000, 1, 10, 10), 1, 0);
     $h->pack_end($us->{o}{gid}, 0, 0, 4);
     $h->pack_end(Gtk2::Label->new(N("GID: ")), 0, 0, 4);
     $us->{o}{groupid}->signal_connect('clicked' => sub { $mode = !$mode; $h->set_sensitive($mode) });
     $w->show_all;
-    #$w->main;
-    
 }
 
 sub UpdateOrDelUsersInGroup {
@@ -524,13 +516,12 @@ sub Delete() {
 # New version
 	my $w = NewWindow(N("Delete files or not?"));
 	my $hd = $userEnt->HomeDir($GetValue);
-	gtkadd($w,
-	       gtkpack_(Gtk2::VBox->new(0, 2),
+	gtkpack_($w->vbox,
 			0, Gtk2::Label->new(N("Deleting user %s\n Also perform the following actions\n", $username)),
 			0, $checkhome = Gtk2::CheckButton->new(N("Delete Home Directory: %s", $hd)),
 			0, $checkspool = Gtk2::CheckButton->new(N("Delete Mailbox: /var/spool/mail/%s", $username)),
-			0, Gtk2::HSeparator->new,
-			0, gtkpack(create_hbox('edge'),
+        );
+    gtkadd($w->action_area,
 				   map {
 				       my $r = $_->[1];
 				       gtksignal_connect(Gtk2::Button->new($_->[0]), clicked => sub {
@@ -558,20 +549,17 @@ sub Delete() {
 								 Refresh($sysfilter, $stringsearch);
 							     }
 							     !$error and $w->destroy; $error = 0 });
-				   } ([ N("Cancel"), 1 ], [ N("Delete"), 0 ])),
-		       )
+				   } ([ N("Cancel"), 1 ], [ N("Delete"), 0 ]),
 	      );
 	if ($hd !~ m!(?:/home|/var/spool)!) { $checkhome->set_sensitive(0); $checkspool->set_sensitive(0) }
 	$w->show_all;
-	#$w->main;
     } elsif ($page == 1) {
 	my $groupname =  GetNameEntFromIter($grouptree, $gtree_model, 0);
 	my $wg = NewWindow(N("Delete files or not?"));
-	gtkadd($wg,
-	       gtkpack_(Gtk2::VBox->new(0, 2),
-			0, Gtk2::Label->new(N("Do you really want to delete the group %s\n", $groupname)),
-			0, Gtk2::HSeparator->new,
-			0, gtkpack(create_hbox('edge'),
+	gtkadd($wg->vbox,
+			Gtk2::Label->new(N("Do you really want to delete the group %s\n", $groupname)),
+          );
+    gtkadd($wg->action_area,
 				   map {
 				       my $r = $_->[1];
 				       gtksignal_connect(Gtk2::Button->new($_->[0]), clicked => sub {
@@ -590,11 +578,9 @@ sub Delete() {
 								     eval { $ctx->GroupDel($groupEnt) }; Refresh($sysfilter, $stringsearch) }
 							     }
 							     !$error and $wg->destroy; $error = 0 });
-				   } ([ N("Cancel"), 1 ], [ N("Delete"), 0 ])),
-		       )
+				   } ([ N("Cancel"), 1 ], [ N("Delete"), 0 ]),
 	      );
 	$wg->show_all;
-	#$wg->main;
     }
     $us->{wnd}{rwindow}->set_sensitive(1);
     gtkset_mousecursor_normal();
@@ -682,12 +668,9 @@ sub BuildGui {
 
 sub NewWindow {
     my ($title) = @_;
-    my $w = gtkset_border_width(Gtk2::Window->new('toplevel'), 5);
-    $w->set_title($title);
-    $w->set_transient_for($us->{wnd}{real_window});
+    my $w = gtkset_border_width(_create_dialog($title, { transient_for => $us->{wnd}{real_window} }),
+                                5);
     $w->signal_connect(delete_event => sub { $w->destroy });
-    $w->set_position('center_on_parent');
-    $w->set_modal(1);
     $w;
 }
 
@@ -811,11 +794,9 @@ sub Edit() {
 	}
     }
     my ($ch, $name, $uEnt, $gEnt, $ugid, $Exp);
-    gtkadd($w, 
-	   gtkpack_(Gtk2::VBox->new(0,5),
-		    1, !$p ? $nbU : $nbG,
-		    0, Gtk2::HSeparator->new,
-		    0, gtkpack(create_hbox('edge'),
+    gtkpack_($w->vbox, 
+		    1, !$p ? $nbU : $nbG);
+    gtkadd($w->action_area,
 			       map {
 				   my $retv = $_->[1];
 				   gtksignal_connect(Gtk2::Button->new($_->[0]), clicked => sub {
@@ -933,8 +914,8 @@ sub Edit() {
 							     }
 							 }
 							 !$error and $w->destroy; $error = 0  });
-			       } ([ N("Cancel"), 1 ], [ N("Ok"), 0 ])),
-		   ));
+			       } ([ N("Cancel"), 1 ], [ N("Ok"), 0 ]),
+		   );
     $tree->show;
     $w->show_all;
     $tree->signal_connect(button_press_event => sub {
@@ -981,7 +962,6 @@ sub Edit() {
 			       }
 			       0;
 			   });
-#    $w->main
 }
 
 sub ValidInt {
@@ -1026,15 +1006,12 @@ sub GrayBox {
 
 sub NewDialog {
     my ($title) = @_;
-    my $dialog = gtkset_border_width(Gtk2::Dialog->new, 10);
-    $dialog->set_transient_for($us->{wnd}{real_window});
-    $dialog->set_position('center-on-parent');
-    $dialog->set_title($title);
+    my $dialog = gtkset_border_width(_create_dialog($title, { transient_for => $us->{wnd}{real_window} }),
+                                5);
     $dialog->action_area->pack_start(gtkadd(Gtk2::HButtonBox->new,
                                             gtksignal_connect(Gtk2::Button->new(N("Close")), clicked => sub { $dialog->destroy })
                                             ),
                                      0,0,0);
-    gtkset_modal($dialog, 1);
     $dialog;
 }
 
@@ -1075,12 +1052,11 @@ sub valid_groupname {
 sub RaiseError {
     my $w = NewWindow(N("Error"));
     $error = 1;
-    gtkadd($w,
-	   gtkpack_(Gtk2::VBox->new,
-		    1, Gtk2::Label->new($_[0]),
-		    0, Gtk2::HSeparator->new,
-		    0, gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => sub { $w->destroy })
-		   ),
+    gtkpack($w->vbox,
+		    Gtk2::Label->new($_[0]),
+        );
+    gtkadd($w->action_area,
+		    gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => sub { $w->destroy })
 	  );
     $w->show_all;
 }