projects
/
gitlive
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NewBranch.bjs
[gitlive]
/
NewBranch.vala
diff --git
a/NewBranch.vala
b/NewBranch.vala
index
dac9bdc
..
0e44469
100644
(file)
--- a/
NewBranch.vala
+++ b/
NewBranch.vala
@@
-23,11
+23,12
@@
public class NewBranch : Object
public Xcls_dbcellrenderer dbcellrenderer;
public Xcls_dbmodel dbmodel;
public Xcls_name name;
public Xcls_dbcellrenderer dbcellrenderer;
public Xcls_dbmodel dbmodel;
public Xcls_name name;
- public Xcls_
createbtn create
btn;
+ public Xcls_
branchbtn branch
btn;
public Xcls_btn_not_me btn_not_me;
public Xcls_btn_closed btn_closed;
public Xcls_scrolled_window scrolled_window;
public Xcls_view view;
public Xcls_btn_not_me btn_not_me;
public Xcls_btn_closed btn_closed;
public Xcls_scrolled_window scrolled_window;
public Xcls_view view;
+ public Xcls_create_ticket_tab create_ticket_tab;
public Xcls_table table;
public Xcls_project_id project_id;
public Xcls_tprcellrenderer tprcellrenderer;
public Xcls_table table;
public Xcls_project_id project_id;
public Xcls_tprcellrenderer tprcellrenderer;
@@
-44,6
+45,7
@@
public class NewBranch : Object
public Xcls_clmodel clmodel;
public Xcls_developer_id developer_id;
public Xcls_devmodel devmodel;
public Xcls_clmodel clmodel;
public Xcls_developer_id developer_id;
public Xcls_devmodel devmodel;
+ public Xcls_quick_commit_tab quick_commit_tab;
public Xcls_commit_message commit_message;
public Xcls_createbtn createbtn;
public Xcls_diff_view diff_view;
public Xcls_commit_message commit_message;
public Xcls_createbtn createbtn;
public Xcls_diff_view diff_view;
@@
-154,7
+156,7
@@
public class NewBranch : Object
this.el.show_all();
this.el.set_keep_above(true);
this.el.show_all();
this.el.set_keep_above(true);
- _this.select_ticket_tab.load_data();
+ _this.select_ticket_tab.load_data(
tid
);
_this.create_ticket_tab.load_data();
_this.quick_commit_tab.load_data();
_this.create_ticket_tab.load_data();
_this.quick_commit_tab.load_data();
@@
-194,10
+196,10
@@
public class NewBranch : Object
var child_3 = new Xcls_select_ticket_tab( _this );
child_3.ref();
this.el.append_page ( child_3.el , _this.label_select_ticket.el );
var child_3 = new Xcls_select_ticket_tab( _this );
child_3.ref();
this.el.append_page ( child_3.el , _this.label_select_ticket.el );
- var child_4 = new Xcls_
Box25
( _this );
+ var child_4 = new Xcls_
create_ticket_tab
( _this );
child_4.ref();
this.el.append_page ( child_4.el , _this.label_create_ticket.el );
child_4.ref();
this.el.append_page ( child_4.el , _this.label_create_ticket.el );
- var child_5 = new Xcls_
Box51
( _this );
+ var child_5 = new Xcls_
quick_commit_tab
( _this );
child_5.ref();
this.el.append_page ( child_5.el , _this.label_quick_commit.el );
}
child_5.ref();
this.el.append_page ( child_5.el , _this.label_quick_commit.el );
}
@@
-301,15
+303,15
@@
public class NewBranch : Object
}
// user defined functions
}
// user defined functions
- public void load_data () {
+ public void load_data (
string tid = ""
) {
GLib.debug("Loading tickets");
GLib.debug("Loading tickets");
- var curproj = RooProject.getProjectByRepo(this.repo);
+ var curproj = RooProject.getProjectByRepo(
_
this.repo);
_this.prmodel.loadProjects(curproj == null ? "" : curproj.id);
_this.dbmodel.loadTickets(curproj == null ? "": curproj.id, tid);
_this.prmodel.loadProjects(curproj == null ? "" : curproj.id);
_this.dbmodel.loadTickets(curproj == null ? "": curproj.id, tid);
- _this.
create
btn.updateState();
+ _this.
branch
btn.updateState();
_this.ticketsel.el.get_child().get_style_context().remove_class("warning");
if (tid != "") {
_this.ticketsel.el.get_child().get_style_context().remove_class("warning");
if (tid != "") {
@@
-363,7
+365,7
@@
public class NewBranch : Object
var child_5 = new Xcls_name( _this );
child_5.ref();
this.el.attach_defaults ( child_5.el , 0,4,4,5 );
var child_5 = new Xcls_name( _this );
child_5.ref();
this.el.attach_defaults ( child_5.el , 0,4,4,5 );
- var child_6 = new Xcls_
create
btn( _this );
+ var child_6 = new Xcls_
branch
btn( _this );
child_6.ref();
this.el.attach_defaults ( child_6.el , 4,5,4,5 );
var child_7 = new Xcls_Box19( _this );
child_6.ref();
this.el.attach_defaults ( child_6.el , 4,5,4,5 );
var child_7 = new Xcls_Box19( _this );
@@
-646,7
+648,7
@@
public class NewBranch : Object
_this.scrolled_window.el.show();
_this.view.loadTicket(ticket.id);
_this.scrolled_window.el.show();
_this.view.loadTicket(ticket.id);
- _this.
create
btn.updateState();
+ _this.
branch
btn.updateState();
//GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2);
});
//GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2);
});
@@
-808,7
+810,7
@@
public class NewBranch : Object
// user defined functions
}
// user defined functions
}
- public class Xcls_
create
btn : Object
+ public class Xcls_
branch
btn : Object
{
public Gtk.Button el;
private NewBranch _this;
{
public Gtk.Button el;
private NewBranch _this;
@@
-817,10
+819,10
@@
public class NewBranch : Object
// my vars (def)
// ctor
// my vars (def)
// ctor
- public Xcls_
create
btn(NewBranch _owner )
+ public Xcls_
branch
btn(NewBranch _owner )
{
_this = _owner;
{
_this = _owner;
- _this.
create
btn = this;
+ _this.
branch
btn = this;
this.el = new Gtk.Button();
// my vars (dec)
this.el = new Gtk.Button();
// my vars (dec)
@@
-1073,7
+1075,7
@@
public class NewBranch : Object
- public class Xcls_
Box25
: Object
+ public class Xcls_
create_ticket_tab
: Object
{
public Gtk.Box el;
private NewBranch _this;
{
public Gtk.Box el;
private NewBranch _this;
@@
-1082,9
+1084,10
@@
public class NewBranch : Object
// my vars (def)
// ctor
// my vars (def)
// ctor
- public Xcls_
Box25
(NewBranch _owner )
+ public Xcls_
create_ticket_tab
(NewBranch _owner )
{
_this = _owner;
{
_this = _owner;
+ _this.create_ticket_tab = this;
this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );
// my vars (dec)
this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );
// my vars (dec)
@@
-1097,6
+1100,9
@@
public class NewBranch : Object
}
// user defined functions
}
// user defined functions
+ public return_type XXXX () {
+
+ }
}
public class Xcls_table : Object
{
}
public class Xcls_table : Object
{
@@
-1304,7
+1310,7
@@
public class NewBranch : Object
this.el.get_active_iter (out iter);
this.el.get_active_iter (out iter);
- _this.prmodel.el.get_value (iter, 0, out val1);
+ _this.
t
prmodel.el.get_value (iter, 0, out val1);
return (string) val1;
return (string) val1;
@@
-2175,7
+2181,7
@@
public class NewBranch : Object
- public class Xcls_
Box51
: Object
+ public class Xcls_
quick_commit_tab
: Object
{
public Gtk.Box el;
private NewBranch _this;
{
public Gtk.Box el;
private NewBranch _this;
@@
-2184,9
+2190,10
@@
public class NewBranch : Object
// my vars (def)
// ctor
// my vars (def)
// ctor
- public Xcls_
Box51
(NewBranch _owner )
+ public Xcls_
quick_commit_tab
(NewBranch _owner )
{
_this = _owner;
{
_this = _owner;
+ _this.quick_commit_tab = this;
this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );
// my vars (dec)
this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );
// my vars (dec)