-static Xcls_RooProjectSettings _RooProjectSettings;
+static RepoStatusPopover _RepoStatusPopover;
-public class Xcls_RooProjectSettings : Object
+public class RepoStatusPopover : Object
{
public Gtk.Popover el;
- private Xcls_RooProjectSettings _this;
+ private RepoStatusPopover _this;
- public static Xcls_RooProjectSettings singleton()
+ public static RepoStatusPopover singleton()
{
- if (_RooProjectSettings == null) {
- _RooProjectSettings= new Xcls_RooProjectSettings();
+ if (_RepoStatusPopover == null) {
+ _RepoStatusPopover= new RepoStatusPopover();
}
- return _RooProjectSettings;
+ return _RepoStatusPopover;
}
public Xcls_label_status label_status;
public Xcls_label_diff label_diff;
- public Xcls_view view;
- public Xcls_view view;
+ public Xcls_status_view status_view;
+ public Xcls_diff_view diff_view;
// my vars (def)
- public signal void buttonPressed (string btn);
- public Project.Project project;
+ public GitRepo repo;
// ctor
- public Xcls_RooProjectSettings()
+ public RepoStatusPopover()
{
_this = this;
this.el = new Gtk.Popover( null );
}
// user defined functions
- public void show (Gtk.Widget btn, GitRepo repo) {
+ public void show (Gtk.Widget btn, Gdk.Rectangle rect, GitRepo repo) {
_this.repo = repo;
// get the active project.
var lm = Gtk.SourceLanguageManager.get_default();
//print (project.fn);
//project.runhtml = project.runhtml || '';
- _this.diff_view.el.get_buffer().set_text("diff goes here");
-
-
-
- _this.rootURL.el.set_text( _this.project.rootURL );
-
- _this.html_gen_model.loadData(_this.project.html_gen);
-
- _this.base_template_model.loadData();
-
- var js = _this.project;
- _this.database_DBTYPE.el.set_text( js.get_string_member("DBTYPE") );
- _this.database_DBNAME.el.set_text( js.get_string_member("DBNAME") );
- _this.database_DBUSERNAME.el.set_text( js.get_string_member("DBUSERNAME") );
- _this.database_DBPASSWORD.el.set_text( js.get_string_member("DBPASSWORD") );
-
+ _this.diff_view.el.get_buffer().set_text(repo.git_diff);
+ _this.status_view.el.get_buffer().set_text(repo.git_status);
+
//console.log('show all');
this.el.set_modal(true);
this.el.set_relative_to(btn);
-
- this.el.set_position(Gtk.PositionType.RIGHT);
+ this.el.set_pointing_to(rect);
+
+ //this.el.set_position(Gtk.PositionType.RIGHT);
// window + header?
- print("SHOWALL - POPIP\n");
+ GLib.debug("SHOWALL - POPIP\n");
this.el.show_all();
- this.el.set_size_request(800,500);
- this.view.el.grab_focus();
+ //this.el.set_size_request(800,500);
+ // this.diff_view.el.grab_focus();
-
//this.el.show_all();
}
public class Xcls_Box2 : Object
{
public Gtk.Box el;
- private Xcls_RooProjectSettings _this;
+ private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_Box2(Xcls_RooProjectSettings _owner )
+ public Xcls_Box2(RepoStatusPopover _owner )
{
_this = _owner;
this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );
public class Xcls_Notebook3 : Object
{
public Gtk.Notebook el;
- private Xcls_RooProjectSettings _this;
+ private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_Notebook3(Xcls_RooProjectSettings _owner )
+ public Xcls_Notebook3(RepoStatusPopover _owner )
{
_this = _owner;
this.el = new Gtk.Notebook();
public class Xcls_label_status : Object
{
public Gtk.Label el;
- private Xcls_RooProjectSettings _this;
+ private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_label_status(Xcls_RooProjectSettings _owner )
+ public Xcls_label_status(RepoStatusPopover _owner )
{
_this = _owner;
_this.label_status = this;
public class Xcls_label_diff : Object
{
public Gtk.Label el;
- private Xcls_RooProjectSettings _this;
+ private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_label_diff(Xcls_RooProjectSettings _owner )
+ public Xcls_label_diff(RepoStatusPopover _owner )
{
_this = _owner;
_this.label_diff = this;
public class Xcls_Box6 : Object
{
public Gtk.Box el;
- private Xcls_RooProjectSettings _this;
+ private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_Box6(Xcls_RooProjectSettings _owner )
+ public Xcls_Box6(RepoStatusPopover _owner )
{
_this = _owner;
this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );
public class Xcls_ScrolledWindow7 : Object
{
public Gtk.ScrolledWindow el;
- private Xcls_RooProjectSettings _this;
+ private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_ScrolledWindow7(Xcls_RooProjectSettings _owner )
+ public Xcls_ScrolledWindow7(RepoStatusPopover _owner )
{
_this = _owner;
this.el = new Gtk.ScrolledWindow( null, null );
// my vars (dec)
// set gobject values
- var child_0 = new Xcls_view( _this );
+ var child_0 = new Xcls_status_view( _this );
child_0.ref();
this.el.add ( child_0.el );
}
// user defined functions
}
- public class Xcls_view : Object
+ public class Xcls_status_view : Object
{
public Gtk.SourceView el;
- private Xcls_RooProjectSettings _this;
+ private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_view(Xcls_RooProjectSettings _owner )
+ public Xcls_status_view(RepoStatusPopover _owner )
{
_this = _owner;
- _this.view = this;
+ _this.status_view = this;
this.el = new Gtk.SourceView();
// my vars (dec)
var description = Pango.FontDescription.from_string("monospace");
description.set_size(9000);
this.el.override_font(description);
-
- //listeners
- this.el.key_release_event.connect( ( event) =>{
- if (event.keyval != 115) {
- return false;
-
- }
- if ( (event.state & Gdk.ModifierType.CONTROL_MASK ) < 1 ) {
- return false;
- }
- var buf = this.el.get_buffer();
- Gtk.TextIter s;
- Gtk.TextIter e;
- buf.get_start_iter(out s);
- buf.get_end_iter(out e);
- _this.project.runhtml = buf.get_text(s,e,true);
-
-
- _this.buttonPressed("save");
-
- return false;
-
- });
}
// user defined functions
public class Xcls_Box9 : Object
{
public Gtk.Box el;
- private Xcls_RooProjectSettings _this;
+ private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_Box9(Xcls_RooProjectSettings _owner )
+ public Xcls_Box9(RepoStatusPopover _owner )
{
_this = _owner;
this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );
public class Xcls_ScrolledWindow10 : Object
{
public Gtk.ScrolledWindow el;
- private Xcls_RooProjectSettings _this;
+ private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_ScrolledWindow10(Xcls_RooProjectSettings _owner )
+ public Xcls_ScrolledWindow10(RepoStatusPopover _owner )
{
_this = _owner;
this.el = new Gtk.ScrolledWindow( null, null );
// my vars (dec)
// set gobject values
- var child_0 = new Xcls_view( _this );
+ this.el.height_request = 400;
+ var child_0 = new Xcls_diff_view( _this );
child_0.ref();
this.el.add ( child_0.el );
}
// user defined functions
}
- public class Xcls_view : Object
+ public class Xcls_diff_view : Object
{
public Gtk.SourceView el;
- private Xcls_RooProjectSettings _this;
+ private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_view(Xcls_RooProjectSettings _owner )
+ public Xcls_diff_view(RepoStatusPopover _owner )
{
_this = _owner;
- _this.view = this;
+ _this.diff_view = this;
this.el = new Gtk.SourceView();
// my vars (dec)
var description = Pango.FontDescription.from_string("monospace");
description.set_size(9000);
this.el.override_font(description);
-
- //listeners
- this.el.key_release_event.connect( ( event) =>{
- if (event.keyval != 115) {
- return false;
-
- }
- if ( (event.state & Gdk.ModifierType.CONTROL_MASK ) < 1 ) {
- return false;
- }
- var buf = this.el.get_buffer();
- Gtk.TextIter s;
- Gtk.TextIter e;
- buf.get_start_iter(out s);
- buf.get_end_iter(out e);
- _this.project.runhtml = buf.get_text(s,e,true);
-
-
- _this.buttonPressed("save");
-
- return false;
-
- });
}
// user defined functions
public class Xcls_Box12 : Object
{
public Gtk.Box el;
- private Xcls_RooProjectSettings _this;
+ private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_Box12(Xcls_RooProjectSettings _owner )
+ public Xcls_Box12(RepoStatusPopover _owner )
{
_this = _owner;
this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 );
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 );
}
// user defined functions
public class Xcls_Button13 : Object
{
public Gtk.Button el;
- private Xcls_RooProjectSettings _this;
+ private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_Button13(Xcls_RooProjectSettings _owner )
+ public Xcls_Button13(RepoStatusPopover _owner )
{
_this = _owner;
this.el = new Gtk.Button();
//listeners
this.el.button_press_event.connect( () => {
- _this.el.hide();
- return false;
+
+
+ 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;
});
}
public class Xcls_Button14 : Object
{
public Gtk.Button el;
- private Xcls_RooProjectSettings _this;
+ private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_Button14(Xcls_RooProjectSettings _owner )
+ public Xcls_Button14(RepoStatusPopover _owner )
{
_this = _owner;
this.el = new Gtk.Button();
//listeners
this.el.button_press_event.connect( () => {
- _this.el.hide();
- return false;
+ _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;
});
}
public class Xcls_Button15 : Object
{
public Gtk.Button el;
- private Xcls_RooProjectSettings _this;
+ private RepoStatusPopover _this;
+
+
+ // my vars (def)
+
+ // ctor
+ public Xcls_Button15(RepoStatusPopover _owner )
+ {
+ _this = _owner;
+ this.el = new Gtk.Button();
+
+ // my vars (dec)
+
+ // set gobject values
+ this.el.label = "Create Branch";
+
+ //listeners
+ this.el.button_press_event.connect( () => {
+ var oldq = new Gee.ArrayList<GitMonitorQueue>();
+ _this.el.hide();
+ Clones.singleton().el.hide();
+ NewBranch.singleton().show(_this.repo, oldq);
+
+ return false;
+ });
+ }
+
+ // user defined functions
+ }
+
+ public class Xcls_Button16 : Object
+ {
+ public Gtk.Button el;
+ private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_Button15(Xcls_RooProjectSettings _owner )
+ public Xcls_Button16(RepoStatusPopover _owner )
{
_this = _owner;
this.el = new Gtk.Button();
// my vars (dec)
// set gobject values
- this.el.label = "Ignore or now";
+ this.el.label = "Ignore for now";
//listeners
this.el.button_press_event.connect( () => {