diff --git a/src/gmdb2/gladefiles/gmdb-debug.glade b/src/gmdb2/gladefiles/gmdb-debug.glade index 974467d..9996d6d 100644 --- a/src/gmdb2/gladefiles/gmdb-debug.glade +++ b/src/gmdb2/gladefiles/gmdb-debug.glade @@ -1,6 +1,6 @@ - + True diff --git a/src/gmdb2/gladefiles/gmdb-export.glade b/src/gmdb2/gladefiles/gmdb-export.glade index ca0eaff..62930ef 100644 --- a/src/gmdb2/gladefiles/gmdb-export.glade +++ b/src/gmdb2/gladefiles/gmdb-export.glade @@ -1,488 +1,296 @@ - - - + - - - True - Export Table Data - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - - - - True - False - 0 - - - - GTK_BUTTONBOX_END - - - - True - True - True - gtk-help - True - GTK_RELIEF_NORMAL - -11 - - - - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - -6 - - - - - - - True - True - True - GTK_RELIEF_NORMAL - -5 - - - - - True - 0.5 - 0.5 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-convert - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Export - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - - - - True - True - gtk-save - True - GTK_RELIEF_NORMAL - 0 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 30 - True - 6 - 2 - False - 8 - 30 - - - - True - <b>File Name:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - <b>Line Terminator:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - <b>Column Separator:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - <b>Quotes:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - <b>Quote Character:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 4 - 5 - fill - - - - - - - True - <b>Options:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 5 - 6 - fill - - - - - - - True - False - True - False - True - False - - - - True - True - True - True - 0 - - True - * - False - - - - - - True - GTK_SELECTION_BROWSE - - - - - 1 - 2 - 1 - 2 - - - - - - - True - False - True - False - True - False - - - - True - True - True - True - 0 - - True - * - False - - - - - - True - GTK_SELECTION_BROWSE - - - - - 1 - 2 - 2 - 3 - - - - - - - True - False - True - False - True - False - - - - True - True - False - True - 0 - - True - * - False - - - - - - True - GTK_SELECTION_BROWSE - - - - - 1 - 2 - 3 - 4 - - - - - - - True - False - True - False - True - False - - - - True - True - True - True - 0 - - True - * - False - - - - - - True - GTK_SELECTION_BROWSE - - - - - 1 - 2 - 4 - 5 - - - - - - - True - True - Include Headers - True - GTK_RELIEF_NORMAL - True - False - True - - - 1 - 2 - 5 - 6 - fill - - - - - - True - - - 1 - 2 - - - - - 0 - True - True - - - - - - + + + + True + Export Table Data + normal + + + True + + + True + 30 + 6 + 2 + 30 + 8 + + + True + 0 + <b>File Name:</b> + True + + + GTK_FILL + + + + + + True + 0 + <b>Line Terminator:</b> + True + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + <b>Column Separator:</b> + True + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + <b>Quotes:</b> + True + + + 3 + 4 + GTK_FILL + + + + + + True + 0 + <b>Quote Character:</b> + True + + + 4 + 5 + GTK_FILL + + + + + + True + 0 + <b>Options:</b> + True + + + 5 + 6 + GTK_FILL + + + + + + Include Headers + True + True + False + True + True + True + + + 1 + 2 + 5 + 6 + GTK_FILL + + + + + + True + save + + + 1 + 2 + + + + + True + + + + 1 + 2 + 1 + 2 + + + + + True + + + + 1 + 2 + 3 + 4 + + + + + True + + + + 1 + 2 + 2 + 3 + + + + + True + + + + 1 + 2 + 4 + 5 + + + + + 2 + + + + + end + + + gtk-help + -11 + True + True + True + False + True + + + + False + False + 0 + + + + + gtk-cancel + -6 + True + True + True + False + True + + + + False + False + 1 + + + + + -5 + True + True + True + False + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-convert + + + False + False + 0 + + + + + True + _Export + True + + + False + False + 1 + + + + + + + + + False + False + 2 + + + + + gtk-save + True + True + False + True + + + False + False + 3 + + + + + False + end + 0 + + + + + diff --git a/src/gmdb2/gladefiles/gmdb-prefs.glade b/src/gmdb2/gladefiles/gmdb-prefs.glade index 825f86d..ed10ce5 100644 --- a/src/gmdb2/gladefiles/gmdb-prefs.glade +++ b/src/gmdb2/gladefiles/gmdb-prefs.glade @@ -1,136 +1,108 @@ - - - + - - - True - Preferences - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-help - True - GTK_RELIEF_NORMAL - -11 - - - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - -6 - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 10 - True - 1 - 2 - False - 0 - 0 - - - - True - <b>Maximum Rows to Display:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - fill - - - - - - 0 - True - False - - - - - - + + + + True + Preferences + normal + + + True + + + True + 10 + 2 + + + True + 0 + <b>Maximum Rows to Display:</b> + True + + + + + + + + True + True + + + 1 + 2 + GTK_FILL + + + + + + False + 2 + + + + + True + end + + + gtk-help + -11 + True + True + True + False + True + + + False + False + 0 + + + + + gtk-cancel + -6 + True + True + True + False + True + + + False + False + 1 + + + + + gtk-ok + -5 + True + True + True + False + True + + + False + False + 2 + + + + + False + end + 0 + + + + + diff --git a/src/gmdb2/gladefiles/gmdb-props.glade b/src/gmdb2/gladefiles/gmdb-props.glade index 4d5635c..3624d5a 100644 --- a/src/gmdb2/gladefiles/gmdb-props.glade +++ b/src/gmdb2/gladefiles/gmdb-props.glade @@ -1,448 +1,279 @@ - - - + - - - True - dialog1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - -5 - - - - - - 0 - False - True - GTK_PACK_END - - - - - - 10 - True - 8 - 2 - False - 8 - 30 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 3 - 4 - fill - - - - - - - True - <b>Number of Objects:</b> - False - True - GTK_JUSTIFY_RIGHT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 4 - 5 - - - - - - - True - <b>Number of Pages:</b> - False - True - GTK_JUSTIFY_RIGHT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 3 - 4 - - - - - - - True - <b>File Size:</b> - False - True - GTK_JUSTIFY_RIGHT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 2 - 3 - - - - - - - True - <b>JET Version:</b> - False - True - GTK_JUSTIFY_RIGHT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - - - - - - - True - <b>File Name:</b> - False - True - GTK_JUSTIFY_RIGHT - False - False - 0 - 0.5 - 0 - 0 - okbutton1 - - - 0 - 1 - 0 - 1 - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 2 - 3 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 4 - 5 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - <b>Title:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 5 - 6 - fill - - - - - - - True - <b>Author:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 6 - 7 - fill - - - - - - - True - <b>Company:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 7 - 8 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 5 - 6 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 6 - 7 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 7 - 8 - fill - - - - - - 0 - False - False - - - - - - + + + + True + dialog1 + normal + + + True + + + True + 10 + 8 + 2 + 30 + 8 + + + True + 0 + + + 1 + 2 + 3 + 4 + GTK_FILL + + + + + + True + 0 + <b>Number of Objects:</b> + True + right + + + 4 + 5 + + + + + + True + 0 + <b>Number of Pages:</b> + True + right + + + 3 + 4 + + + + + + True + 0 + <b>File Size:</b> + True + right + + + 2 + 3 + + + + + + True + 0 + <b>JET Version:</b> + True + right + + + 1 + 2 + + + + + + True + 0 + <b>File Name:</b> + True + right + okbutton1 + + + + + + + + True + 0 + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + True + 0 + + + 1 + 2 + 4 + 5 + GTK_FILL + + + + + + True + 0 + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + True + 0 + <b>Title:</b> + True + + + 5 + 6 + GTK_FILL + + + + + + True + 0 + <b>Author:</b> + True + + + 6 + 7 + GTK_FILL + + + + + + True + 0 + <b>Company:</b> + True + + + 7 + 8 + GTK_FILL + + + + + + True + 0 + + + 1 + 2 + 5 + 6 + GTK_FILL + + + + + + True + 0 + + + 1 + 2 + 6 + 7 + GTK_FILL + + + + + + True + 0 + + + 1 + 2 + 7 + 8 + GTK_FILL + + + + + + False + False + 2 + + + + + True + end + + + gtk-ok + -5 + True + True + True + False + True + + + + False + False + 0 + + + + + False + end + 0 + + + + + diff --git a/src/gmdb2/gladefiles/gmdb-schema.glade b/src/gmdb2/gladefiles/gmdb-schema.glade index 0f36bec..cf1f7ff 100644 --- a/src/gmdb2/gladefiles/gmdb-schema.glade +++ b/src/gmdb2/gladefiles/gmdb-schema.glade @@ -1,525 +1,374 @@ - - - True - Export Schema - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-help - True - GTK_RELIEF_NORMAL - -11 - - - - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - -6 - - - - - - - True - True - True - GTK_RELIEF_NORMAL - -5 - - - - - True - 0.5 - 0.5 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-convert - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Export - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - - - 0 - False - True - GTK_PACK_END - - - - - - 33 - True - 5 - 2 - False - 8 - 30 - - - - True - <b>Table:</b> - False - True - GTK_JUSTIFY_RIGHT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - <b>Schema Dialect:</b> - False - True - GTK_JUSTIFY_RIGHT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - False - True - False - True - False - - - - True - True - True - True - 0 - Access - True - * - False - - - - - - True - GTK_SELECTION_BROWSE - - - - - 1 - 2 - 1 - 2 - - - - - - - True - True - False - False - True - False - - - - True - True - False - True - 0 - Access - True - * - False - - - - - - True - GTK_SELECTION_BROWSE - - - - True - True - Access - - - - - - True - True - Oracle - - - - - - True - True - Sybase - - - - - - True - True - MS SQL Server - - - - - - True - True - PostgreSQL - - - - - - True - True - MySQL - - - - - - - 1 - 2 - 2 - 3 - - - - - - - True - True - Include Relationships - True - GTK_RELIEF_NORMAL - True - False - True - - - 1 - 2 - 9 - 10 - fill - - - - - - - True - <b>Options:</b> - False - True - GTK_JUSTIFY_RIGHT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - True - Include Drop Table commands - True - GTK_RELIEF_NORMAL - True - False - True - - - 1 - 2 - 3 - 4 - fill - - - - - - - Include Not Null constraints - True - True - True - True - True - GTK_RELIEF_NORMAL - False - - - 1 - 2 - 4 - 5 - fill - - - - - - - Include indexes - True - True - True - True - True - GTK_RELIEF_NORMAL - False - - - 1 - 2 - 8 - 9 - fill - - - - - - - Include description on tables and columns - True - True - True - True - True - GTK_RELIEF_NORMAL - False - - - 1 - 2 - 7 - 8 - fill - - - - - - - Include Not Empty constraints - True - True - True - True - True - GTK_RELIEF_NORMAL - False - - - 1 - 2 - 6 - 7 - fill - - - - - - - Include Default values - True - True - True - True - True - GTK_RELIEF_NORMAL - False - - - 1 - 2 - 5 - 6 - fill - - - - - - - True - <b>File Name:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - fill - - - - + + + + True + Export Schema + normal + + + True - + True + 33 + 5 + 2 + 30 + 8 + + + True + 0 + <b>Table:</b> + True + right + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + <b>Schema Dialect:</b> + True + right + + + 2 + 3 + GTK_FILL + + + + + + Include Relationships + True + True + False + True + True + True + + + 1 + 2 + 9 + 10 + GTK_FILL + + + + + + True + 0 + <b>Options:</b> + True + right + + + 3 + 4 + GTK_FILL + + + + + + Include Drop Table commands + True + True + False + True + True + True + + + 1 + 2 + 3 + 4 + GTK_FILL + + + + + + Include Not Null constraints + True + True + False + True + True + True + + + 1 + 2 + 4 + 5 + GTK_FILL + + + + + + Include indexes + True + True + False + True + True + True + + + 1 + 2 + 8 + 9 + GTK_FILL + + + + + + Include description on tables and columns + True + True + False + True + True + True + + + 1 + 2 + 7 + 8 + GTK_FILL + + + + + + Include Not Empty constraints + True + True + False + True + True + True + + + 1 + 2 + 6 + 7 + GTK_FILL + + + + + + Include Default values + True + True + False + True + True + True + + + 1 + 2 + 5 + 6 + GTK_FILL + + + + + + True + 0 + <b>File Name:</b> + True + + + GTK_FILL + + + + + + True + save + True + + + 1 + 2 + + + + + True + + + + 1 + 2 + 1 + 2 + + + + + True + 0 + Access +Oracle +Sybase +MS SQL Server +PostgreSQL +MySQL + + + 1 + 2 + 2 + 3 + + + + + + + + + + + + + + + + + + + + - 1 - 2 + False + 2 - - - 0 - True - False - - - - - - + + + True + end + + + gtk-help + -11 + True + True + True + False + True + + + + False + False + 0 + + + + + gtk-cancel + -6 + True + True + True + False + True + + + + False + False + 1 + + + + + -5 + True + True + True + False + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-convert + + + False + False + 0 + + + + + True + _Export + True + + + False + False + 1 + + + + + + + + + False + False + 2 + + + + + False + end + 0 + + + + + diff --git a/src/gmdb2/gladefiles/gmdb-sql.glade b/src/gmdb2/gladefiles/gmdb-sql.glade index 52d7882..ec7b1f3 100644 --- a/src/gmdb2/gladefiles/gmdb-sql.glade +++ b/src/gmdb2/gladefiles/gmdb-sql.glade @@ -1,6 +1,6 @@ - + True @@ -321,26 +321,9 @@ - + True - False - - - 24 - True - True - Recently Executed Queries - - - 0 - - - - - True - browse - - + 1 diff --git a/src/gmdb2/gladefiles/gmdb.glade b/src/gmdb2/gladefiles/gmdb.glade index 5ee8d2c..628f019 100644 --- a/src/gmdb2/gladefiles/gmdb.glade +++ b/src/gmdb2/gladefiles/gmdb.glade @@ -1,1121 +1,800 @@ - - - + - - - - - True - MDB File Viewer - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - - - - True - True - - - - True - GTK_SHADOW_NONE - - - - True - - - - True - GNOMEUIINFO_MENU_FILE_TREE - - - - - - - True - GNOMEUIINFO_MENU_OPEN_ITEM - - - - - - - True - - - - - - True - False - GNOMEUIINFO_MENU_PROPERTIES_ITEM - - - - - - - True - - - - - - True - GNOMEUIINFO_MENU_CLOSE_ITEM - - - - - - - True - - - - - - True - item - True - - - - - - - - True - item3 - True - - - - - - - - True - item4 - True - - - - - - - - True - item5 - True - - - - - - - - True - - - - - - True - GNOMEUIINFO_MENU_EXIT_ITEM - - - - - - - - - - - True - GNOMEUIINFO_MENU_EDIT_TREE - - - - - - - True - GNOMEUIINFO_MENU_PREFERENCES_ITEM - - - - - - - - - - - True - _Tools - True - - - - - - - True - False - S_QL Window - True - - - - - True - gtk-execute - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - False - _Debug Window - True - - - - - True - debug.xpm - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - False - E_xport Schema - True - - - - - True - gtk-convert - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - - - - - True - GNOMEUIINFO_MENU_HELP_TREE - - - - - - - True - GNOMEUIINFO_MENU_ABOUT_ITEM - - - - - - - True - - - - - - True - Contents - True - - - - - True - gtk-help - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - - - - - - BONOBO_DOCK_TOP - 0 - 0 - 0 - BONOBO_DOCK_ITEM_BEH_EXCLUSIVE|BONOBO_DOCK_ITEM_BEH_NEVER_VERTICAL|BONOBO_DOCK_ITEM_BEH_LOCKED - - - - - - True - GTK_SHADOW_OUT - - - - 1 - True - GTK_ORIENTATION_HORIZONTAL - GTK_TOOLBAR_ICONS - True - - - - True - Open database file - gtk-open - - - - - - - True - False - View database file properties - gtk-properties - - - - - - - True - Close database file - gtk-close - - - - - - - True - False - Perform SQL query - gtk-execute - - - - True - - - - - - True - False - Export schema definition - gtk-convert - - - - - - - - - BONOBO_DOCK_TOP - 1 - 0 - 0 - BONOBO_DOCK_ITEM_BEH_EXCLUSIVE - - - - - - True - False - 0 - - - - True - True - True - True - GTK_POS_TOP - False - 2 - 2 - False - - - - True - 0.5 - 0.5 - 1 - 1 - - - - True - False - 0 - - - - 10 - True - 0 - 0.5 - GTK_SHADOW_IN - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - - - 0 - True - True - - - - - - 18 - 120 - True - False - 10 - - - - True - True - Definition - True - GTK_RELIEF_NORMAL - - - - 0 - False - False - - - - - - True - True - Data - True - GTK_RELIEF_NORMAL - - - - 0 - False - False - - - - - - True - True - Export - True - GTK_RELIEF_NORMAL - - - - 0 - False - False - - - - - 0 - False - False - - - - - - - False - True - - - - - - True - False - 2 - - - - True - table.xpm - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - - - - - True - Tables - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - tab - - - - - - True - False - 0 - - - - 10 - True - 0 - 0.5 - GTK_SHADOW_IN - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - - - 0 - True - True - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - False - True - - - - - - True - False - 2 - - - - True - query.xpm - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - - - - - True - Queries - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - tab - - - - - - True - False - 0 - - - - 10 - True - 0 - 0.5 - GTK_SHADOW_IN - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - - - 0 - True - True - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - False - True - - - - - - True - False - 2 - - - - True - forms.xpm - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - - - - - True - Forms - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - tab - - - - - - True - False - 0 - - - - 10 - True - 0 - 0.5 - GTK_SHADOW_IN - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - - - 0 - True - True - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - False - True - - - - - - True - False - 2 - - - - True - reports.xpm - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - - - - - True - Reports - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - tab - - - - - - True - False - 0 - - - - 10 - True - 0 - 0.5 - GTK_SHADOW_IN - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - - - 0 - True - True - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - False - True - - - - - - True - False - 2 - - - - True - macros.xpm - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - - - - - True - Macros - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - tab - - - - - - True - False - 0 - - - - 10 - True - 0 - 0.5 - GTK_SHADOW_IN - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - - - 0 - True - True - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - False - True - - - - - - True - False - 2 - - - - True - code.xpm - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - - - - - True - Modules - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - tab - - - - - 0 - True - True - - - - - - - 0 - True - True - - - - - - True - True - True - - - 0 - True - True - - - - + + + + + + + + True + MDB File Viewer + True + + + True + True + + + True + + + True + 1 + icons + + + True + Open database file + gtk-open + + + + False + True + + + + + True + False + View database file properties + gtk-properties + + + + False + True + + + + + True + Close database file + gtk-close + + + + False + True + + + + + True + False + Perform SQL query + gtk-execute + + + + False + True + + + + + True + False + Export schema definition + gtk-convert + + + + False + True + + + + + + + 1 + BONOBO_DOCK_ITEM_BEH_EXCLUSIVE + + + + + True + + + True + + + True + _File + True + + + + + gtk-open + True + True + True + + + + + + True + + + + + gtk-properties + True + False + True + True + + + + + + True + + + + + gtk-close + True + True + True + + + + + + True + + + + + True + item + True + + + + + + + True + item3 + True + + + + + + + True + item4 + True + + + + + + + True + item5 + True + + + + + + + True + + + + + gtk-quit + True + True + True + + + + + + + + + + True + _Edit + True + + + + + gtk-preferences + True + True + True + + + + + + + + + + True + _Tools + True + + + + + S_QL Window + True + False + True + True + + + + + + + _Debug Window + True + False + True + True + + + + + + E_xport Schema + True + False + True + True + + + + + + + + + + True + _Help + True + + + + + gtk-about + True + True + True + + + + + + True + + + + + Contents + True + True + True + + + + + + + + + + + + BONOBO_DOCK_ITEM_BEH_EXCLUSIVE | BONOBO_DOCK_ITEM_BEH_NEVER_VERTICAL | BONOBO_DOCK_ITEM_BEH_LOCKED + + + + + True + + + True + True + + + True + + + True + + + True + 10 + 0 + in + + + True + True + automatic + automatic + + + + + 0 + + + + + 120 + True + 18 + 10 + + + Definition + True + True + False + True + + + + False + False + 0 + + + + + Data + True + True + False + True + + + + False + False + 1 + + + + + Export + True + True + False + True + + + + False + False + 2 + + + + + False + False + 1 + + + + + + + + + True + 2 + + + True + table.xpm + + + 0 + + + + + True + Tables + + + False + False + 1 + + + + + False + tab + + + + + True + + + True + 10 + 0 + in + + + True + True + automatic + automatic + + + + + 0 + + + + + True + + + False + False + 1 + + + + + 1 + + + + + True + 2 + + + True + query.xpm + + + 0 + + + + + True + Queries + + + False + False + 1 + + + + + 1 + False + tab + + + + + True + + + True + 10 + 0 + in + + + True + True + automatic + automatic + + + + + 0 + + + + + True + + + False + False + 1 + + + + + 2 + + + + + True + 2 + + + True + forms.xpm + + + 0 + + + + + True + Forms + + + False + False + 1 + + + + + 2 + False + tab + + + + + True + + + True + 10 + 0 + in + + + True + True + automatic + automatic + + + + + 0 + + + + + True + + + False + False + 1 + + + + + 3 + + + + + True + 2 + + + True + reports.xpm + + + 0 + + + + + True + Reports + + + False + False + 1 + + + + + 3 + False + tab + + + + + True + + + True + 10 + 0 + in + + + True + True + automatic + automatic + + + + + 0 + + + + + True + + + False + False + 1 + + + + + 4 + + + + + True + 2 + + + True + macros.xpm + + + 0 + + + + + True + Macros + + + False + False + 1 + + + + + 4 + False + tab + + + + + True + + + True + 10 + 0 + in + + + True + True + automatic + automatic + + + + + 0 + + + + + True + + + False + False + 1 + + + + + 5 + + + + + True + 2 + + + True + code.xpm + + + 0 + + + + + True + Modules + + + False + False + 1 + + + + + 5 + False + tab + + + + + 0 + + + + + + + True + True + + + + + True + 4 + True + True + + + 1 + True + True + + + diff --git a/src/gmdb2/schema.c b/src/gmdb2/schema.c index a18bf23..3d6ec17 100644 --- a/src/gmdb2/schema.c +++ b/src/gmdb2/schema.c @@ -75,8 +75,10 @@ FILE *outfile; void gmdb_schema_export_cb(GtkWidget *w, gpointer data) { -GtkWidget *schemawin, *combo, *checkbox, *chooser; +GtkWidget *schemawin, *checkbox, *chooser; +GtkComboBox *combobox; gchar *file_path; +gchar *tmp; int i; schemawin = glade_xml_get_widget (schemawin_xml, "schema_dialog"); @@ -84,18 +86,27 @@ int i; chooser = glade_xml_get_widget (schemawin_xml, "filechooserbutton1"); file_path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser)); - combo = glade_xml_get_widget (schemawin_xml, "table_combo"); - strncpy(tabname,gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo)->entry)),MDB_MAX_OBJ_NAME); + combobox = GTK_COMBO_BOX(glade_xml_get_widget(schemawin_xml, "table_combo")); + tmp = gtk_combo_box_get_active_text(combobox); + strncpy(tabname,tmp,MDB_MAX_OBJ_NAME); tabname[MDB_MAX_OBJ_NAME]=0; - if (!strcmp(tabname,ALL_TABLES)) tabname[0]='\0'; + if (!strcmp(tabname,ALL_TABLES)) + tabname[0]='\0'; - combo = glade_xml_get_widget (schemawin_xml, "backend_combo"); - if (!strcmp(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo)->entry)),"Oracle")) strcpy(backend,"oracle"); - else if (!strcmp(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo)->entry)),"Sybase")) strcpy(backend,"sybase"); - else if (!strcmp(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo)->entry)),"MS SQL Server")) strcpy(backend,"sybase"); - else if (!strcmp(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo)->entry)),"PostgreSQL")) strcpy(backend,"postgres"); - else if (!strcmp(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo)->entry)),"MySQL")) strcpy(backend,"mysql"); - else strcpy(backend,"access"); + combobox = GTK_COMBO_BOX(glade_xml_get_widget (schemawin_xml, "backend_combo")); + tmp = gtk_combo_box_get_active_text(combobox); + if (!strcmp(tmp, "Oracle")) + strcpy(backend, "oracle"); + else if (!strcmp(tmp, "Sybase")) + strcpy(backend,"sybase"); + else if (!strcmp(tmp,"MS SQL Server")) + strcpy(backend,"sybase"); + else if (!strcmp(tmp, "PostgreSQL")) + strcpy(backend,"postgres"); + else if (!strcmp(tmp,"MySQL")) + strcpy(backend,"mysql"); + else + strcpy(backend,"access"); /* make sure unknown default options are enabled */ export_options = MDB_SHEXP_DEFAULT; @@ -124,16 +135,17 @@ check_default_options() { } static void refresh_available_options() { - GtkWidget *combo, *checkbox; + GtkComboBox *combobox; + GtkWidget *checkbox; guint32 capabilities; extern GHashTable *mdb_backends; /* FIXME */ MdbBackend *backend_obj; int i; - combo = glade_xml_get_widget (schemawin_xml, "backend_combo"); - if (!combo) return; /* window is beeing destroyed */ + combobox = GTK_COMBO_BOX(glade_xml_get_widget (schemawin_xml, "backend_combo")); + if (!combobox) return; /* window is beeing destroyed */ - const gchar *backend_name = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo)->entry)); + const gchar *backend_name = gtk_combo_box_get_active_text(combobox); if (!strcmp(backend_name,"Oracle")) strcpy(backend,"oracle"); else if (!strcmp(backend_name,"Sybase")) strcpy(backend,"sybase"); else if (!strcmp(backend_name,"MS SQL Server")) strcpy(backend,"sybase"); @@ -153,7 +165,8 @@ refresh_available_options() { } void -gmdb_schema_capabilities_cb(GtkList *list) { +gmdb_schema_backend_cb(GtkComboBox *widget, gpointer data) +{ refresh_available_options(); } @@ -172,8 +185,8 @@ gmdb_schema_help_cb(GtkWidget *w, gpointer data) void gmdb_schema_new_cb(GtkWidget *w, gpointer data) { - GList *glist = NULL; - GtkWidget *combo; + GtkComboBox *combobox; + GtkFileChooser *filechooser; MdbCatalogEntry *entry; int i; @@ -182,23 +195,25 @@ gmdb_schema_new_cb(GtkWidget *w, gpointer data) /* connect the signals in the interface */ glade_xml_signal_autoconnect(schemawin_xml); /* set up capabilities call back. TODO: autoconnect should do that */ - combo = glade_xml_get_widget(schemawin_xml, "combo-list2"); - g_signal_connect( G_OBJECT (combo), "selection_changed", - G_CALLBACK(gmdb_schema_capabilities_cb), schemawin_xml); + combobox = GTK_COMBO_BOX(glade_xml_get_widget(schemawin_xml, "backend_combo")); + gtk_combo_box_set_active(combobox, 0); + g_signal_connect( G_OBJECT (combobox), "changed", + G_CALLBACK(gmdb_schema_backend_cb), NULL); /* set signals with user data, anyone know how to do this in glade? */ - combo = glade_xml_get_widget (schemawin_xml, "table_combo"); - - glist = g_list_append(glist, ALL_TABLES); + combobox = GTK_COMBO_BOX(glade_xml_get_widget(schemawin_xml, "table_combo")); + gtk_combo_box_append_text(combobox, ALL_TABLES); /* add all user tables in catalog to list */ for (i=0; i < mdb->num_catalog; i++) { entry = g_ptr_array_index (mdb->catalog, i); if (mdb_is_user_table(entry)) { - glist = g_list_append(glist, entry->object_name); + gtk_combo_box_append_text(combobox, entry->object_name); } } /* for */ - gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist); - g_list_free(glist); + gtk_combo_box_set_active(combobox, 0); + + filechooser = GTK_FILE_CHOOSER(glade_xml_get_widget(schemawin_xml, "filechooserbutton1")); + gtk_file_chooser_set_action(filechooser, GTK_FILE_CHOOSER_ACTION_SAVE); check_default_options(); refresh_available_options(); diff --git a/src/gmdb2/sql.c b/src/gmdb2/sql.c index 4bc39be..db01091 100644 --- a/src/gmdb2/sql.c +++ b/src/gmdb2/sql.c @@ -331,15 +331,13 @@ GtkWidget *textview; } static void -gmdb_sql_select_hist_cb(GtkList *list, GladeXML *xml) +gmdb_sql_select_hist_cb(GtkComboBox *combobox, GladeXML *xml) { gchar *buf; GtkTextBuffer *txtbuffer; - GtkWidget *combo, *textview; + GtkWidget *textview; - combo = glade_xml_get_widget(xml, "sql_combo"); - if (!combo) return; - buf = (gchar *) gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo)->entry)); + buf = gtk_combo_box_get_active_text(combobox); if (!buf) return; textview = glade_xml_get_widget(xml, "sql_textview"); txtbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); @@ -356,10 +354,9 @@ gmdb_sql_execute_cb(GtkWidget *w, GladeXML *xml) MdbSQLColumn *sqlcol; GtkTextBuffer *txtbuffer; GtkTextIter start, end; - GtkWidget *textview, *combo, *treeview; + GtkWidget *textview, *combobox, *treeview; GtkTreeModel *store; /*GtkWidget *window;*/ - GList *history; GType *gtypes; GtkTreeIter iter; GtkTreeViewColumn *column; @@ -375,7 +372,7 @@ gmdb_sql_execute_cb(GtkWidget *w, GladeXML *xml) /* stuff this query on the history */ textview = glade_xml_get_widget(xml, "sql_textview"); - combo = glade_xml_get_widget(xml, "sql_combo"); + combobox = glade_xml_get_widget(xml, "sql_combo"); txtbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); len = gtk_text_buffer_get_char_count(txtbuffer); gtk_text_buffer_get_iter_at_offset (txtbuffer, &start, 0); @@ -383,10 +380,8 @@ gmdb_sql_execute_cb(GtkWidget *w, GladeXML *xml) buf = gtk_text_buffer_get_text(txtbuffer, &start, &end, FALSE); /* add to the history */ - history = g_object_get_data(G_OBJECT(combo),"hist_list"); - history = g_list_prepend(history, g_strdup(buf)); - g_object_set_data(G_OBJECT(combo), "hist_list", history); - gtk_combo_set_popdown_strings(GTK_COMBO(combo), history); + gtk_combo_box_prepend_text(GTK_COMBO_BOX(combobox), buf); + gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0); /* ok now execute it */ mdb_sql_run_query(sql, buf); @@ -462,7 +457,7 @@ gmdb_sql_execute_cb(GtkWidget *w, GladeXML *xml) void gmdb_sql_new_cb (GtkWidget *w, gpointer data) { GtkTargetEntry src; - GtkWidget *mi, *but, *combo; + GtkWidget *mi, *but, *combobox; GladeXML *sqlwin_xml; /* load the interface */ @@ -528,8 +523,8 @@ gmdb_sql_new_cb (GtkWidget *w, gpointer data) { g_signal_connect (G_OBJECT (mi), "activate", G_CALLBACK (gmdb_sql_execute_cb), sqlwin_xml); - combo = glade_xml_get_widget(sqlwin_xml, "sql_combo"); - g_signal_connect (G_OBJECT(GTK_COMBO(combo)->list), "selection-changed", + combobox = glade_xml_get_widget(sqlwin_xml, "sql_combo"); + g_signal_connect (G_OBJECT(GTK_COMBO_BOX(combobox)), "changed", G_CALLBACK (gmdb_sql_select_hist_cb), sqlwin_xml); but = glade_xml_get_widget (sqlwin_xml, "execute_button"); diff --git a/src/gmdb2/table_export.c b/src/gmdb2/table_export.c index c0846e4..a9a2b82 100644 --- a/src/gmdb2/table_export.c +++ b/src/gmdb2/table_export.c @@ -17,6 +17,7 @@ */ #include "gmdb.h" +#include #include #include #include @@ -56,11 +57,11 @@ gmdb_print_quote(FILE *outfile, int need_quote, char quotechar, char *colsep, ch void gmdb_export_get_delimiter(GladeXML *xml, gchar *delimiter, int max_buf) { - GtkWidget *combo; + GtkComboBox *combobox; gchar *str; - combo = glade_xml_get_widget(xml, "sep_combo"); - str = (gchar *) gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo)->entry)); + combobox = GTK_COMBO_BOX(glade_xml_get_widget(xml, "sep_combo")); + str = gtk_combo_box_get_active_text(combobox); if (!strcmp(str,COMMA)) { strcpy(delimiter, ","); } else if (!strcmp(str,TAB)) { strcpy(delimiter, "\t"); } else if (!strcmp(str,SPACE)) { strcpy(delimiter, " "); } @@ -76,11 +77,11 @@ gmdb_export_get_delimiter(GladeXML *xml, gchar *delimiter, int max_buf) void gmdb_export_get_lineterm(GladeXML *xml, gchar *lineterm, int max_buf) { - GtkWidget *combo; + GtkComboBox *combobox; gchar *str; - combo = glade_xml_get_widget(xml, "term_combo"); - str = (gchar *) gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo)->entry)); + combobox = GTK_COMBO_BOX(glade_xml_get_widget(xml, "term_combo")); + str = gtk_combo_box_get_active_text (combobox); if (!strcmp(str,LF)) { strcpy(lineterm, "\n"); } else if (!strcmp(str,CR)) { strcpy(lineterm, "\r"); } else if (!strcmp(str,CRLF)) { strcpy(lineterm, "\r\n"); } @@ -89,12 +90,12 @@ gmdb_export_get_lineterm(GladeXML *xml, gchar *lineterm, int max_buf) int gmdb_export_get_quote(GladeXML *xml) { - GtkWidget *combo; + GtkComboBox *combobox; int need_quote = 0; gchar *str; - combo = glade_xml_get_widget(xml, "quote_combo"); - str = (gchar *) gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo)->entry)); + combobox = GTK_COMBO_BOX(glade_xml_get_widget(xml, "quote_combo")); + str = gtk_combo_box_get_active_text (combobox); if (!strcmp(str,ALWAYS)) { need_quote = 1; } else if (!strcmp(str,NEVER)) { need_quote = 0; } else if (!strcmp(str,AUTOMAT)) { need_quote = -1; } @@ -105,12 +106,12 @@ gmdb_export_get_quote(GladeXML *xml) char gmdb_export_get_quotechar(GladeXML *xml) { - GtkWidget *combo; + GtkComboBox *combobox; gchar *str; char quotechar; - combo = glade_xml_get_widget(xml, "qchar_combo"); - str = (gchar *) gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo)->entry)); + combobox = GTK_COMBO_BOX(glade_xml_get_widget(xml, "qchar_combo")); + str = gtk_combo_box_get_active_text (combobox); quotechar = str[0]; return quotechar; @@ -241,41 +242,33 @@ void gmdb_table_export(MdbCatalogEntry *entry) void gmdb_table_export_populate_dialog(GladeXML *xml) { - GList *glist = NULL; - GtkWidget *combo; + GtkComboBox *combobox; - /* Create the widgets */ - combo = glade_xml_get_widget (xml, "term_combo"); - glist = g_list_append(glist, LF); - glist = g_list_append(glist, CR); - glist = g_list_append(glist, CRLF); - gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist); - g_list_free(glist); + /* Populate the widgets */ + combobox = GTK_COMBO_BOX(glade_xml_get_widget(xml, "term_combo")); + gtk_combo_box_append_text(combobox, LF); + gtk_combo_box_append_text(combobox, CR); + gtk_combo_box_append_text(combobox, CRLF); + gtk_combo_box_set_active(combobox, 0); - combo = glade_xml_get_widget (xml, "sep_combo"); - glist = NULL; - glist = g_list_append(glist, COMMA); - glist = g_list_append(glist, TAB); - glist = g_list_append(glist, SPACE); - glist = g_list_append(glist, COLON); - glist = g_list_append(glist, SEMICOLON); - glist = g_list_append(glist, PIPE); - gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist); - g_list_free(glist); + combobox = GTK_COMBO_BOX(glade_xml_get_widget(xml, "sep_combo")); + gtk_combo_box_append_text(combobox, COMMA); + gtk_combo_box_append_text(combobox, TAB); + gtk_combo_box_append_text(combobox, SPACE); + gtk_combo_box_append_text(combobox, COLON); + gtk_combo_box_append_text(combobox, SEMICOLON); + gtk_combo_box_append_text(combobox, PIPE); + gtk_combo_box_set_active(combobox, 0); - combo = glade_xml_get_widget (xml, "quote_combo"); - glist = NULL; - glist = g_list_append(glist, ALWAYS); - glist = g_list_append(glist, NEVER); - glist = g_list_append(glist, AUTOMAT); - gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist); - g_list_free(glist); + combobox = GTK_COMBO_BOX(glade_xml_get_widget(xml, "quote_combo")); + gtk_combo_box_append_text(combobox, ALWAYS); + gtk_combo_box_append_text(combobox, NEVER); + gtk_combo_box_append_text(combobox, AUTOMAT); + gtk_combo_box_set_active(combobox, 0); - combo = glade_xml_get_widget (xml, "qchar_combo"); - glist = NULL; - glist = g_list_append(glist, "\""); - glist = g_list_append(glist, "'"); - glist = g_list_append(glist, "`"); - gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist); - g_list_free(glist); + combobox = GTK_COMBO_BOX(glade_xml_get_widget(xml, "qchar_combo")); + gtk_combo_box_append_text(combobox, "\""); + gtk_combo_box_append_text(combobox, "'"); + gtk_combo_box_append_text(combobox, "`"); + gtk_combo_box_set_active(combobox, 0); }