}
return _NewBranch;
}
- public Xcls_reposView reposView;
- public Xcls_reposStore reposStore;
- public Xcls_tv_autocommit tv_autocommit;
- public Xcls_cr_autocommit cr_autocommit;
- public Xcls_tv_autopush tv_autopush;
- public Xcls_cr_autopush cr_autopush;
- public Xcls_tv_repo tv_repo;
- public Xcls_cr_repo cr_repo;
- public Xcls_tv_current_branch tv_current_branch;
- public Xcls_cr_current_branch cr_current_branch;
- public Xcls_tv_last_updated tv_last_updated;
- public Xcls_cr_last_updated cr_last_updated;
- public Xcls_tv_all_branches tv_all_branches;
- public Xcls_cr_all_branches cr_all_branches;
- public Xcls_ok_button ok_button;
+ public Xcls_projectsel projectsel;
+ public Xcls_prcellrenderer prcellrenderer;
+ public Xcls_prmodel prmodel;
+ public Xcls_ticketsel ticketsel;
+ public Xcls_dbcellrenderer dbcellrenderer;
+ public Xcls_dbmodel dbmodel;
+ public Xcls_name name;
+ public Xcls_btn_not_me btn_not_me;
+ public Xcls_btn_closed btn_closed;
+ public Xcls_scrolled_window scrolled_window;
+ public Xcls_view view;
// my vars (def)
+ public GitRepo? repo;
+ public bool running;
+ public Gee.ArrayList<GitMonitorQueue> queue;
// ctor
public NewBranch()
this.el = new Gtk.Dialog();
// my vars (dec)
+ this.repo = null;
+ this.running = false;
+ this.queue = null;
// set gobject values
- this.el.title = "Manage Clones";
- this.el.border_width = 3;
- this.el.default_height = 500;
- this.el.default_width = 800;
+ this.el.title = "Create a working branch ";
+ this.el.default_height = 200;
+ this.el.default_width = 500;
this.el.deletable = true;
this.el.modal = true;
var child_0 = new Xcls_Box2( _this );
child_0.ref();
this.el.get_content_area().add ( child_0.el );
- var child_1 = new Xcls_ok_button( _this );
- child_1.ref();
- this.el.add_action_widget ( child_1.el , 1 );
//listeners
this.el.delete_event.connect( (self, event) => {
//test
});
this.el.response.connect( (self, response_id) => {
-
- this.el.hide();
+ GLib.debug("got %d", (int) response_id);
+ if (response_id < 1) {
+ _this.el.hide();
+ this.running = false;
+ return;
+ }
+
+ // have they selected a ticket..
+ // make that the current active ticket?
+ // we really need to store locally what ticket is being worked on..
+ // in theory we could be working on multiple project and not merging..
+ // -- each repo would have their active ticket (only one per repo)
+ // -- so we could just store that in there
+ // -- initial load can check the contents of the ticket files on first scan.
+ var ticket_id = _this.ticketsel.selectedTicketId();
+
+ if (this.repo != null) {
+ var bn = _this.name.el.get_text();
+
+ var res = this.repo.setActiveTicket(
+ RooTicket.singleton().getById(ticket_id != "" ? ticket_id : "-1"), bn
+ );
+ if (res) {
+ // start the monitoring..
+ GitMonitor.gitmonitor.start();
+
+ }
+ }
+
+
+ this.running = false;
+
+ this.el.hide();
+
+
+
+
});
}
// user defined functions
- public void show () {
-
+ public void show ( GitRepo repo, Gee.ArrayList<GitMonitorQueue> queue, string tid = "" )
+ {
+ // this.el.set_gravity(Gdk.Gravity.NORTH);
+ if (this.running) { // should not happen!!
+ GLib.error("new branch show called, when already being displayed?");
+ }
+ this.queue = queue;
+
+ this.running = true;
+ GitMonitor.gitmonitor.stop();
+
+ this.repo = repo;
- this.el.set_deletable(false);
- this.el.set_gravity(Gdk.Gravity.NORTH);
- this.el.move(Gdk.Screen.width() / 2 ,0);
+
+
+ this.el.move((Gdk.Screen.width() / 2)- 250 ,0);
+ this.el.set_default_size( 500,200); // not sure why it grows..
+ GLib.debug("Loading tickets");
+
+
this.el.show_all();
- _this.reposStore.load();
- // load clones..
- // this.get('/reposStore').load();
+ this.el.set_keep_above(true);
+
- //this.get('/ok_button').el.set_sensitive(false);
+ var curproj = RooTicket.singleton().getProjectByRepo(this.repo);
+ _this.prmodel.loadProjects(curproj == null ? "" : curproj.id);
- // block until we return.
- // var run_ret = this.el.run();
- // if (run_ret < 1 ) {
- // return "DONE";
- // }
- // print("RUN RETURN : " + run_ret);
- // return "DONE";
- //print(JSON.stringify(this.get('bug').getValue()));
- // return this.get('bug').getValue();
- //this.success = c.success;
+ _this.dbmodel.loadTickets(curproj == null ? "": curproj.id, tid);
+ if (tid != "") {
+ var name = RooTicket.singleton().usernameLocal();
+ var ticket = RooTicket.singleton().getById(tid);
+ _this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName()));
+ }
+
+ this.el.run();
+
}
public class Xcls_Box2 : Object
{
// my vars (dec)
// set gobject values
- var child_0 = new Xcls_Box3( _this );
+ var child_0 = new Xcls_Table3( _this );
child_0.ref();
this.el.pack_start ( child_0.el , false,false,0 );
- var child_1 = new Xcls_ScrolledWindow9( _this );
+ var child_1 = new Xcls_scrolled_window( _this );
child_1.ref();
- this.el.pack_end ( child_1.el , true,true,0 );
+ this.el.add ( child_1.el );
}
// user defined functions
}
- public class Xcls_Box3 : Object
+ public class Xcls_Table3 : Object
{
- public Gtk.Box el;
+ public Gtk.Table el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_Box3(NewBranch _owner )
+ public Xcls_Table3(NewBranch _owner )
{
_this = _owner;
- this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 );
+ this.el = new Gtk.Table( 5, 5, true );
// my vars (dec)
// set gobject values
- var child_0 = new Xcls_Button4( _this );
+ this.el.expand = false;
+ this.el.margin = 2;
+ this.el.column_spacing = 4;
+ this.el.vexpand = false;
+ var child_0 = new Xcls_Label4( _this );
child_0.ref();
- this.el.add ( child_0.el );
- var child_1 = new Xcls_Button5( _this );
+ this.el.attach_defaults ( child_0.el , 0,1,0,1 );
+ var child_1 = new Xcls_Label5( _this );
child_1.ref();
- this.el.add ( child_1.el );
- var child_2 = new Xcls_Button6( _this );
+ this.el.attach_defaults ( child_1.el , 1,2,0,1 );
+ var child_2 = new Xcls_projectsel( _this );
child_2.ref();
- this.el.add ( child_2.el );
- var child_3 = new Xcls_Button7( _this );
+ this.el.attach_defaults ( child_2.el , 0,1,1,2 );
+ var child_3 = new Xcls_ticketsel( _this );
child_3.ref();
- this.el.add ( child_3.el );
- var child_4 = new Xcls_Button8( _this );
+ this.el.attach_defaults ( child_3.el , 1,4,1,2 );
+ var child_4 = new Xcls_Button12( _this );
child_4.ref();
- this.el.add ( child_4.el );
+ this.el.attach_defaults ( child_4.el , 4,5,1,2 );
+ var child_5 = new Xcls_Label13( _this );
+ child_5.ref();
+ this.el.attach_defaults ( child_5.el , 0,1,3,4 );
+ var child_6 = new Xcls_name( _this );
+ child_6.ref();
+ this.el.attach_defaults ( child_6.el , 0,4,4,5 );
+ var child_7 = new Xcls_Button15( _this );
+ child_7.ref();
+ this.el.attach_defaults ( child_7.el , 4,5,4,5 );
+ var child_8 = new Xcls_Box16( _this );
+ child_8.ref();
+ this.el.attach_defaults ( child_8.el , 0,5,2,3 );
}
// user defined functions
}
- public class Xcls_Button4 : Object
+ public class Xcls_Label4 : Object
{
- public Gtk.Button el;
+ public Gtk.Label el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_Button4(NewBranch _owner )
+ public Xcls_Label4(NewBranch _owner )
{
_this = _owner;
- this.el = new Gtk.Button();
+ this.el = new Gtk.Label( "Project" );
// my vars (dec)
// set gobject values
- this.el.label = "Remotes / Clones";
-
- //listeners
- this.el.clicked.connect( () => {
-
- /* var rv = this.get('/reposView');
- var rs = this.get('/reposStore');
- if (rv.el.get_selection().count_selected_rows() != 1) {
- //nothing?
- // error condition.
- return;
- }
- var Remotes = imports.Remotes.Remotes;
-
-
- var ret = {};
- var s = rv.el.get_selection();
- var path = '';
- s.selected_foreach(function(model,p,iter) {
-
- path = model.get_value(iter, 6).value.get_string();
-
- });
-
- var repo = false;
- rs.repos.forEach(function(r) {
- if (r.repopath == path) {
- repo = r;
-
- }
-
- });
- Remotes.repo = repo;
- Remotes.el.set_transient_for(Clones.el);
- Clones.el.set_title("Manage Clones - " + repo.repopath);
- Remotes.show();
- Clones.el.set_title("Manage Clones");
-
- */
-
-
-
-
-
-
- });
+ this.el.halign = Gtk.Align.START;
+ this.el.justify = Gtk.Justification.RIGHT;
+ this.el.visible = true;
}
// user defined functions
}
- public class Xcls_Button5 : Object
+ public class Xcls_Label5 : Object
{
- public Gtk.Button el;
+ public Gtk.Label el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_Button5(NewBranch _owner )
+ public Xcls_Label5(NewBranch _owner )
{
_this = _owner;
- this.el = new Gtk.Button();
+ this.el = new Gtk.Label( "Ticket" );
// my vars (dec)
// set gobject values
- this.el.label = "Branches";
-
- //listeners
- this.el.clicked.connect( () => {
- /*
- var rv = this.get('/reposView');
- var rs = this.get('/reposStore');
- if (rv.el.get_selection().count_selected_rows() != 1) {
- //nothing?
- // error condition.
- return;
- }
- var Branches = imports.Branches.Branches;
-
-
- var ret = {};
- var s = rv.el.get_selection();
- var path = '';
- s.selected_foreach(function(model,p,iter) {
-
- path = model.get_value(iter, 6).value.get_string();
-
- });
-
- var repo = false;
- rs.repos.forEach(function(r) {
- if (r.repopath == path) {
- repo = r;
-
- }
-
- });
- Branches.repo = repo;
- Branches.el.set_transient_for(Clones.el);
- Clones.el.set_title("Manage Clones - " + repo.repopath);
- Branches.show();
- Clones.el.set_title("Manage Clones");
-
-
-
-
-
-
-
- */
-
- });
+ this.el.halign = Gtk.Align.START;
+ this.el.visible = true;
}
// user defined functions
}
- public class Xcls_Button6 : Object
+ public class Xcls_projectsel : Object
{
- public Gtk.Button el;
+ public Gtk.ComboBox el;
private NewBranch _this;
// my vars (def)
+ public bool loading;
// ctor
- public Xcls_Button6(NewBranch _owner )
+ public Xcls_projectsel(NewBranch _owner )
{
_this = _owner;
- this.el = new Gtk.Button();
+ _this.projectsel = this;
+ this.el = new Gtk.ComboBox.with_entry();
// my vars (dec)
+ this.loading = false;
// set gobject values
- this.el.label = "Merge";
+ var child_0 = new Xcls_prcellrenderer( _this );
+ child_0.ref();
+ this.el.pack_start ( child_0.el , true );
+ var child_1 = new Xcls_prmodel( _this );
+ child_1.ref();
+ this.el.set_model ( child_1.el );
+
+ // init method
+
+ this.el.set_entry_text_column(1);
//listeners
- this.el.clicked.connect( () => {
- /*
- var rv = this.get('/reposView');
- var rs = this.get('/reposStore');
- if (rv.el.get_selection().count_selected_rows() != 1) {
- //nothing?
- // error condition.
- return;
- }
- var Merger = imports.Merger.Merger;
-
-
- var ret = {};
- var s = rv.el.get_selection();
- var path = '';
- s.selected_foreach(function(model,p,iter) {
-
- path = model.get_value(iter, 6).value.get_string();
-
- });
-
- var repo = false;
- rs.repos.forEach(function(r) {
- if (r.repopath == path) {
- repo = r;
-
- }
-
- });
- Merger.repo = repo;
- Merger.el.set_transient_for(Clones.el);
- Clones.el.set_title("Manage Clones - " + repo.repopath);
- Merger.show();
- Clones.el.set_title("Manage Clones");
-
-
-
-
-
-
-
- */
-
-
+ this.el.changed.connect( () => {
+ if (this.loading) {
+ return;
+ }
+ var project_id = this.selectedProjectId();
+ _this.dbmodel.loadTickets(project_id);
+
+
+ /*if (this.loading) {
+ return;
+ }
+ var ticket_id = this.selectedTicketId();
+
+ var name = RooTicket.singleton().usernameLocal();
+
+ if (ticket_id == "" || ticket_id == null) {
+
+ var dt = new DateTime.now_local();
+ _this.name.el.set_text("wip_%s_%s".printf(name,dt.format("%Y_%b_%d")));
+ return;
+ }
+
+
+ var ticket = RooTicket.singleton().getById(ticket_id);
+
+ _this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName()));
+
+ //GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2);
+ */
});
}
// user defined functions
+ public string selectedProjectId () {
+ Gtk.TreeIter iter;
+ Value val1;
+
+
+ this.el.get_active_iter (out iter);
+ _this.prmodel.el.get_value (iter, 0, out val1);
+
+
+ return (string) val1;
+
+
+
+
+ }
}
-
- public class Xcls_Button7 : Object
+ public class Xcls_prcellrenderer : Object
{
- public Gtk.Button el;
+ public Gtk.CellRendererText el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_Button7(NewBranch _owner )
+ public Xcls_prcellrenderer(NewBranch _owner )
{
_this = _owner;
- this.el = new Gtk.Button();
+ _this.prcellrenderer = this;
+ this.el = new Gtk.CellRendererText();
// my vars (dec)
// set gobject values
- this.el.label = "Switch Branch";
-
- //listeners
- this.el.clicked.connect( () => {
-
-
-
-
-
-
- });
}
// user defined functions
}
- public class Xcls_Button8 : Object
+ public class Xcls_prmodel : Object
{
- public Gtk.Button el;
+ public Gtk.ListStore el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_Button8(NewBranch _owner )
+ public Xcls_prmodel(NewBranch _owner )
{
_this = _owner;
- this.el = new Gtk.Button();
+ _this.prmodel = this;
+ this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) );
// my vars (dec)
// set gobject values
- this.el.label = "Pull";
+ }
- //listeners
- this.el.clicked.connect( () => {
-
-
-
-
+ // user defined functions
+ public void loadProjects (string id) {
+
+ var rt = RooTicket.singleton();
+ rt.loadProjects();
+
+ _this.projectsel.loading = true;
+
+ this.el.clear();
+ Gtk.TreeIter iter;
+ var el = this.el;
+
+ el.append(out iter);
+
+
+ el.set_value(iter, 0, "");
+ el.set_value(iter, 1, "-- select a project --");
+ if (id == "") {
+ _this.projectsel.el.set_active_iter(iter);
+ }
+ var projects = rt.projects;
+ foreach(var project in projects) {
+
+ el.append(out iter);
+ el.set_value(iter, 0, project.id);
+ el.set_value(iter, 1, project.name );
+ if (id == project.id) {
+ _this.projectsel.el.set_active_iter(iter);
+ }
- });
+ }
+
+ _this.projectsel.loading = false;
+ //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);
+
}
-
- // user defined functions
}
- public class Xcls_ScrolledWindow9 : Object
+ public class Xcls_ticketsel : Object
{
- public Gtk.ScrolledWindow el;
+ public Gtk.ComboBox el;
private NewBranch _this;
// my vars (def)
+ public bool loading;
// ctor
- public Xcls_ScrolledWindow9(NewBranch _owner )
+ public Xcls_ticketsel(NewBranch _owner )
{
_this = _owner;
- this.el = new Gtk.ScrolledWindow( null, null );
+ _this.ticketsel = this;
+ this.el = new Gtk.ComboBox.with_entry();
// my vars (dec)
+ this.loading = false;
// set gobject values
- this.el.expand = true;
- this.el.hexpand = true;
- this.el.shadow_type = Gtk.ShadowType.IN;
- var child_0 = new Xcls_reposView( _this );
+ var child_0 = new Xcls_dbcellrenderer( _this );
child_0.ref();
- this.el.add ( child_0.el );
+ this.el.pack_start ( child_0.el , true );
+ var child_1 = new Xcls_dbmodel( _this );
+ child_1.ref();
+ this.el.set_model ( child_1.el );
// init method
- {
-
- this.el.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
- }
+ //this.el.add_attribute(_this.dbcellrenderer.el , "markup", 1 );
+ this.el.set_entry_text_column(1);
+
+ //listeners
+ this.el.changed.connect( () => {
+ if (this.loading) {
+ return;
+ }
+ var ticket_id = this.selectedTicketId();
+
+ var name = RooTicket.singleton().usernameLocal();
+
+ if (ticket_id == "" || ticket_id == null) {
+
+ var dt = new DateTime.now_local();
+ _this.name.el.set_text("wip_%s_%s".printf(name,dt.format("%Y_%b_%d")));
+ return;
+ }
+
+
+ var ticket = RooTicket.singleton().getById(ticket_id);
+
+ _this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName()));
+
+ //GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2);
+ });
}
// user defined functions
+ public string selectedTicketId () {
+ Gtk.TreeIter iter;
+ Value val1;
+
+
+ this.el.get_active_iter (out iter);
+ _this.dbmodel.el.get_value (iter, 0, out val1);
+
+
+ return (string) val1;
+
+
+
+
+ }
}
- public class Xcls_reposView : Object
+ public class Xcls_dbcellrenderer : Object
{
- public Gtk.TreeView el;
+ public Gtk.CellRendererText el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_reposView(NewBranch _owner )
+ public Xcls_dbcellrenderer(NewBranch _owner )
{
_this = _owner;
- _this.reposView = this;
- this.el = new Gtk.TreeView();
+ _this.dbcellrenderer = this;
+ this.el = new Gtk.CellRendererText();
// my vars (dec)
// set gobject values
- var child_0 = new Xcls_reposStore( _this );
- child_0.ref();
- this.el.set_model ( child_0.el );
- var child_1 = new Xcls_tv_autocommit( _this );
- child_1.ref();
- this.el.append_column ( child_1.el );
- var child_2 = new Xcls_tv_autopush( _this );
- child_2.ref();
- this.el.append_column ( child_2.el );
- var child_3 = new Xcls_tv_repo( _this );
- child_3.ref();
- this.el.append_column ( child_3.el );
- var child_4 = new Xcls_tv_current_branch( _this );
- child_4.ref();
- this.el.append_column ( child_4.el );
- var child_5 = new Xcls_tv_last_updated( _this );
- child_5.ref();
- this.el.append_column ( child_5.el );
- var child_6 = new Xcls_tv_all_branches( _this );
- child_6.ref();
- this.el.append_column ( child_6.el );
-
- // init method
-
- {
- var selection = this.el.get_selection();
- selection.set_mode( Gtk.SelectionMode.SINGLE);
-
-
- var description = new Pango.FontDescription();
- description.set_size(10000);
- this.el.override_font(description);
-
- }
-
- //listeners
- this.el.cursor_changed.connect( () => {
- // SEE SELECTION.CHANGED
- /*
-
- return;
-
- if (this.el.get_selection().count_selected_rows() < 1) {
- //nothing? - clea it?
- return;
- }
- var ret = {};
- var model = this.get('/changedFilesStore');
-
- var s = this.el.get_selection();
- var files = [];
- s.selected_foreach(function(model,p,iter) {
-
- files.push( model.get_value(iter, 0).value.get_string());
-
- });
- this.get('/patchview').showDiff(files);
- //var value = ''+ ret.model.get_value(ret.iter, 1).value.get_string();
- //print("OUT?" + value);// id..
- // load the list in the right grid..
-
- return true;
- */
- });
}
// user defined functions
}
- public class Xcls_reposStore : Object
+
+ public class Xcls_dbmodel : Object
{
public Gtk.ListStore el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_reposStore(NewBranch _owner )
+ public Xcls_dbmodel(NewBranch _owner )
{
_this = _owner;
- _this.reposStore = this;
- this.el = new Gtk.ListStore( 8, typeof(string), // 0 repo
- typeof(string), // 1 current branch
- typeof(string), // 2 all branch
- typeof(string), // 3 updated
- typeof(bool), // 4 auto commit
- typeof(bool), // 5 auto push
- typeof(string), // 7 repopath
- typeof(string) // 8 color highlighting?
- );
+ _this.dbmodel = this;
+ this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) );
// my vars (dec)
}
// user defined functions
- public void load ()
- {
- //this.insert(citer,iter,0);
- print("getting list");
- var tr = GitRepo.list();
+ public void loadTickets (string project_id , string tid = "") {
+
+
- this.el.clear();
+ // fixme .. get project id from selection..
- // fixme .. sort by last updated ...
+ RooTicket.singleton().loadTickets(
+ project_id,
+ _this.btn_not_me.el.active ? RooTicket.Who.ANYBODY : RooTicket.Who.ME,
+ _this.btn_closed.el.active ? RooTicket.Status.ALL : RooTicket.Status.ACTIVE
+ );
+
+ _this.ticketsel.loading = true;
+
+ this.el.clear();
+ Gtk.TreeIter iter;
+ var el = this.el;
+ el.append(out iter);
+
- for(var i =0 ; i < tr.length; i++) {
- var repo = tr.index(i);
- repo.loadBranches();
-
- Gtk.TreeIter iter;
- this.el.append(out iter);
-
+ el.set_value(iter, 0, "");
+ el.set_value(iter, 1, "-- select a ticket --");
+
+ _this.ticketsel.el.set_active_iter(iter);
+ var tickets = RooTicket.singleton().tickets;
+ foreach(var ticket in tickets) {
+
+ el.append(out iter);
- //print(JSON.stringify(ret,null,4));
- //tr[i].getBranches();
- //tr[i].getStatus();
- //var hi;
- //try {
- //tr[i].debug=1;
- // hi = tr[i].history('/', 1, 'branch', tr[i].currentBranch.name );
- // print(JSON.stringify(hi,null,4));
- // } catch(e) { print(e);}
-
- this.el.set_value(iter, 0, repo.name );
- this.el.set_value( iter, 1, repo.currentBranch.name );
- this.el.set_value( iter, 2, repo.branchesToString() );
- // this.el.set_value(ret.iter, 2, '' + repo.branches.map(
- // function(e) { return e.name;
- // }).join(', ')
- // );
- // this.el.set_value(iter, 3, '' + (!hi ? '??' : hi[0].changed_raw));
- this.el.set_value(iter, 4, repo.is_autocommit() );
- this.el.set_value(iter, 5, repo.is_autopush() );
- this.el.set_value(iter, 6, repo.gitdir );
- // highlight color.
- var cb = repo.currentBranch;
- //print(JSON.stringify(cb,null,4));
- var col = "#ffffff";
- /*
- if (cb.lastrev != cb.remoterev) {
- col = '#ff0000';
- }
- if (tr[i].hasLocalChanges) {
- col = '#0000ff';
- }
- if ((cb.lastrev != cb.remoterev) && (tr[i].hasLocalChanges)) {
- col = '#ff00ff';
+ el.set_value(iter, 0, ticket.id);
+ el.set_value(iter, 1, "#%s [%s] %s".printf( ticket.id, ticket.project_id_name , ticket.summary));
+
+ if (ticket.id == tid) {
+ _this.ticketsel.el.set_active_iter(iter);
}
- */
- this.el.set_value(iter, 7, col );
- }
- this.el.set_sort_column_id (0, Gtk.SortType.ASCENDING);
+ }
+
+ _this.ticketsel.loading = false;
+ //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);
+
}
}
- public class Xcls_tv_autocommit : Object
- {
- public Gtk.TreeViewColumn el;
- private NewBranch _this;
-
- // my vars (def)
-
- // ctor
- public Xcls_tv_autocommit(NewBranch _owner )
- {
- _this = _owner;
- _this.tv_autocommit = this;
- this.el = new Gtk.TreeViewColumn();
-
- // my vars (dec)
-
- // set gobject values
- this.el.title = "Auto Commit";
- this.el.min_width = 50;
- var child_0 = new Xcls_cr_autocommit( _this );
- child_0.ref();
- this.el.pack_start ( child_0.el , false );
-
- // init method
-
- // this.items[0].el.set_activatable(true);
- this.el.add_attribute(_this.cr_autocommit.el , "active", 4 );
- }
-
- // user defined functions
- }
- public class Xcls_cr_autocommit : Object
+ public class Xcls_Button12 : Object
{
- public Gtk.CellRendererToggle el;
+ public Gtk.Button el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_cr_autocommit(NewBranch _owner )
+ public Xcls_Button12(NewBranch _owner )
{
_this = _owner;
- _this.cr_autocommit = this;
- this.el = new Gtk.CellRendererToggle();
+ this.el = new Gtk.Button();
// my vars (dec)
// set gobject values
- this.el.mode = Gtk.CellRendererMode.ACTIVATABLE;
+ this.el.expand = false;
+ this.el.label = "New Ticket";
//listeners
- this.el.toggled.connect( (self, path) => {
- /* var ret ={} ;
- var store = this.get('/reposStore');
- store.el.get_iter_from_string(ret, path);
-
- var value = store.el.get_value(ret.iter,4).value.get_boolean();
-
- //print(JSON.stringify(value));
- store.el.set_value(ret.iter,4, !value);
-
- var path = store.el.get_value(ret.iter, 6).value.get_string();
- var repo = imports.Scm.Repo.Repo.get(path);
- repo.autocommit(!value);
- */
-
-
+ this.el.clicked.connect( () => {
+ _this.el.response(-1);
+ Ticket.singleton().show(_this.repo);
+
});
}
// user defined functions
}
-
- public class Xcls_tv_autopush : Object
+ public class Xcls_Label13 : Object
{
- public Gtk.TreeViewColumn el;
+ public Gtk.Label el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_tv_autopush(NewBranch _owner )
+ public Xcls_Label13(NewBranch _owner )
{
_this = _owner;
- _this.tv_autopush = this;
- this.el = new Gtk.TreeViewColumn();
+ this.el = new Gtk.Label( "Use this as branch name" );
// my vars (dec)
// set gobject values
- this.el.title = "Auto Push";
- this.el.min_width = 50;
- var child_0 = new Xcls_cr_autopush( _this );
- child_0.ref();
- this.el.pack_start ( child_0.el , false );
-
- // init method
-
- this.el.add_attribute(_this.cr_autopush.el , "active", 5 );
- // this.items[0].el.set_activatable(true);
+ this.el.halign = Gtk.Align.START;
+ this.el.justify = Gtk.Justification.RIGHT;
+ this.el.xalign = 0.900000f;
}
// user defined functions
}
- public class Xcls_cr_autopush : Object
+
+ public class Xcls_name : Object
{
- public Gtk.CellRendererToggle el;
+ public Gtk.Entry el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_cr_autopush(NewBranch _owner )
+ public Xcls_name(NewBranch _owner )
{
_this = _owner;
- _this.cr_autopush = this;
- this.el = new Gtk.CellRendererToggle();
+ _this.name = this;
+ this.el = new Gtk.Entry();
// my vars (dec)
// set gobject values
- this.el.mode = Gtk.CellRendererMode.ACTIVATABLE;
-
- //listeners
- this.el.toggled.connect( (self, path) => {
- /* var ret ={} ;
- var store = this.get('/reposStore');
- store.el.get_iter_from_string(ret, path);
-
- var value = store.el.get_value(ret.iter,5).value.get_boolean();
-
- //print(JSON.stringify(value));
- store.el.set_value(ret.iter,5, !value);
- var path = store.el.get_value(ret.iter, 6).value.get_string();
- var repo = imports.Scm.Repo.Repo.get(path);
- repo.autopush(!value);
- */
- });
+ this.el.visible = true;
}
// user defined functions
}
-
- public class Xcls_tv_repo : Object
+ public class Xcls_Button15 : Object
{
- public Gtk.TreeViewColumn el;
+ public Gtk.Button el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_tv_repo(NewBranch _owner )
+ public Xcls_Button15(NewBranch _owner )
{
_this = _owner;
- _this.tv_repo = this;
- this.el = new Gtk.TreeViewColumn();
+ this.el = new Gtk.Button();
// my vars (dec)
// set gobject values
- this.el.sort_column_id = 0;
- this.el.title = "Repo";
- this.el.min_width = 200;
- this.el.sort_order = Gtk.SortType.ASCENDING;
- this.el.resizable = true;
- var child_0 = new Xcls_cr_repo( _this );
- child_0.ref();
- this.el.pack_start ( child_0.el , false );
+ this.el.label = "Create Branch";
// init method
- this.el.add_attribute(_this.cr_repo.el , "markup", 0 );
- }
-
- // user defined functions
- }
- public class Xcls_cr_repo : Object
- {
- public Gtk.CellRendererText el;
- private NewBranch _this;
-
-
- // my vars (def)
-
- // ctor
- public Xcls_cr_repo(NewBranch _owner )
- {
- _this = _owner;
- _this.cr_repo = this;
- this.el = new Gtk.CellRendererText();
-
- // my vars (dec)
+ {
+ this.el.get_style_context().add_class("suggested-action");
+ }
- // set gobject values
+ //listeners
+ this.el.clicked.connect( () => {
+ GLib.debug("fire response = 1");
+ _this.el.response(1);
+ });
}
// user defined functions
}
-
- public class Xcls_tv_current_branch : Object
+ public class Xcls_Box16 : Object
{
- public Gtk.TreeViewColumn el;
+ public Gtk.Box el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_tv_current_branch(NewBranch _owner )
+ public Xcls_Box16(NewBranch _owner )
{
_this = _owner;
- _this.tv_current_branch = this;
- this.el = new Gtk.TreeViewColumn();
+ this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 );
// my vars (dec)
// set gobject values
- this.el.title = "Current Branch";
- this.el.min_width = 50;
- var child_0 = new Xcls_cr_current_branch( _this );
+ var child_0 = new Xcls_btn_not_me( _this );
child_0.ref();
- this.el.pack_start ( child_0.el , false );
-
- // init method
-
- this.el.add_attribute(_this.cr_current_branch.el , "markup", 1 );
- this.el.add_attribute(_this.cr_current_branch.el, "cell-background", 7 );
+ this.el.add ( child_0.el );
+ var child_1 = new Xcls_btn_closed( _this );
+ child_1.ref();
+ this.el.add ( child_1.el );
+ var child_2 = new Xcls_Label19( _this );
+ child_2.ref();
+ this.el.add ( child_2.el );
}
// user defined functions
}
- public class Xcls_cr_current_branch : Object
+ public class Xcls_btn_not_me : Object
{
- public Gtk.CellRendererText el;
+ public Gtk.CheckButton el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_cr_current_branch(NewBranch _owner )
+ public Xcls_btn_not_me(NewBranch _owner )
{
_this = _owner;
- _this.cr_current_branch = this;
- this.el = new Gtk.CellRendererText();
+ _this.btn_not_me = this;
+ this.el = new Gtk.CheckButton();
// my vars (dec)
// set gobject values
+ this.el.label = "Show tickets not assigned to me";
+
+ //listeners
+ this.el.toggled.connect( () => {
+ var project_id = _this.projectsel.selectedProjectId();
+ _this.dbmodel.loadTickets(project_id);
+ });
}
// user defined functions
}
-
- public class Xcls_tv_last_updated : Object
+ public class Xcls_btn_closed : Object
{
- public Gtk.TreeViewColumn el;
+ public Gtk.CheckButton el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_tv_last_updated(NewBranch _owner )
+ public Xcls_btn_closed(NewBranch _owner )
{
_this = _owner;
- _this.tv_last_updated = this;
- this.el = new Gtk.TreeViewColumn();
+ _this.btn_closed = this;
+ this.el = new Gtk.CheckButton();
// my vars (dec)
// set gobject values
- this.el.title = "Last updated";
- this.el.min_width = 50;
- var child_0 = new Xcls_cr_last_updated( _this );
- child_0.ref();
- this.el.pack_start ( child_0.el , false );
-
- // init method
+ this.el.label = "Show closed Tickets";
- this.el.add_attribute(_this.cr_last_updated.el , "markup", 3 );
+ //listeners
+ this.el.toggled.connect( () => {
+ var project_id = _this.projectsel.selectedProjectId();
+ _this.dbmodel.loadTickets(project_id);
+
+ });
}
// user defined functions
}
- public class Xcls_cr_last_updated : Object
+
+ public class Xcls_Label19 : Object
{
- public Gtk.CellRendererText el;
+ public Gtk.Label el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_cr_last_updated(NewBranch _owner )
+ public Xcls_Label19(NewBranch _owner )
{
_this = _owner;
- _this.cr_last_updated = this;
- this.el = new Gtk.CellRendererText();
+ this.el = new Gtk.Label( "<a href=\"refresh\">Refresh Ticket list</a>" );
// my vars (dec)
// set gobject values
+ this.el.halign = Gtk.Align.END;
+ this.el.hexpand = true;
+ this.el.use_markup = true;
+
+ //listeners
+ this.el.activate_link.connect( (uri) => {
+ if (uri == "refresh") {
+ var curproj = RooTicket.singleton().getProjectByRepo(_this.repo);
+ _this.prmodel.loadProjects(curproj == null ? "": curproj.id);
+
+ _this.dbmodel.loadTickets(curproj == null ? "": curproj.id);
+ }
+ return true;
+ });
}
// user defined functions
}
- public class Xcls_tv_all_branches : Object
+
+ public class Xcls_scrolled_window : Object
{
- public Gtk.TreeViewColumn el;
+ public Gtk.ScrolledWindow el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_tv_all_branches(NewBranch _owner )
+ public Xcls_scrolled_window(NewBranch _owner )
{
_this = _owner;
- _this.tv_all_branches = this;
- this.el = new Gtk.TreeViewColumn();
+ _this.scrolled_window = this;
+ this.el = new Gtk.ScrolledWindow( null, null );
// my vars (dec)
// set gobject values
- this.el.title = "All Branches";
- this.el.min_width = 50;
- this.el.resizable = false;
- var child_0 = new Xcls_cr_all_branches( _this );
+ var child_0 = new Xcls_view( _this );
child_0.ref();
- this.el.pack_start ( child_0.el , false );
+ this.el.add ( child_0.el );
// init method
- this.el.add_attribute(_this.cr_all_branches.el , "markup", 2 );
+ {
+ this.el.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
+ }
}
// user defined functions
}
- public class Xcls_cr_all_branches : Object
+ public class Xcls_view : Object
{
- public Gtk.CellRendererText el;
+ public WebKit.WebView el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_cr_all_branches(NewBranch _owner )
+ public Xcls_view(NewBranch _owner )
{
_this = _owner;
- _this.cr_all_branches = this;
- this.el = new Gtk.CellRendererText();
+ _this.view = this;
+ this.el = new WebKit.WebView();
// my vars (dec)
- // set gobject values
+ // init method
+
+ {
+ this.load_try = 0;
+
+ #if GTK3
+ this.el.load_changed.connect( (ev ) => {
+ if (ev != WebKit.LoadEvent.FINISHED) {
+ return;
+ }
+
+ this.printit();
+
+
+ });
+
+ this.el.resource_load_started.connect( (resource, request) => {
+ print("Adding referrer header %s\n" , request.get_uri());
+
+ if (request.get_http_headers() != null) {
+ request.get_http_headers().remove("Referer");
+ request.get_http_headers().append("Referer", request.get_uri());
+ }
+ });
+ var settings = this.el.get_settings();
+ settings.set_user_agent( "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36" );
+
+
+ #else
+ //listeners
+ // this.el.resource_request_starting.connect( (p0, webres, netreq ) => {
+ // print("resource req. started %s\n", netreq.uri);
+
+ // });
+
+ this.el.load_finished.connect( ( ) => {
+
+
+ this.printit();
+
+ });
+ WebKit.get_default_session().request_started.connect((message, socket) => {
+ Soup.URI uri = message.get_uri();
+
+ var host = uri.get_host ();
+
+ print("Adding header http://%s/\n", host);
+ message.request_headers.remove("Referer");
+ message.request_headers.append("Referer", "http://"+host+"/");
+
+
+ });
+ var sess = WebKit.get_default_session();
+ sess.user_agent= "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36";
+
+
+ #endif
+ }
+ this.cookie_file = "";
+ if (webkitpdf.opt_cookies != null) {
+ print("setting cookie %s\n",webkitpdf.opt_cookies);
+
+ var uri = new Soup.URI (webkitpdf.opt_url);
+
+ string[] cookies = webkitpdf.opt_cookies.split ("=", 2);
+
+ if(cookies.length > 1 ) {
+
+ #if GTK3
+ var context = WebKit.WebContext.get_default();
+ var cookie_manager = context.get_cookie_manager();
+ cookie_manager.set_accept_policy(WebKit.CookieAcceptPolicy.NEVER);
+ string scheme = uri.get_scheme ();
+
+ try {
+ FileIOStream iostream;
+ File file = File.new_tmp ("cookie-XXXXXX.txt", out iostream);
+ this.cookie_file = file.get_path ();
+ print("cookie tmp file name: %s\n", file.get_path ());
+
+ OutputStream ostream = iostream.output_stream;
+ DataOutputStream dostream = new DataOutputStream (ostream);
+ dostream.put_string ("%s\tTRUE\t/\t%s\t2147483647\t%s\t%s".printf(uri.get_host(),scheme == "http" ? "FALSE" : "TRUE",cookies[0],cookies[1]));
+ cookie_manager.set_persistent_storage(file.get_path(), WebKit.CookiePersistentStorage.TEXT);
+ } catch (Error e) {
+ stdout.printf ("Error: %s\n", e.message);
+ }
+ #else
+ var cookie_jar = new Soup.CookieJar();
+ var cookie = new Soup.Cookie (cookies[0], cookies[1], uri.get_host(), "/", -1);
+ if(uri.get_scheme() =="https") {
+ cookie.set_secure(true);
+ }
+ cookie_jar.set_accept_policy(Soup.CookieJarAcceptPolicy.NEVER);
+ cookie_jar.add_cookie(cookie);
+ WebKit.get_default_session().add_feature(cookie_jar);
+ #endif
+
+ }
+
+ }
+ // init method
}
// user defined functions
+ public void printit () {
+ print("load_finsihed\n");
+
+ if (this.print_started) {
+ print("load_finsihed - already printing..%d %s\n", this.load_try, this.el.uri);
+
+
+
+
+ return;
+ }
+
+
+ this.print_started = true; // flag to stop double call.
+
+
+ // inject any javascript if needed..
+ if (webkitpdf.opt_inject_js != null) {
+
+ print("injecting javascript files \n");
+ foreach(var inject_js in webkitpdf.opt_inject_js) {
+ print("inject? %s\n", inject_js);
+ string str;
+ try {
+ FileUtils.get_contents( inject_js, out str);
+ } catch(FileError e) {
+ print("Failed to inject %s\n", inject_js);
+ continue;
+ }
+ #if GTK3
+ GLib.MainLoop mainloop = new GLib.MainLoop();
+ this.el.run_javascript.begin(str, null, (obj,res) => {
+ mainloop.quit();
+ });
+ mainloop.run();
+
+ #else
+ this.el.execute_script(str);
+ #endif
+ }
+ }
+
+ print("calling print in %d seconds\n", (int)webkitpdf.opt_delay);
+ if (webkitpdf.opt_target_pdf != null) {
+ GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => {
+ print("delay done URL: %s\n", this.el.uri);
+
+
+ this.printpdf();
+ return false;
+ }, GLib.Priority.DEFAULT);
+ return;
+ }
+
+
+ #if GTK3
+ print("PNG not supported in webkit2\n");
+ return;
+ #else
+
+ GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => {
+
+
+ // ----------------- JPEG
+ // resize the window...
+ // window.document.documentElement.scrollHeight
+ var scroll_height = (int) _this.view.el.get_dom_document().document_element.scroll_height;
+ print("Scroll height %d\n", scroll_height);
+ if (scroll_height> 1024 || webkitpdf.opt_width > 0 || webkitpdf.opt_height > 0 ) {
+ var w = webkitpdf.opt_width > 0 ? webkitpdf.opt_width : 1200;
+ var h = int.min(scroll_height, 6000);
+ _this.scrolled_window.el.set_size_request( w, h);
+ _this.el.resize (w+50, h+50);
+ print("Resize to %d, %d\n", w,h);
+ GLib.Timeout.add_seconds(webkitpdf.opt_delay > 0 ? webkitpdf.opt_delay : 1 , () => {
+ this.printpng();
+ return false;
+ }, GLib.Priority.DEFAULT);
+ return false;
+ }
+ this.printpng();
+ return false;
+ }, GLib.Priority.DEFAULT);
+
+
+ #endif
+
+ }
+ public bool printpdf () {
+
+
+
+ var list = Gtk.PaperSize.get_paper_sizes(false);
+ var psetup = new Gtk.PageSetup();
+ for(var i = 0; i < list.length(); i++ ) {
+ var entry = list.nth_data(i).copy();
+ if (entry.get_name() == "iso_a2") {
+ psetup.set_paper_size(entry);
+ }
+ }
+
+
+ #if GTK3
+
+ var pe = new WebKit.PrintOperation(this.el);
+ pe.set_page_setup(psetup);
+ pe.finished.connect( () => {
+ print("print completed\n");
+ this.delete_cookiefile();
+ Gtk.main_quit();
+
+ });
+
+ var ps = new Gtk.PrintSettings();
+ ps.set_printer("Print to File");
+ ps.set("output-file-format", "pdf");
+ ps.set("output-uri", "file://" + webkitpdf.opt_target_pdf);
+
+
+ pe.set_print_settings(ps);
+
+
+ pe.print();
+
+
+ #else
+ var pe = new Gtk.PrintOperation();
+ pe.export_filename = webkitpdf.opt_target_pdf;
+ print("got callback for print\n");
+ pe.ref();
+ /*pe.failed.connect(() => {
+ print("print failed\n");
+ Gtk.main_quit();
+
+ })
+ */;
+ pe.done.connect(() => {
+ print("print completed\n");
+ this.delete_cookiefile();
+ Gtk.main_quit();
+
+ });
+
+ //pe.run_dialog(_this.el);
+
+
+
+
+
+ pe.set_default_page_setup(psetup);
+ print("Calling Print?\n");
+ //pe.run_dialog(_this.el);
+
+
+
+
+
+ try {
+ this.el.get_main_frame().print_full(pe,Gtk.PrintOperationAction.EXPORT);
+ } catch (Error e) {
+ // print failed...
+ }
+ #endif
+
+
+ return false;
+ }
+ public void printpng () {
+ //var filename = "/tmp/test.pdf";
+ //print("load_changed %d ?= %d\n", le, LoadEvent.FINISHED);
+
+ //if (le != LoadEvent.FINISHED) {
+ // return;
+ // }
+
+ // what size is the documet.
+
+ print("making screenshot\n");
+ #if GTK3
+
+ #else
+ // fix vapi - get_snapshot add '?' to all null.
+ var pixmap = _this.view.el.get_snapshot( null );
+
+
+
+ int w,h;
+
+ // add out to gdkpixmap.get_size
+ pixmap.get_size( out w , out h);
+ var pixbuf = Gdk.pixbuf_get_from_drawable(null, pixmap, null , 0, 0, 0, 0, w, h);
+ print("pixbuf size: %d x %d\n ", w,h);
+
+
+
+ pixbuf.save(webkitpdf.opt_target_png, "png");
+ print("Saved to %s\n", webkitpdf.opt_target_png);
+ //view.get_snapshot.begin(WebKit.SnapshotRegion.FULL_DOCUMENT, WebKit.SnapshotOptions.NONE, null, (obj, res) => {
+ // var sf = view.get_snapshot.end(res);
+
+ // sf.write_to_png(Browser.opt_target_png);
+ //});
+ this.delete_cookiefile();
+ Gtk.main_quit();
+
+ #endif
+
+
+
+ }
+ public void delete_cookiefile () {
+ if(this.cookie_file.length < 1 ){
+ return;
+ }
+ print("deleting tmp file %s\n",this.cookie_file);
+ File file = File.new_for_path (this.cookie_file);
+ try {
+ if (file.query_exists () == true) {
+ file.delete ();
+ }
+ } catch (Error e) {
+ stdout.printf ("Error: %s\n", e.message);
+ }
+
+ }
}
-
-
- public class Xcls_ok_button : Object
- {
- public Gtk.Button el;
- private NewBranch _this;
-
-
- // my vars (def)
-
- // ctor
- public Xcls_ok_button(NewBranch _owner )
- {
- _this = _owner;
- _this.ok_button = this;
- this.el = new Gtk.Button();
-
- // my vars (dec)
-
- // set gobject values
- this.el.expand = false;
- this.el.label = "Close";
- }
-
- // user defined functions
- }
-
}
projects / gitlive / blobdiff