Uncommited changes synced

diff --git a/Makefile.am b/Makefile.am
index 3556ac9..1395b0d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,9 @@ Gitlive_PKGS = \
                --pkg libcanberra \
                --pkg libsoup-2.4 \
                --pkg json-glib-1.0 \
-               --pkg  gtksourceview-3.0
+               --pkg  gtksourceview-3.0 \
+               --pkg  webkit2gtk-4.0
+               
 
 Gitlive_SOURCES = \
           Gitlive.vala \

diff --git a/NewBranch.bjs b/NewBranch.bjs
index 661d188..6cef9ef 100644 (file)
--- a/NewBranch.bjs
+++ b/NewBranch.bjs
@@ -17,8 +17,8 @@
    "title" : "Create a working branch ",
    "xtype" : "Dialog",
    "# GitRepo? repo" : "null",
-   "|   void show" : "( GitRepo repo, Gee.ArrayList<GitMonitorQueue> queue, string tid = \"\" ) \n{\n     // this.el.set_gravity(Gdk.Gravity.NORTH);\n    if (this.running) { // should not happen!!\n    \tGLib.error(\"new branch show called, when already being displayed?\");\n\t}\n\tthis.queue = queue;\n\t\n\tthis.running  = true;\n\tGitMonitor.gitmonitor.stop();\n\t\n    this.repo = repo;\n    \n     \n    \n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n\tthis.el.set_default_size( 500,200); // not sure why it grows..\n    GLib.debug(\"Loading tickets\"); \n     \n\n    this.el.show_all();\n    this.el.set_keep_above(true);\n   \n    \n    var curproj = RooTicket.singleton().getProjectByRepo(this.repo);\n     _this.prmodel.loadProjects(curproj == null ? \"\" : curproj.id);\n    \n \t_this.dbmodel.loadTickets(curproj == null ? \"\": curproj.id, tid);\n \tif (tid != \"\") {\n\t \tvar name = RooTicket.singleton().usernameLocal();\n \t\tvar ticket = RooTicket.singleton().getById(tid);\n\t\t_this.name.el.set_text(\"wip_%s_T%s_%s\".printf(name,ticket.id, ticket.summaryToBranchName()));\n\t}\n\n \tthis.el.run();\n\n}",
-   "default_height" : 200,
+   "|   void show" : "( GitRepo repo, Gee.ArrayList<GitMonitorQueue> queue, string tid = \"\" ) \n{\n     // this.el.set_gravity(Gdk.Gravity.NORTH);\n    if (this.running) { // should not happen!!\n    \tGLib.error(\"new branch show called, when already being displayed?\");\n\t}\n\tthis.queue = queue;\n\t\n\tthis.running  = true;\n\tGitMonitor.gitmonitor.stop();\n\t\n    this.repo = repo;\n    \n     \n    \n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n\tthis.el.set_default_size( 500,200); // not sure why it grows..\n    GLib.debug(\"Loading tickets\"); \n     \n\n    this.el.show_all();\n    this.el.set_keep_above(true);\n   \n    \n    var curproj = RooTicket.singleton().getProjectByRepo(this.repo);\n     _this.prmodel.loadProjects(curproj == null ? \"\" : curproj.id);\n    \n \t_this.dbmodel.loadTickets(curproj == null ? \"\": curproj.id, tid);\n \t_this.scrolled_window.el.hide();\n \tif (tid != \"\") {\n\t \tvar name = RooTicket.singleton().usernameLocal();\n \t\tvar ticket = RooTicket.singleton().getById(tid);\n\t\t_this.name.el.set_text(\"wip_%s_T%s_%s\".printf(name,ticket.id, ticket.summaryToBranchName()));\n\t\t_this.scrolled_window.el.show();\n\t\t_this.view.loadTicket(tid);\n\t}\n\n \tthis.el.run();\n\n}",
+   "default_height" : 500,
    "$ xns" : "Gtk",
    "# bool running" : false,
    "# Gee.ArrayList<GitMonitorQueue> queue" : "null",
@@ -93,7 +93,7 @@
         },
         {
          "listeners" : {
-          "changed" : "() => {\n\tif (this.loading) {\n\t\treturn;\n\t}\n\tvar ticket_id = this.selectedTicketId();\n\t\n\tvar name = RooTicket.singleton().usernameLocal();\n\t\n\tif (ticket_id == \"\" || ticket_id == null) {\n\t\n\t\tvar dt = new  DateTime.now_local();\n\t\t_this.name.el.set_text(\"wip_%s_%s\".printf(name,dt.format(\"%Y_%b_%d\")));\n\t\treturn;\n\t}\n\t\n\t\n\tvar ticket = RooTicket.singleton().getById(ticket_id);\n   \n\t_this.name.el.set_text(\"wip_%s_T%s_%s\".printf(name,ticket.id, ticket.summaryToBranchName()));\n\t\n\t//GLib.debug (//\"Selection: %s, %s\\n\", (string) val1, (string) val2);\n}"
+          "changed" : "() => {\n\tif (this.loading) {\n\t\treturn;\n\t}\n\tvar ticket_id = this.selectedTicketId();\n\t\n\tvar name = RooTicket.singleton().usernameLocal();\n\t\n\tif (ticket_id == \"\" || ticket_id == null) {\n\t\n\t\tvar dt = new  DateTime.now_local();\n\t\t_this.name.el.set_text(\"wip_%s_%s\".printf(name,dt.format(\"%Y_%b_%d\")));\n\t\treturn;\n\t}\n\t\n\t\n\tvar ticket = RooTicket.singleton().getById(ticket_id);\n   \n\t_this.name.el.set_text(\"wip_%s_T%s_%s\".printf(name,ticket.id, ticket.summaryToBranchName()));\n\t_this.view.loadTicket(ticket.id);\n\t//GLib.debug (//\"Selection: %s, %s\\n\", (string) val1, (string) val2);\n}"
          },
          "* ctor" : "new Gtk.ComboBox.with_entry()",
          "id" : "ticketsel",
@@ -206,12 +206,14 @@
        "* pack" : "add",
        "xtype" : "ScrolledWindow",
        "$ xns" : "Gtk",
+       "bool vexpand" : true,
        "items" : [
         {
          "id" : "view",
          "* pack" : "add",
          "xtype" : "WebView",
-         "$ xns" : "WebKit"
+         "$ xns" : "WebKit",
+         "| void loadTicket" : "(string tid) {\n\t this.el.load_uri(\"http://www.google.com\");\n}\n"
         }
        ]
       }

diff --git a/NewBranch.vala b/NewBranch.vala
index bb00de1..cce2256 100644 (file)
--- a/NewBranch.vala
+++ b/NewBranch.vala
@@ -42,7 +42,7 @@ public class NewBranch : Object
 
         // set gobject values
         this.el.title = "Create a working branch ";
-        this.el.default_height = 200;
+        this.el.default_height = 500;
         this.el.default_width = 500;
         this.el.deletable = true;
         this.el.modal = true;
@@ -127,10 +127,13 @@ public class NewBranch : Object
          _this.prmodel.loadProjects(curproj == null ? "" : curproj.id);
         
        _this.dbmodel.loadTickets(curproj == null ? "": curproj.id, tid);
+       _this.scrolled_window.el.hide();
        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.scrolled_window.el.show();
+               _this.view.loadTicket(tid);
        }
     
        this.el.run();
@@ -480,7 +483,7 @@ public class NewBranch : Object
                var ticket = RooTicket.singleton().getById(ticket_id);
                
                _this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName()));
-               
+               _this.view.loadTicket(ticket.id);
                //GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2);
             });
         }
@@ -854,6 +857,7 @@ public class NewBranch : Object
             // my vars (dec)
 
             // set gobject values
+            this.el.vexpand = true;
             var child_0 = new Xcls_view( _this );
             child_0.ref();
             this.el.add (  child_0.el  );
@@ -883,9 +887,14 @@ public class NewBranch : Object
             this.el = new WebKit.WebView();
 
             // my vars (dec)
+
+            // set gobject values
         }
 
         // user defined functions
+        public void loadTicket (string tid) {
+                this.el.load_uri("http://www.google.com");
+        }
     }
 
 

diff --git a/config1.builder b/config1.builder
index 572b90f..3e98e73 100644 (file)
--- a/config1.builder
+++ b/config1.builder
@@ -45,7 +45,8 @@
             "gtk+-3.0",
             "json-glib-1.0",
             "libsoup-2.4",
-            "gtksourceview-3.0"
+            "gtksourceview-3.0",
+            "webkit2gtk-4.0"
         ]
     }
 ]
\ No newline at end of file

diff --git a/configure.ac b/configure.ac
index 11ab133..935d4c0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,8 +29,9 @@ PKG_CHECK_MODULES(GITLIVE, [
                 gtksourceview-3.0               
                 libnotify
          libwnck-3.0
+        webkit2gtk-4.0
          libcanberra
-        libsoup-2.4 >= 2.56.0     
+         libsoup-2.4 >= 2.56.0     
                 json-glib-1.0    
 ])