Add c file for embedded php wrapper

Add very biased makefile, and update some stuff

.gitignore

@@ -4,4 +4,7 @@ settings.json
 errors.txt
 tests/db_files/*
 test_config.json
-nbproject/*
+nbproject/*
+*.o
+*.app/*
+OpenSQLManager

OpenSQLManager.c

@@ -0,0 +1,26 @@
+/**
+ * OpenSQLManager
+ *
+ * Free Database manager for Open Source Databases
+ *
+ * @package		OpenSQLManager
+ * @author 		Timothy J. Warren
+ * @copyright	Copyright (c) 2012
+ * @link 		https://github.com/aviat4ion/OpenSQLManager
+ * @license 	https://timshomepage.net/dbaj.txt
+ */
+
+/**
+ * Wrapper program for embeded php
+ */
+
+#include <sapi/embed/php_embed.h>
+
+int main(int argc, char *argv[])
+{
+	PHP_EMBED_START_BLOCK(argc,argv)
+		zend_eval_string("include ('./OpenSQLManager.php');", NULL, "TEST" TSRMLS_CC);
+	PHP_EMBED_END_BLOCK()
+
+	return 0;
+}

makefile

@@ -0,0 +1,8 @@
+CC = gcc
+CFLAGS = -c `/opt/php-embed/bin/php-config --includes` -Wall -g
+
+LDFLAGS = -L/Library/Frameworks/Firebird.framework/Libraries -L/opt/php-embed/lib -lphp5 `/opt/php-embed/bin/php-config --libs`
+
+all: OpenSQLManager.c
+	${CC} -o OpenSQLManager.o OpenSQLManager.c ${CFLAGS}
+	${CC} -o OpenSQLManager OpenSQLManager.o ${LDFLAGS}

sys/widgets/connection_sidebar.php

@@ -64,6 +64,13 @@ class Connection_Sidebar extends \wxPanel {
 	 */
 	private $list;
 	
+	/**
+	 * Reference to the image list control that holds connection images
+	 *
+	 * @var wxImageList
+	 */
+	private $img_list;
+	
 	/**
 	 * Reference to the parent of the current object
 	 *
@@ -174,6 +181,20 @@ class Connection_Sidebar extends \wxPanel {
 	
 	// --------------------------------------------------------------------------
 	
+	/**
+	 * Connect to the database for data display/manipulation
+	 *
+	 * @param wxEvent
+	 * @return void
+	 */
+	public function open_connection($event)
+	{
+		$id = $event->GetId();
+		alert('Double click:' . $id);		
+	}
+	
+	// --------------------------------------------------------------------------
+	
 	/**
 	 * Add the existing items to the connection sidebar
 	 *
@@ -181,9 +202,18 @@ class Connection_Sidebar extends \wxPanel {
 	 */
 	public function _layout()
 	{
-		$this->list = new \wxListCtrl($this->parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_LIST|wxLC_SINGLE_SEL);
+		$this->list = new \wxListCtrl($this->parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_SMALL_ICON | wxLC_SINGLE_SEL | wxLC_ALIGN_TOP);
+		$this->img_list = new \wxImageList(32, 32);
 		$this->settings =& Settings::get_instance();
 		$this->list->Connect(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, array($this, 'menu'));
+		$this->list->Connect(wxEVT_LEFT_DCLICK, array($this, 'open_connection'));
+		
+		// Add Images to the Image list
+		foreach(glob(OSM_RESOURCE_DIR.'/images/*.xpm') as $path)
+		{
+			//$img = new \wxBitmap($path);
+			//$this->img_list->Add($img);
+		}
 		
 		// Create a button for adding new connections
 		$new_conn = new \wxButton($this, self::BTN_ADD, 'New Connection');

sys/widgets/data_grid.php

@@ -33,9 +33,9 @@ class Data_Grid extends \wxGrid {
 		if ( ! is_null($parent))
 		{
 			parent::__construct($parent, wxID_ANY);
-			$this->CreateGrid(10,10);
+			$this->CreateGrid(30,8);
-			$this->HideColLabels();
+			//$this->HideColLabels();
-			$this->HideRowLabels();
+			//$this->HideRowLabels();
 		}
 		else
 		{

sys/widgets/db_tabs.php

@@ -66,7 +66,7 @@ class DB_tabs extends \wxAUINotebook {
 	 */
 	public function __construct($parent)
 	{
-		parent::__construct($parent);
+		parent::__construct($parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_NB_TOP | wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_MOVE | wxAUI_NB_SCROLL_BUTTONS | wxAUI_NB_CLOSE_ON_ALL_TABS | wxAUI_NB_WINDOWLIST_BUTTON);
 		$this->parent = $parent;
 		$this->data = new \StdClass();
 	}

sys/windows/main.php

@@ -47,7 +47,14 @@ class Main extends \wxFrame {
 	 *
 	 * @var wxSplitterWindow
 	 */
-	protected $split;
+	protected $split;
+	
+	/**
+	 * Reference to tab control in split Window
+	 *
+	 * @var wxAUINotebook
+	 */
+	protected $tabs;
 
 	/**
 	 * Create and display the main window on startup
@@ -149,15 +156,15 @@ class Main extends \wxFrame {
 
 		// Add the connection sidebar
 		$this->connection_sidebar =& Connection_Sidebar::get_instance($win);
-		$win2 = new Db_tabs($win);
+		$win2 = new Db_tabs($win);
-		$win2->add_tab('Test');
 
 		// Add the widgets to the split window
 		$win->SplitVertically($this->connection_sidebar, $win2);
 		$win->SetSashPosition(200, TRUE);
 		
 		// Save a reference for later use
-		$this->split =& $win;
+		$this->split =& $win;
+		$this->tabs =& $win2;
 	}
 
 	// --------------------------------------------------------------------------