X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=RepoStatusPopover.vala;h=b43c6eef87c0fb2207aeb130502e7a230ff1e17e;hb=7650c3d24f43364f9f88a7515e9b9823cdecf875;hp=5364fcd381e179a09e681d59ad95745787e57063;hpb=005e856ef0c36a43d6417539c28f6fd42dbaec56;p=gitlive diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala index 5364fcd3..b43c6eef 100644 --- a/RepoStatusPopover.vala +++ b/RepoStatusPopover.vala @@ -16,6 +16,7 @@ public class RepoStatusPopover : Object public Xcls_label_diff label_diff; public Xcls_status_view status_view; public Xcls_diff_view diff_view; + public Xcls_btn_merge btn_merge; // my vars (def) public GitRepo repo; @@ -59,6 +60,13 @@ public class RepoStatusPopover : Object //this.el.set_position(Gtk.PositionType.RIGHT); + if (repo.activeTicket == null) { + _this.btn_merge.el.set_sensitive(false); + } else { + _this.btn_merge.el.set_sensitive(true); + } + + // window + header? GLib.debug("SHOWALL - POPIP\n"); this.el.show_all(); @@ -86,17 +94,242 @@ public class RepoStatusPopover : Object // set gobject values this.el.homogeneous = false; this.el.border_width = 5; - var child_0 = new Xcls_Notebook3( _this ); + var child_0 = new Xcls_Box3( _this ); child_0.ref(); - this.el.pack_start ( child_0.el , true,true,0 ); - var child_1 = new Xcls_Box12( _this ); + this.el.pack_start ( child_0.el , false,false,0 ); + var child_1 = new Xcls_Notebook9( _this ); child_1.ref(); - this.el.pack_end ( child_1.el , false,false,0 ); + this.el.add ( child_1.el ); + var child_2 = new Xcls_Box18( _this ); + child_2.ref(); + this.el.pack_end ( child_2.el , false,false,0 ); } // user defined functions } - public class Xcls_Notebook3 : Object + public class Xcls_Box3 : Object + { + public Gtk.Box el; + private RepoStatusPopover _this; + + + // my vars (def) + + // ctor + public Xcls_Box3(RepoStatusPopover _owner ) + { + _this = _owner; + this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 ); + + // my vars (dec) + + // set gobject values + this.el.homogeneous = true; + this.el.expand = false; + this.el.vexpand = false; + var child_0 = new Xcls_Toolbar4( _this ); + child_0.ref(); + this.el.add ( child_0.el ); + } + + // user defined functions + } + public class Xcls_Toolbar4 : Object + { + public Gtk.Toolbar el; + private RepoStatusPopover _this; + + + // my vars (def) + + // ctor + public Xcls_Toolbar4(RepoStatusPopover _owner ) + { + _this = _owner; + this.el = new Gtk.Toolbar(); + + // my vars (dec) + + // set gobject values + this.el.toolbar_style = Gtk.ToolbarStyle.BOTH_HORIZ; + var child_0 = new Xcls_ToolButton5( _this ); + child_0.ref(); + this.el.add ( child_0.el ); + var child_1 = new Xcls_ToolButton6( _this ); + child_1.ref(); + this.el.add ( child_1.el ); + var child_2 = new Xcls_ToolButton7( _this ); + child_2.ref(); + this.el.add ( child_2.el ); + var child_3 = new Xcls_ToolButton8( _this ); + child_3.ref(); + this.el.add ( child_3.el ); + } + + // user defined functions + } + public class Xcls_ToolButton5 : Object + { + public Gtk.ToolButton el; + private RepoStatusPopover _this; + + + // my vars (def) + + // ctor + public Xcls_ToolButton5(RepoStatusPopover _owner ) + { + _this = _owner; + this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-undo", Gtk.IconSize.SMALL_TOOLBAR), null);; + + // my vars (dec) + + // set gobject values + this.el.label = "Stash Changes"; + this.el.is_important = true; + + //listeners + this.el.button_press_event.connect( () => { + + + GitMonitor.gitmonitor.stop(); + _this.repo.git({ "stash" , "--all" }); + _this.repo.loadStatus(); + GitMonitor.gitmonitor.start(); + _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff); + _this.status_view.el.get_buffer().set_text(_this.repo.git_status); + Clones.singleton().reposStore.load(); + + _this.el.hide(); + return false; + }); + } + + // user defined functions + } + + public class Xcls_ToolButton6 : Object + { + public Gtk.ToolButton el; + private RepoStatusPopover _this; + + + // my vars (def) + + // ctor + public Xcls_ToolButton6(RepoStatusPopover _owner ) + { + _this = _owner; + this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-save", Gtk.IconSize.SMALL_TOOLBAR), null);; + + // my vars (dec) + + // set gobject values + this.el.label = "Commit Changes"; + this.el.is_important = true; + + //listeners + this.el.button_press_event.connect( () => { + _this.repo.git({ "commit" , "-a" ,"-m", "Uncommited changes synced" }); + _this.repo.push(); + _this.repo.loadStatus(); + + _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff); + _this.status_view.el.get_buffer().set_text(_this.repo.git_status); + + _this.el.hide(); + Clones.singleton().reposStore.load(); + + return false; + }); + } + + // user defined functions + } + + public class Xcls_ToolButton7 : Object + { + public Gtk.ToolButton el; + private RepoStatusPopover _this; + + + // my vars (def) + + // ctor + public Xcls_ToolButton7(RepoStatusPopover _owner ) + { + _this = _owner; + this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-revert-to-saved", Gtk.IconSize.SMALL_TOOLBAR), null);; + + // my vars (dec) + + // set gobject values + this.el.label = "Reset / clear changes"; + this.el.is_important = true; + + //listeners + this.el.button_press_event.connect( () => { + + + GitMonitor.gitmonitor.stop(); + _this.repo.git({ "reset" , "--hard" }); + _this.repo.loadStatus(); + GitMonitor.gitmonitor.start(); + _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff); + _this.status_view.el.get_buffer().set_text(_this.repo.git_status); + Clones.singleton().reposStore.load(); + + _this.el.hide(); + return false; + }); + } + + // user defined functions + } + + public class Xcls_ToolButton8 : Object + { + public Gtk.ToolButton el; + private RepoStatusPopover _this; + + + // my vars (def) + + // ctor + public Xcls_ToolButton8(RepoStatusPopover _owner ) + { + _this = _owner; + this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-goto-bottom", Gtk.IconSize.SMALL_TOOLBAR), null);; + + // my vars (dec) + + // set gobject values + this.el.label = "Pull updates"; + this.el.is_important = true; + + //listeners + this.el.button_press_event.connect( () => { + + + GitMonitor.gitmonitor.stop(); + _this.repo.git({ "pull" , "--all" }); + _this.repo.loadStatus(); + GitMonitor.gitmonitor.start(); + _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff); + _this.status_view.el.get_buffer().set_text(_this.repo.git_status); + Clones.singleton().reposStore.load(); + + _this.el.hide(); + return false; + }); + } + + // user defined functions + } + + + + public class Xcls_Notebook9 : Object { public Gtk.Notebook el; private RepoStatusPopover _this; @@ -105,7 +338,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Notebook3(RepoStatusPopover _owner ) + public Xcls_Notebook9(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Notebook(); @@ -113,14 +346,15 @@ public class RepoStatusPopover : Object // my vars (dec) // set gobject values + this.el.vexpand = true; var child_0 = new Xcls_label_status( _this ); child_0.ref(); var child_1 = new Xcls_label_diff( _this ); child_1.ref(); - var child_2 = new Xcls_Box6( _this ); + var child_2 = new Xcls_Box12( _this ); child_2.ref(); this.el.append_page ( child_2.el , _this.label_status.el ); - var child_3 = new Xcls_Box9( _this ); + var child_3 = new Xcls_Box15( _this ); child_3.ref(); this.el.append_page ( child_3.el , _this.label_diff.el ); } @@ -173,7 +407,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Box6 : Object + public class Xcls_Box12 : Object { public Gtk.Box el; private RepoStatusPopover _this; @@ -182,7 +416,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Box6(RepoStatusPopover _owner ) + public Xcls_Box12(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); @@ -191,14 +425,14 @@ public class RepoStatusPopover : Object // set gobject values this.el.homogeneous = false; - var child_0 = new Xcls_ScrolledWindow7( _this ); + var child_0 = new Xcls_ScrolledWindow13( _this ); child_0.ref(); this.el.pack_start ( child_0.el , true,true,0 ); } // user defined functions } - public class Xcls_ScrolledWindow7 : Object + public class Xcls_ScrolledWindow13 : Object { public Gtk.ScrolledWindow el; private RepoStatusPopover _this; @@ -207,7 +441,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_ScrolledWindow7(RepoStatusPopover _owner ) + public Xcls_ScrolledWindow13(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.ScrolledWindow( null, null ); @@ -251,7 +485,7 @@ public class RepoStatusPopover : Object - public class Xcls_Box9 : Object + public class Xcls_Box15 : Object { public Gtk.Box el; private RepoStatusPopover _this; @@ -260,7 +494,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Box9(RepoStatusPopover _owner ) + public Xcls_Box15(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); @@ -269,14 +503,14 @@ public class RepoStatusPopover : Object // set gobject values this.el.homogeneous = false; - var child_0 = new Xcls_ScrolledWindow10( _this ); + var child_0 = new Xcls_ScrolledWindow16( _this ); child_0.ref(); this.el.pack_start ( child_0.el , true,true,0 ); } // user defined functions } - public class Xcls_ScrolledWindow10 : Object + public class Xcls_ScrolledWindow16 : Object { public Gtk.ScrolledWindow el; private RepoStatusPopover _this; @@ -285,7 +519,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_ScrolledWindow10(RepoStatusPopover _owner ) + public Xcls_ScrolledWindow16(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.ScrolledWindow( null, null ); @@ -331,7 +565,7 @@ public class RepoStatusPopover : Object - public class Xcls_Box12 : Object + public class Xcls_Box18 : Object { public Gtk.Box el; private RepoStatusPopover _this; @@ -340,7 +574,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Box12(RepoStatusPopover _owner ) + public Xcls_Box18(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 ); @@ -351,123 +585,63 @@ public class RepoStatusPopover : Object this.el.homogeneous = true; this.el.expand = false; this.el.vexpand = false; - var child_0 = new Xcls_Button13( _this ); + var child_0 = new Xcls_Toolbar19( _this ); child_0.ref(); this.el.add ( child_0.el ); - var child_1 = new Xcls_Button14( _this ); - child_1.ref(); - this.el.add ( child_1.el ); - var child_2 = new Xcls_Button15( _this ); - child_2.ref(); - this.el.add ( child_2.el ); - var child_3 = new Xcls_Button16( _this ); - child_3.ref(); - this.el.add ( child_3.el ); - var child_4 = new Xcls_Button17( _this ); - child_4.ref(); - this.el.add ( child_4.el ); - var child_5 = new Xcls_Button18( _this ); - child_5.ref(); - this.el.add ( child_5.el ); - } - - // user defined functions - } - public class Xcls_Button13 : Object - { - public Gtk.Button el; - private RepoStatusPopover _this; - - - // my vars (def) - - // ctor - public Xcls_Button13(RepoStatusPopover _owner ) - { - _this = _owner; - this.el = new Gtk.Button(); - - // my vars (dec) - - // set gobject values - this.el.label = "Stash Changes"; - - //listeners - this.el.button_press_event.connect( () => { - - - GitMonitor.gitmonitor.stop(); - _this.repo.git({ "stash" , "--all" }); - _this.repo.loadStatus(); - GitMonitor.gitmonitor.start(); - _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff); - _this.status_view.el.get_buffer().set_text(_this.repo.git_status); - Clones.singleton().reposStore.load(); - - _this.el.hide(); - return false; - }); } // user defined functions } - - public class Xcls_Button14 : Object + public class Xcls_Toolbar19 : Object { - public Gtk.Button el; + public Gtk.Toolbar el; private RepoStatusPopover _this; // my vars (def) // ctor - public Xcls_Button14(RepoStatusPopover _owner ) + public Xcls_Toolbar19(RepoStatusPopover _owner ) { _this = _owner; - this.el = new Gtk.Button(); + this.el = new Gtk.Toolbar(); // my vars (dec) // set gobject values - this.el.label = "Commit Changes"; - - //listeners - this.el.button_press_event.connect( () => { - _this.repo.git({ "commit" , "-a" ,"-m", "Uncommited changes synced" }); - _this.repo.push(); - _this.repo.loadStatus(); - - _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff); - _this.status_view.el.get_buffer().set_text(_this.repo.git_status); - - _this.el.hide(); - Clones.singleton().reposStore.load(); - - return false; - }); + this.el.toolbar_style = Gtk.ToolbarStyle.BOTH_HORIZ; + var child_0 = new Xcls_ToolButton20( _this ); + child_0.ref(); + this.el.add ( child_0.el ); + var child_1 = new Xcls_btn_merge( _this ); + child_1.ref(); + this.el.add ( child_1.el ); + var child_2 = new Xcls_ToolButton22( _this ); + child_2.ref(); + this.el.add ( child_2.el ); } // user defined functions } - - public class Xcls_Button15 : Object + public class Xcls_ToolButton20 : Object { - public Gtk.Button el; + public Gtk.ToolButton el; private RepoStatusPopover _this; // my vars (def) // ctor - public Xcls_Button15(RepoStatusPopover _owner ) + public Xcls_ToolButton20(RepoStatusPopover _owner ) { _this = _owner; - this.el = new Gtk.Button(); + this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-add", Gtk.IconSize.SMALL_TOOLBAR), null);; // my vars (dec) // set gobject values - this.el.label = "Create Branch"; + this.el.label = "Create Branch / Start ticket"; + this.el.is_important = true; //listeners this.el.button_press_event.connect( () => { @@ -483,116 +657,72 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button16 : Object + public class Xcls_btn_merge : Object { - public Gtk.Button el; + public Gtk.ToolButton el; private RepoStatusPopover _this; // my vars (def) // ctor - public Xcls_Button16(RepoStatusPopover _owner ) + public Xcls_btn_merge(RepoStatusPopover _owner ) { _this = _owner; - this.el = new Gtk.Button(); + _this.btn_merge = this; + this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-goto-top", Gtk.IconSize.SMALL_TOOLBAR), null);; // my vars (dec) // set gobject values - this.el.label = "Reset to remote"; + this.el.label = "Merge branch / Complete ticket"; + this.el.is_important = true; //listeners - this.el.button_press_event.connect( () => { - - - GitMonitor.gitmonitor.stop(); - _this.repo.git({ "reset" , "--hard" }); - _this.repo.loadStatus(); - GitMonitor.gitmonitor.start(); - _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff); - _this.status_view.el.get_buffer().set_text(_this.repo.git_status); - Clones.singleton().reposStore.load(); - + this.el.clicked.connect( () => { + _this.el.hide(); - return false; + Clones.singleton().el.response(-1); + if (_this.repo.activeTicket != null) { + MergeBranch.singleton().show(_this.repo.activeTicket, null); + } + return ; }); } // user defined functions } - public class Xcls_Button17 : Object + public class Xcls_ToolButton22 : Object { - public Gtk.Button el; + public Gtk.ToolButton el; private RepoStatusPopover _this; // my vars (def) // ctor - public Xcls_Button17(RepoStatusPopover _owner ) + public Xcls_ToolButton22(RepoStatusPopover _owner ) { _this = _owner; - this.el = new Gtk.Button(); + this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-new", Gtk.IconSize.SMALL_TOOLBAR), null);; // my vars (dec) // set gobject values - this.el.label = "Pull updates"; + this.el.label = "Create Ticket"; + this.el.is_important = true; //listeners this.el.button_press_event.connect( () => { - - GitMonitor.gitmonitor.stop(); - _this.repo.git({ "pull" , "--all" }); - _this.repo.loadStatus(); - GitMonitor.gitmonitor.start(); - _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff); - _this.status_view.el.get_buffer().set_text(_this.repo.git_status); - Clones.singleton().reposStore.load(); + + + Clones.singleton().el.response(-1); _this.el.hide(); - return false; - }); - } - - // user defined functions - } - - public class Xcls_Button18 : Object - { - public Gtk.Button el; - private RepoStatusPopover _this; - - - // my vars (def) - - // ctor - public Xcls_Button18(RepoStatusPopover _owner ) - { - _this = _owner; - this.el = new Gtk.Button(); - - // my vars (dec) - - // set gobject values - this.el.label = "Pull updates"; - - //listeners - this.el.button_press_event.connect( () => { - + Ticket.singleton().show( _this.repo); - GitMonitor.gitmonitor.stop(); - _this.repo.git({ "pull" , "--all" }); - _this.repo.loadStatus(); - GitMonitor.gitmonitor.start(); - _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff); - _this.status_view.el.get_buffer().set_text(_this.repo.git_status); - Clones.singleton().reposStore.load(); - - _this.el.hide(); return false; }); } @@ -602,4 +732,5 @@ public class RepoStatusPopover : Object + }