From 9dd0a3c17fc827c77db5719f788c16480a4d2940 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Tue, 3 Apr 2012 10:16:25 -0400 Subject: [PATCH] Connection shows tables! --- sys/windows/widgets/connection_sidebar.php | 2 +- sys/windows/widgets/db_tabs.php | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/sys/windows/widgets/connection_sidebar.php b/sys/windows/widgets/connection_sidebar.php index 1a1d15f..5e49821 100644 --- a/sys/windows/widgets/connection_sidebar.php +++ b/sys/windows/widgets/connection_sidebar.php @@ -363,7 +363,7 @@ class Connection_Sidebar extends GtkVBox { return; } - DB_Tabs::get_instance()->get_db_tabs($conn); + DB_Tabs::get_db_tabs($conn); } // -------------------------------------------------------------------------- diff --git a/sys/windows/widgets/db_tabs.php b/sys/windows/widgets/db_tabs.php index 151370a..ccf2afd 100644 --- a/sys/windows/widgets/db_tabs.php +++ b/sys/windows/widgets/db_tabs.php @@ -80,7 +80,7 @@ class DB_tabs extends GTKNotebook { */ public static function reset() { - unset(self::$instance); + self::$instance = new DB_tabs(); return self::get_instance(); } @@ -92,7 +92,7 @@ class DB_tabs extends GTKNotebook { * @param Query_Builder $conn * @return void */ - public function get_db_tabs(&$conn) + public static function get_db_tabs(&$conn) { $tables = new Data_Grid(); $table_model = $tables->get_model(); @@ -100,14 +100,16 @@ class DB_tabs extends GTKNotebook { foreach($table_data as $t) { - $iter = $table_model->append(); - $table_model->set($iter, 0, $t); + $table_model->append(null, array($t)); + //$table_model->set($iter, 0, $t); } $cell_renderer = new GtkCellRendererText(); - $tables->insert_column_with_data_func(0, 'Table Name', $cell_renderer, array($this, 'add_data_col')); + $tables->insert_column_with_data_func(0, 'Table Name', $cell_renderer, array(self::$instance, 'add_data_col')); - $this->add_tab('Tables', $tables); + self::$instance->add_tab('Tables', $tables); + + self::$instance->show_all(); } @@ -125,6 +127,7 @@ class DB_tabs extends GTKNotebook { */ public function add_data_col($col, $cell, $model, $iter, $i=0) { + $col->set_visible(TRUE); $data = $model->get_value($iter, $i); $cell->set_property('text', $data); }