cleanup coding style of previous commit and hide the menubar
This commit is contained in:
parent
82032fbc69
commit
44a92dca86
|
@ -29,7 +29,7 @@ namespace SparkleShare {
|
||||||
public readonly string LocalPath;
|
public readonly string LocalPath;
|
||||||
private VBox LayoutVertical;
|
private VBox LayoutVertical;
|
||||||
private ScrolledWindow ScrolledWindow;
|
private ScrolledWindow ScrolledWindow;
|
||||||
|
private MenuBar MenuBar;
|
||||||
|
|
||||||
// Short alias for the translations
|
// Short alias for the translations
|
||||||
public static string _ (string s)
|
public static string _ (string s)
|
||||||
|
@ -57,36 +57,46 @@ namespace SparkleShare {
|
||||||
Close ();
|
Close ();
|
||||||
};
|
};
|
||||||
|
|
||||||
// ****************cordoval@gmail.com***************************
|
|
||||||
// adds hidden menu bar and File top menu item >> Close menu subitem
|
// Adds a hidden menubar that contains to enable keyboard
|
||||||
MenuBar mb = new MenuBar ();
|
// shortcuts to close the log
|
||||||
Menu filemenu = new Menu ();
|
MenuBar = new MenuBar ();
|
||||||
MenuItem file = new MenuItem ("File");
|
|
||||||
file.Submenu = filemenu;
|
MenuItem file_item = new MenuItem ("File");
|
||||||
MenuItem exit1 = new MenuItem ("Close1");
|
|
||||||
MenuItem exit2 = new MenuItem ("Close2");
|
Menu file_menu = new Menu ();
|
||||||
|
|
||||||
|
MenuItem close_1 = new MenuItem ("Close1");
|
||||||
|
MenuItem close_2 = new MenuItem ("Close2");
|
||||||
|
|
||||||
// adds specific Ctrl+W and Esc key accelerators to Log Window
|
// adds specific Ctrl+W and Esc key accelerators to Log Window
|
||||||
AccelGroup agr = new AccelGroup ();
|
AccelGroup accel_group = new AccelGroup ();
|
||||||
AddAccelGroup (agr);
|
AddAccelGroup (accel_group);
|
||||||
exit1.AddAccelerator ("activate", agr, new AccelKey(Gdk.Key.W, Gdk.ModifierType.ControlMask, AccelFlags.Visible));
|
|
||||||
exit2.AddAccelerator ("activate", agr, new AccelKey(Gdk.Key.Escape, Gdk.ModifierType.None, AccelFlags.Visible));
|
|
||||||
|
|
||||||
exit1.Activated += delegate { Close (); };
|
// Close on Esc
|
||||||
exit2.Activated += delegate { Close (); };
|
close_1.AddAccelerator ("activate", accel_group, new AccelKey (Gdk.Key.W, Gdk.ModifierType.ControlMask,
|
||||||
|
AccelFlags.Visible));
|
||||||
|
|
||||||
filemenu.Append (exit1);
|
close_1.Activated += delegate { Close (); };
|
||||||
filemenu.Append (exit2);
|
|
||||||
mb.Append (file);
|
|
||||||
|
|
||||||
// *******************************************
|
// Close on Ctrl+W
|
||||||
|
close_2.AddAccelerator ("activate", accel_group, new AccelKey (Gdk.Key.Escape, Gdk.ModifierType.None,
|
||||||
|
AccelFlags.Visible));
|
||||||
|
close_2.Activated += delegate { Close (); };
|
||||||
|
|
||||||
|
file_menu.Append (close_1);
|
||||||
|
file_menu.Append (close_2);
|
||||||
|
|
||||||
LayoutVertical = new VBox (false, 12);
|
file_item.Submenu = file_menu;
|
||||||
|
|
||||||
|
MenuBar.Append (file_item);
|
||||||
|
|
||||||
LayoutVertical.PackStart(mb, false, false, 0);
|
// Hacky way to hide the menubar, but the accellerators
|
||||||
//mb.Hide(); //it does not hide it -- TODO please make sure it hides the menu bar
|
// will simply be disabled when using Hide ()
|
||||||
|
MenuBar.HeightRequest = 1;
|
||||||
|
MenuBar.ModifyBg (StateType.Normal, Style.Background (StateType.Normal));
|
||||||
|
|
||||||
|
LayoutVertical = new VBox (false, 0);
|
||||||
|
|
||||||
LayoutVertical.PackStart (CreateEventLog (), true, true, 0);
|
LayoutVertical.PackStart (CreateEventLog (), true, true, 0);
|
||||||
|
|
||||||
|
@ -119,6 +129,8 @@ namespace SparkleShare {
|
||||||
dialog_buttons.Add (open_folder_button);
|
dialog_buttons.Add (open_folder_button);
|
||||||
dialog_buttons.Add (close_button);
|
dialog_buttons.Add (close_button);
|
||||||
|
|
||||||
|
// We have to hide the menubar somewhere...
|
||||||
|
LayoutVertical.PackStart (MenuBar, false, false, 6);
|
||||||
LayoutVertical.PackStart (dialog_buttons, false, false, 0);
|
LayoutVertical.PackStart (dialog_buttons, false, false, 0);
|
||||||
|
|
||||||
Add (LayoutVertical);
|
Add (LayoutVertical);
|
||||||
|
|
Loading…
Reference in a new issue