lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-04-05 20:31:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

move pixmaps to glade dir until I find out how to fix

Browse Source 
turn trace off in odbc driver
This commit is contained in:
brianb 2003-01-15 02:02:07 +00:00
parent da3e28a7e3
commit c0d5312464
6 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gmdb2/Makefile.am
View File

@ -6,7 +6,7 @@ LIBS = -rdynamic $(GNOME_LIBS) @LEXLIB@
INCLUDES = -I$(top_srcdir)/include \
$(GNOME_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DGMDB_ICONDIR=\""$(datadir)/gmdb/pixmaps/"\" \
-DGMDB_ICONDIR=\""$(datadir)/gmdb/glade/"\" \
-DGMDB_GLADEDIR=\""$(datadir)/gmdb/glade/"\"
#LDADD = ../libmdb/libmdb.la

21
src/gmdb2/gladefiles/gmdb-sql.glade
View File

@ -76,10 +76,9 @@
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="image1">
<widget class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="stock">gtk-save-as</property>
<property name="icon_size">1</property>
<property name="pixbuf">stock_export-16.png</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
@ -104,7 +103,7 @@
<accelerator key="E" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2">
<widget class="GtkImage" id="image6">
<property name="visible">True</property>
<property name="stock">gtk-execute</property>
<property name="icon_size">1</property>
@ -232,12 +231,12 @@
</child>
<child>
<widget class="button" id="results_button">
<widget class="button" id="save_button">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Save query to file</property>
<property name="label" translatable="yes">Save Results</property>
<property name="use_underline">True</property>
<property name="stock_pixmap">gtk-save-as</property>
<property name="stock_pixmap">gtk-save</property>
</widget>
</child>
@ -253,6 +252,16 @@
</packing>
</child>
<child>
<widget class="button" id="results_button">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Save results to a file</property>
<property name="label" translatable="yes">Save Results</property>
<property name="use_underline">True</property>
<property name="icon">stock_export.png</property>
</widget>
</child>
<child>
<widget class="button" id="close_button">
<property name="visible">True</property>

3
src/gmdb2/main2.c
View File

@ -243,7 +243,6 @@ GnomeProgram *program;
NULL);
//gnome_init ("gmdb", "0.2", argc, argv);
//app = gnome_app_new ("gmdb", "Gnome-MDB File Viewer");
glade_init();
/* load the interface */
@ -255,7 +254,7 @@ GnomeProgram *program;
gtk_signal_connect (GTK_OBJECT (gmdb), "delete_event",
GTK_SIGNAL_FUNC (delete_event), NULL);
gmdb_load_icons(mainwin_xml);
//gmdb_load_icons(mainwin_xml);
if (argc>1) {
gmdb_file_open(argv[1]);

6
src/gmdb2/pixmaps/Makefile.am
View File

@ -1,5 +1,5 @@
appicondir = $(datadir)/gmdb/pixmaps
appicondir = $(datadir)/gmdb/glade
appicon_DATA = \
pk.xpm \
@ -16,6 +16,8 @@ appicon_DATA = \
form_big.xpm \
report_big.xpm \
macro_big.xpm \
module_big.xpm
module_big.xpm \
stock_export.png \
stock_export-16.png
EXTRA_DIST = $(appicon_DATA)

13
src/gmdb2/sql.c
View File

@ -460,9 +460,10 @@ long row, maxrow;
void
gmdb_sql_new_cb(GtkWidget *w, gpointer data)
{
GtkTargetEntry src;
GtkWidget *mi, *but, *combo;
GladeXML *sqlwin_xml;
GtkTargetEntry src;
GtkWidget *mi, *but, *combo;
GladeXML *sqlwin_xml;
GValue value = {0, };
/* load the interface */
sqlwin_xml = glade_xml_new(GMDB_GLADEDIR "gmdb-sql.glade", NULL, NULL);
@ -571,6 +572,12 @@ GladeXML *sqlwin_xml;
gtk_signal_connect( GTK_OBJECT(textview), "drag_data_received",
GTK_SIGNAL_FUNC(gmdb_sql_dnd_datareceived_cb), sqlwin_xml);
//but = glade_xml_get_widget(sqlwin_xml, "results_button");
//g_value_init(&value, G_TYPE_STRING);
//g_value_set_static_string(&value, GMDB_ICONDIR "stock_export.png");
//g_object_set_property(G_OBJECT (but), "file" , &value);
//g_value_unset (&value);
gtk_widget_grab_focus(GTK_WIDGET(textview));
}

6
src/odbc/odbc.c
View File

@ -32,7 +32,7 @@
#include "connectparams.h"
static char software_version[] = "$Id: odbc.c,v 1.8 2003/01/07 02:24:35 brianb Exp $";
static char software_version[] = "$Id: odbc.c,v 1.9 2003/01/15 02:02:09 brianb Exp $";
static void *no_unused_var_warn[] = {software_version,
no_unused_var_warn};
@ -51,8 +51,8 @@ static SQLRETURN SQL_API _SQLFreeStmt(SQLHSTMT hstmt, SQLUSMALLINT fOption);
#define _MAX_ERROR_LEN 255
static char lastError[_MAX_ERROR_LEN+1];
#define TRACE(x) fprintf(stderr,"Function %s\n", x);
//#define TRACE(x)
//#define TRACE(x) fprintf(stderr,"Function %s\n", x);
#define TRACE(x)
/* The SQL engine is presently non-reenterrant and non-thread safe.
See _SQLExecute for details.