#ifndef WIN32
#include <gconf/gconf-client.h>
+#else
+#include <windows.h>
#endif
#include "dive.h"
gconf_client_set_bool(gconf, GCONF_NAME(SAC), visible_cols.sac, NULL);
gconf_client_set_bool(gconf, GCONF_NAME(OTU), visible_cols.otu, NULL);
gconf_client_set_string(gconf, GCONF_NAME(divelist_font), divelist_font, NULL);
+#else
+ HKEY hkey;
+ LONG success = RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Software\\subsurface"),
+ 0L, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS,
+ NULL, &hkey, NULL);
+ if (success != ERROR_SUCCESS)
+ printf("CreateKey Software\\subsurface failed %ld\n", success);
+ DWORD value;
+
+#define StoreInReg(_key, _val) { \
+ value = (_val) ; \
+ RegSetValueEx(hkey, TEXT(_key), 0, REG_DWORD, &value, 4); \
+ }
+
+ StoreInReg("feet", output_units.length == FEET);
+ StoreInReg("psi", output_units.pressure == PSI);
+ StoreInReg("cuft", output_units.volume == CUFT);
+ StoreInReg("fahrenheit", output_units.temperature == FAHRENHEIT);
+ StoreInReg("temperature", visible_cols.temperature);
+ StoreInReg("cylinder", visible_cols.cylinder);
+ StoreInReg("nitrox", visible_cols.nitrox);
+ StoreInReg("sac", visible_cols.sac);
+ StoreInReg("otu", visible_cols.otu);
+ RegSetValueEx(hkey, TEXT("divelist_font"), 0, REG_SZ, divelist_font, strlen(divelist_font));
+ if (RegFlushKey(hkey) != ERROR_SUCCESS)
+ printf("RegFlushKey failed %ld\n");
+ RegCloseKey(hkey);
#endif
}
gtk_widget_destroy(dialog);
GdkPixbuf *logo = NULL;
if (need_icon) {
+#ifndef WIN32
GtkWidget *image = gtk_image_new_from_file("subsurface.svg");
+#else
+ GtkWidget *image = gtk_image_new_from_file("subsurface.ico");
+#endif
if (image) {
logo = gtk_image_get_pixbuf(GTK_IMAGE(image));
return GTK_NOTEBOOK(notebook);
}
-static void drag_cb(GtkWidget *widget, GdkDragContext *context,
+static gboolean drag_cb(GtkWidget *widget, GdkDragContext *context,
gint x, gint y, guint time,
gpointer user_data)
{
GtkWidget *source;
notebook_data_t *nbdp;
+ gtk_drag_finish(context, TRUE, TRUE, time);
source = gtk_drag_get_source_widget(context);
if (nbd[0].name && ! strcmp(nbd[0].name,gtk_widget_get_name(source)))
nbdp = nbd;
else if (nbd[1].name && ! strcmp(nbd[1].name,gtk_widget_get_name(source)))
nbdp = nbd + 1;
- else
- /* HU? */
- return;
-
- gtk_drag_finish(context, TRUE, TRUE, time);
+ else /* just on ourselves */
+ return TRUE;
/* we no longer need the widget - but getting rid of this is hard;
* remove the signal handler, remove the notebook from the box
nbdp->widget = NULL;
free(nbdp->name);
nbdp->name = NULL;
+
+ return TRUE;
}
-void init_ui(int argc, char **argv)
+#ifdef WIN32
+static int get_from_registry(HKEY hkey, const char *key)
+{
+ DWORD value;
+ DWORD len = 4;
+ LONG success;
+
+ success = RegQueryValueEx(hkey, TEXT(key), NULL, NULL,
+ (LPBYTE) &value, &len );
+ if (success != ERROR_SUCCESS)
+ return FALSE; /* that's what happens the first time we start */
+ return value;
+}
+#endif
+
+void init_ui(int *argcp, char ***argvp)
{
GtkWidget *win;
GtkWidget *notebook;
GtkWidget *dive_info;
GtkWidget *dive_list;
GtkWidget *equipment;
+ GtkWidget *stats;
GtkWidget *menubar;
GtkWidget *vbox;
GdkScreen *screen;
"GTK_NOTEBOOK_TAB", GTK_TARGET_SAME_APP, 0
};
- gtk_init(&argc, &argv);
+ gtk_init(argcp, argvp);
settings = gtk_settings_get_default();
gtk_settings_set_long_property(settings, "gtk_tooltip_timeout", 10, "subsurface setting");
visible_cols.sac = gconf_client_get_bool(gconf, GCONF_NAME(SAC), NULL);
divelist_font = gconf_client_get_string(gconf, GCONF_NAME(divelist_font), NULL);
+#else
+ DWORD len = 4;
+ LONG success;
+ HKEY hkey;
+
+ success = RegOpenKeyEx( HKEY_CURRENT_USER, TEXT("Software\\subsurface"), 0,
+ KEY_QUERY_VALUE, &hkey);
+
+ output_units.length = get_from_registry(hkey, "feet");
+ output_units.pressure = get_from_registry(hkey, "psi");
+ output_units.volume = get_from_registry(hkey, "cuft");
+ output_units.temperature = get_from_registry(hkey, "fahrenheit");
+ visible_cols.temperature = get_from_registry(hkey, "temperature");
+ visible_cols.cylinder = get_from_registry(hkey, "cylinder");
+ visible_cols.nitrox = get_from_registry(hkey, "nitrox");
+ visible_cols.sac = get_from_registry(hkey, "sac");
+ visible_cols.otu = get_from_registry(hkey, "otu");
+
+ divelist_font = malloc(80);
+ len = 80;
+ success = RegQueryValueEx(hkey, TEXT("divelist_font"), NULL, NULL,
+ (LPBYTE) divelist_font, &len );
+ if (success != ERROR_SUCCESS) {
+ /* that's what happens the first time we start - just use the default */
+ free(divelist_font);
+ divelist_font = NULL;
+ }
+ RegCloseKey(hkey);
+
#endif
if (!divelist_font)
divelist_font = DIVELIST_DEFAULT_FONT;
}
}
if (need_icon)
+#ifndef WIN32
gtk_window_set_icon_from_file(GTK_WINDOW(win), "subsurface.svg", NULL);
+#else
+ gtk_window_set_icon_from_file(GTK_WINDOW(win), "subsurface.ico", NULL);
+#endif
g_signal_connect(G_OBJECT(win), "delete-event", G_CALLBACK(on_delete), NULL);
g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL);
main_window = win;
equipment = equipment_widget();
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), equipment, gtk_label_new("Equipment"));
+ /* Frame for dive statistics */
+ stats = stats_widget();
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), stats, gtk_label_new("Info & Stats"));
+
gtk_widget_set_app_paintable(win, TRUE);
gtk_widget_show_all(win);
projects / ext / subsurface.git / blobdiff