-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_database_DBTYPE database_DBTYPE;
- public Xcls_database_DBNAME database_DBNAME;
- public Xcls_database_DBUSERNAME database_DBUSERNAME;
- public Xcls_database_DBPASSWORD database_DBPASSWORD;
- public Xcls_database_ERROR database_ERROR;
+ 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, Project.Project project) {
- _this.project = project;
- _this.path.el.label = project.firstPath();
+ public void show (Gtk.Widget btn, Gdk.Rectangle rect, GitRepo repo) {
+ _this.repo = repo;
// get the active project.
var lm = Gtk.SourceLanguageManager.get_default();
- ((Gtk.SourceBuffer)(_this.view.el.get_buffer())) .set_language(
- lm.get_language("html")
- );
+ // ((Gtk.SourceBuffer)(_this.view.el.get_buffer())) .set_language(
+ // lm.get_language("html")
+ // );
//print (project.fn);
//project.runhtml = project.runhtml || '';
- _this.view.el.get_buffer().set_text(project.runhtml);
-
-
-
- _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 void save () {
- var buf = _this.view.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.project.rootURL = _this.rootURL.el.get_text();
-
-
- Gtk.TreeIter iter;
- Value html_gen_val;
- _this.html_gen.el.get_active_iter(out iter);
- _this.html_gen_model.el.get_value (iter, 0, out html_gen_val);
-
- _this.project.html_gen = (string)html_gen_val;
-
- // set by event changed...
- //_this.project.base_template = _this.base_template.el.get_text();
-
- var js = _this.project.json_project_data;
- js.set_string_member("DBTYPE", _this.database_DBTYPE.el.get_text());
- js.set_string_member("DBNAME", _this.database_DBNAME.el.get_text());
- js.set_string_member("DBUSERNAME", _this.database_DBUSERNAME.el.get_text());
- js.set_string_member("DBPASSWORD", _this.database_DBPASSWORD.el.get_text());
- // _this.project.set_string_member("DBHOST", _this.DBTYPE.el.get_text());
-
- // need to re-init the database
-
- _this.project.initRooDatabase();
-
-
}
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 );
var child_0 = new Xcls_Notebook3( _this );
child_0.ref();
this.el.pack_start ( child_0.el , true,true,0 );
- var child_1 = new Xcls_Box23( _this );
+ var child_1 = new Xcls_Box12( _this );
child_1.ref();
this.el.pack_end ( child_1.el , false,false,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();
var child_3 = new Xcls_Box9( _this );
child_3.ref();
this.el.append_page ( child_3.el , _this.label_diff.el );
- var child_4 = new Xcls_Box12( _this );
- child_4.ref();
- this.el.append_page ( child_4.el , _this.label_database.el );
}
// user defined functions
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.VERTICAL, 0 );
+ this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 );
// my vars (dec)
// set gobject values
- this.el.homogeneous = false;
- var child_0 = new Xcls_Label13( _this );
+ this.el.homogeneous = true;
+ this.el.expand = false;
+ this.el.vexpand = false;
+ var child_0 = new Xcls_Button13( _this );
child_0.ref();
- this.el.pack_start ( child_0.el , false,false,0 );
- var child_1 = new Xcls_database_DBTYPE( _this );
+ this.el.add ( child_0.el );
+ var child_1 = new Xcls_Button14( _this );
child_1.ref();
- this.el.pack_start ( child_1.el , false,false,0 );
- var child_2 = new Xcls_Label15( _this );
+ this.el.add ( child_1.el );
+ var child_2 = new Xcls_Button15( _this );
child_2.ref();
- this.el.pack_start ( child_2.el , false,false,0 );
- var child_3 = new Xcls_database_DBNAME( _this );
+ this.el.add ( child_2.el );
+ var child_3 = new Xcls_Button16( _this );
child_3.ref();
- this.el.pack_start ( child_3.el , false,false,0 );
- var child_4 = new Xcls_Label17( _this );
- child_4.ref();
- this.el.pack_start ( child_4.el , false,false,0 );
- var child_5 = new Xcls_database_DBUSERNAME( _this );
- child_5.ref();
- this.el.pack_start ( child_5.el , false,false,0 );
- var child_6 = new Xcls_Label19( _this );
- child_6.ref();
- this.el.pack_start ( child_6.el , false,false,0 );
- var child_7 = new Xcls_database_DBPASSWORD( _this );
- child_7.ref();
- this.el.pack_start ( child_7.el , false,false,0 );
- var child_8 = new Xcls_Button21( _this );
- child_8.ref();
- this.el.pack_start ( child_8.el , false,false,0 );
- var child_9 = new Xcls_database_ERROR( _this );
- child_9.ref();
- this.el.pack_start ( child_9.el , false,false,0 );
- }
-
- // user defined functions
- }
- public class Xcls_Label13 : Object
- {
- public Gtk.Label el;
- private Xcls_RooProjectSettings _this;
-
-
- // my vars (def)
-
- // ctor
- public Xcls_Label13(Xcls_RooProjectSettings _owner )
- {
- _this = _owner;
- this.el = new Gtk.Label( "Type (eg. MySQL or PostgreSQL)" );
-
- // my vars (dec)
-
- // set gobject values
- this.el.xalign = 0f;
- }
-
- // user defined functions
- }
-
- public class Xcls_database_DBTYPE : Object
- {
- public Gtk.Entry el;
- private Xcls_RooProjectSettings _this;
-
-
- // my vars (def)
-
- // ctor
- public Xcls_database_DBTYPE(Xcls_RooProjectSettings _owner )
- {
- _this = _owner;
- _this.database_DBTYPE = this;
- this.el = new Gtk.Entry();
-
- // my vars (dec)
-
- // set gobject values
-
- //listeners
- this.el.key_press_event.connect( (ev) => {
-
- if (ev.keyval == Gdk.Key.Tab) {
- _this.database_DBNAME.el.grab_focus();
- return true;
- }
-
-
- return false;
- });
- }
-
- // user defined functions
- }
-
- public class Xcls_Label15 : Object
- {
- public Gtk.Label el;
- private Xcls_RooProjectSettings _this;
-
-
- // my vars (def)
-
- // ctor
- public Xcls_Label15(Xcls_RooProjectSettings _owner )
- {
- _this = _owner;
- this.el = new Gtk.Label( "Name" );
-
- // my vars (dec)
-
- // set gobject values
- this.el.xalign = 0f;
- }
-
- // user defined functions
- }
-
- public class Xcls_database_DBNAME : Object
- {
- public Gtk.Entry el;
- private Xcls_RooProjectSettings _this;
-
-
- // my vars (def)
-
- // ctor
- public Xcls_database_DBNAME(Xcls_RooProjectSettings _owner )
- {
- _this = _owner;
- _this.database_DBNAME = this;
- this.el = new Gtk.Entry();
-
- // my vars (dec)
-
- // set gobject values
-
- //listeners
- this.el.key_press_event.connect( (ev) => {
-
- if (ev.keyval == Gdk.Key.Tab) {
- _this.database_DBUSERNAME.el.grab_focus();
- return true;
- }
-
-
- return false;
- });
+ this.el.add ( child_3.el );
}
// user defined functions
}
-
- public class Xcls_Label17 : Object
+ public class Xcls_Button13 : Object
{
- public Gtk.Label el;
- private Xcls_RooProjectSettings _this;
-
-
- // my vars (def)
-
- // ctor
- public Xcls_Label17(Xcls_RooProjectSettings _owner )
- {
- _this = _owner;
- this.el = new Gtk.Label( "Username" );
-
- // my vars (dec)
-
- // set gobject values
- this.el.xalign = 0f;
- }
-
- // user defined functions
- }
-
- public class Xcls_database_DBUSERNAME : Object
- {
- public Gtk.Entry el;
- private Xcls_RooProjectSettings _this;
+ public Gtk.Button el;
+ private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_database_DBUSERNAME(Xcls_RooProjectSettings _owner )
+ public Xcls_Button13(RepoStatusPopover _owner )
{
_this = _owner;
- _this.database_DBUSERNAME = this;
- this.el = new Gtk.Entry();
+ this.el = new Gtk.Button();
// my vars (dec)
// set gobject values
+ this.el.label = "Stash Changes";
//listeners
- this.el.key_press_event.connect( (ev) => {
-
- if (ev.keyval == Gdk.Key.Tab) {
- _this.database_DBPASSWORD.el.grab_focus();
- return true;
- }
-
-
+ 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_Label19 : Object
- {
- public Gtk.Label el;
- private Xcls_RooProjectSettings _this;
-
-
- // my vars (def)
-
- // ctor
- public Xcls_Label19(Xcls_RooProjectSettings _owner )
- {
- _this = _owner;
- this.el = new Gtk.Label( "Password" );
-
- // my vars (dec)
-
- // set gobject values
- this.el.xalign = 0f;
- }
-
- // user defined functions
- }
-
- public class Xcls_database_DBPASSWORD : Object
- {
- public Gtk.Entry el;
- private Xcls_RooProjectSettings _this;
-
-
- // my vars (def)
-
- // ctor
- public Xcls_database_DBPASSWORD(Xcls_RooProjectSettings _owner )
- {
- _this = _owner;
- _this.database_DBPASSWORD = this;
- this.el = new Gtk.Entry();
-
- // my vars (dec)
-
- // set gobject values
- }
-
- // user defined functions
- }
-
- public class Xcls_Button21 : Object
+ public class Xcls_Button14 : Object
{
public Gtk.Button el;
- private Xcls_RooProjectSettings _this;
+ private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_Button21(Xcls_RooProjectSettings _owner )
+ public Xcls_Button14(RepoStatusPopover _owner )
{
_this = _owner;
this.el = new Gtk.Button();
// my vars (dec)
// set gobject values
- this.el.label = "Check Connection";
+ this.el.label = "Commit Changes";
//listeners
- this.el.clicked.connect( () => {
-
-
- _this.database_ERROR.el.label = "";
- Gda.Connection cnc;
- try {
- // assumes localhost...
- cnc = Gda.Connection.open_from_string (
- _this.database_DBTYPE.el.get_text(),
- "DB_NAME=" + _this.database_DBNAME.el.get_text(),
- "USERNAME=" + _this.database_DBUSERNAME.el.get_text() +
- ";PASSWORD=" + _this.database_DBPASSWORD.el.get_text(),
- Gda.ConnectionOptions.NONE
- );
- //} catch (Gda.ConnectionError ce) {
- // _this.database_ERROR.el.label = ce.message;
- } catch(Gda.ConnectionError ue) {
- _this.database_ERROR.el.label = ue.message;
- return;
- } catch(Gda.ConfigError ue) {
- _this.database_ERROR.el.label = ue.message;
- return;
- }
- _this.database_ERROR.el.label = "Connection Succeeded";
- cnc.close();
+ 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_database_ERROR : Object
- {
- public Gtk.Label el;
- private Xcls_RooProjectSettings _this;
-
-
- // my vars (def)
-
- // ctor
- public Xcls_database_ERROR(Xcls_RooProjectSettings _owner )
- {
- _this = _owner;
- _this.database_ERROR = this;
- this.el = new Gtk.Label( " " );
-
- // my vars (dec)
-
- // set gobject values
- this.el.margin = 3;
- this.el.xalign = 0f;
- }
-
- // user defined functions
- }
-
-
-
- public class Xcls_Box23 : Object
- {
- public Gtk.Box el;
- private Xcls_RooProjectSettings _this;
-
-
- // my vars (def)
-
- // ctor
- public Xcls_Box23(Xcls_RooProjectSettings _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_Button24( _this );
- child_0.ref();
- this.el.add ( child_0.el );
- var child_1 = new Xcls_Button25( _this );
- child_1.ref();
- this.el.add ( child_1.el );
- }
-
- // user defined functions
- }
- public class Xcls_Button24 : Object
+ public class Xcls_Button15 : Object
{
public Gtk.Button el;
- private Xcls_RooProjectSettings _this;
+ private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_Button24(Xcls_RooProjectSettings _owner )
+ public Xcls_Button15(RepoStatusPopover _owner )
{
_this = _owner;
this.el = new Gtk.Button();
// my vars (dec)
// set gobject values
- this.el.label = "Apply";
+ this.el.label = "Create Branch";
//listeners
this.el.button_press_event.connect( () => {
- _this.save();
-
- _this.buttonPressed("apply");
- return false;
+ 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_Button25 : Object
+ public class Xcls_Button16 : Object
{
public Gtk.Button el;
- private Xcls_RooProjectSettings _this;
+ private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_Button25(Xcls_RooProjectSettings _owner )
+ public Xcls_Button16(RepoStatusPopover _owner )
{
_this = _owner;
this.el = new Gtk.Button();
// my vars (dec)
// set gobject values
- this.el.label = "Save";
+ this.el.label = "Ignore for now";
//listeners
this.el.button_press_event.connect( () => {
- _this.save();
-
- _this.buttonPressed("save");
+ _this.el.hide();
return false;
});
}
projects / gitlive / blobdiff