#include <string.h>
#include <stdlib.h>
#include <time.h>
-
-#ifndef WIN32
-#include <gconf/gconf-client.h>
-#else
-#include <windows.h>
-#endif
+#include <unistd.h>
#include "dive.h"
#include "divelist.h"
GtkWidget *main_vbox;
GtkWidget *error_info_bar;
GtkWidget *error_label;
+GtkWidget *vpane, *hpane;
int error_count;
-#define DIVELIST_DEFAULT_FONT "Sans 8"
const char *divelist_font;
-#ifndef WIN32
-GConfClient *gconf;
-#define GCONF_NAME(x) "/apps/subsurface/" #x
-#endif
-
struct units output_units;
static GtkWidget *dive_profile;
gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter);
if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
- GSList *filenames;
+ GSList *filenames, *fn_glist;
char *filename;
- filenames = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog));
+ filenames = fn_glist = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog));
GError *error = NULL;
while(filenames != NULL) {
g_free(filename);
filenames = g_slist_next(filenames);
}
- g_slist_free(filenames);
+ g_slist_free(fn_glist);
report_dives(FALSE);
}
gtk_widget_destroy(dialog);
dialog = gtk_dialog_new_with_buttons("Save Changes?",
GTK_WINDOW(main_window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_NO, GTK_RESPONSE_NO,
NULL);
content = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
label = gtk_label_new ("You have unsaved changes\nWould you like to save those before exiting the program?");
}
GtkTreeViewColumn *tree_view_column(GtkWidget *tree_view, int index, const char *title,
- data_func_t data_func, PangoAlignment align, gboolean visible)
+ data_func_t data_func, unsigned int flags)
{
GtkCellRenderer *renderer;
GtkTreeViewColumn *col;
double xalign = 0.0; /* left as default */
+ PangoAlignment align;
+ gboolean visible;
+
+ align = (flags & ALIGN_LEFT) ? PANGO_ALIGN_LEFT :
+ (flags & ALIGN_RIGHT) ? PANGO_ALIGN_RIGHT :
+ PANGO_ALIGN_CENTER;
+ visible = !(flags & INVISIBLE);
renderer = gtk_cell_renderer_text_new();
col = gtk_tree_view_column_new();
gtk_tree_view_column_set_title(col, title);
- gtk_tree_view_column_set_sort_column_id(col, index);
+ if (!(flags & UNSORTABLE))
+ gtk_tree_view_column_set_sort_column_id(col, index);
gtk_tree_view_column_set_resizable(col, TRUE);
gtk_tree_view_column_pack_start(col, renderer, TRUE);
if (data_func)
update_dive_list_units();
repaint_dive();
update_dive_list_col_visibility();
-#ifndef WIN32
- gconf_client_set_bool(gconf, GCONF_NAME(feet), output_units.length == FEET, NULL);
- gconf_client_set_bool(gconf, GCONF_NAME(psi), output_units.pressure == PSI, NULL);
- gconf_client_set_bool(gconf, GCONF_NAME(cuft), output_units.volume == CUFT, NULL);
- gconf_client_set_bool(gconf, GCONF_NAME(fahrenheit), output_units.temperature == FAHRENHEIT, NULL);
- gconf_client_set_bool(gconf, GCONF_NAME(TEMPERATURE), visible_cols.temperature, NULL);
- gconf_client_set_bool(gconf, GCONF_NAME(CYLINDER), visible_cols.cylinder, NULL);
- gconf_client_set_bool(gconf, GCONF_NAME(NITROX), visible_cols.nitrox, NULL);
- 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
+ subsurface_set_conf("feet", PREF_BOOL, BOOL_TO_PTR(output_units.length == FEET));
+ subsurface_set_conf("psi", PREF_BOOL, BOOL_TO_PTR(output_units.pressure == PSI));
+ subsurface_set_conf("cuft", PREF_BOOL, BOOL_TO_PTR(output_units.volume == CUFT));
+ subsurface_set_conf("fahrenheit", PREF_BOOL, BOOL_TO_PTR(output_units.temperature == FAHRENHEIT));
+ subsurface_set_conf("TEMPERATURE", PREF_BOOL, BOOL_TO_PTR(visible_cols.temperature));
+ subsurface_set_conf("CYLINDER", PREF_BOOL, BOOL_TO_PTR(visible_cols.cylinder));
+ subsurface_set_conf("NITROX", PREF_BOOL, BOOL_TO_PTR(visible_cols.nitrox));
+ subsurface_set_conf("SAC", PREF_BOOL, BOOL_TO_PTR(visible_cols.sac));
+ subsurface_set_conf("OTU", PREF_BOOL, BOOL_TO_PTR(visible_cols.otu));
+ subsurface_set_conf("divelist_font", PREF_STRING, divelist_font);
+ subsurface_close_conf();
}
gtk_widget_destroy(dialog);
}
GdkPixbuf *logo = NULL;
if (need_icon) {
- GtkWidget *image = gtk_image_new_from_file("subsurface.svg");
+ GtkWidget *image = gtk_image_new_from_file(subsurface_icon_name());
if (image) {
logo = gtk_image_get_pixbuf(GTK_IMAGE(image));
NULL);
}
+static void view_list(GtkWidget *w, gpointer data)
+{
+ gtk_paned_set_position(GTK_PANED(vpane), 0);
+}
+
+static void view_profile(GtkWidget *w, gpointer data)
+{
+ gtk_paned_set_position(GTK_PANED(hpane), 0);
+ gtk_paned_set_position(GTK_PANED(vpane), 65535);
+}
+
+static void view_info(GtkWidget *w, gpointer data)
+{
+ gtk_paned_set_position(GTK_PANED(vpane), 65535);
+ gtk_paned_set_position(GTK_PANED(hpane), 65535);
+}
+
+/* Ooh. I don't know how to get the half-way size. So I'm just using random numbers */
+static void view_three(GtkWidget *w, gpointer data)
+{
+ gtk_paned_set_position(GTK_PANED(hpane), 400);
+ gtk_paned_set_position(GTK_PANED(vpane), 200);
+}
+
static GtkActionEntry menu_items[] = {
{ "FileMenuAction", GTK_STOCK_FILE, "File", NULL, NULL, NULL},
{ "LogMenuAction", GTK_STOCK_FILE, "Log", NULL, NULL, NULL},
+ { "ViewMenuAction", GTK_STOCK_FILE, "View", NULL, NULL, NULL},
{ "FilterMenuAction", GTK_STOCK_FILE, "Filter", NULL, NULL, NULL},
{ "HelpMenuAction", GTK_STOCK_HELP, "Help", NULL, NULL, NULL},
{ "OpenFile", GTK_STOCK_OPEN, NULL, "<control>O", NULL, G_CALLBACK(file_open) },
{ "SelectEvents", NULL, "SelectEvents", NULL, NULL, G_CALLBACK(selectevents_dialog) },
{ "Quit", GTK_STOCK_QUIT, NULL, "<control>Q", NULL, G_CALLBACK(quit) },
{ "About", GTK_STOCK_ABOUT, NULL, NULL, NULL, G_CALLBACK(about_dialog) },
+ { "ViewList", NULL, "List", "<control>1", NULL, G_CALLBACK(view_list) },
+ { "ViewProfile", NULL, "Profile", "<control>2", NULL, G_CALLBACK(view_profile) },
+ { "ViewInfo", NULL, "Info", "<control>3", NULL, G_CALLBACK(view_info) },
+ { "ViewThree", NULL, "Three", "<control>4", NULL, G_CALLBACK(view_three) },
};
static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
</menu> \
<menu name=\"LogMenu\" action=\"LogMenuAction\"> \
<menuitem name=\"Renumber\" action=\"Renumber\" /> \
+ <menu name=\"View\" action=\"ViewMenuAction\"> \
+ <menuitem name=\"List\" action=\"ViewList\" /> \
+ <menuitem name=\"Profile\" action=\"ViewProfile\" /> \
+ <menuitem name=\"Info\" action=\"ViewInfo\" /> \
+ <menuitem name=\"Paned\" action=\"ViewThree\" /> \
+ </menu> \
</menu> \
<menu name=\"FilterMenu\" action=\"FilterMenuAction\"> \
<menuitem name=\"SelectEvents\" action=\"SelectEvents\" /> \
repaint_dive();
}
-static const char notebook_group[] = "123";
-#define GRP_ID ((void *)notebook_group)
-typedef struct {
- char *name;
- GtkWidget *widget;
- GtkWidget *box;
- gulong delete_handler;
- gulong destroy_handler;
-} notebook_data_t;
-
-static notebook_data_t nbd[2]; /* we rip at most two notebook pages off */
-
-static GtkNotebook *create_new_notebook_window(GtkNotebook *source,
- GtkWidget *page,
- gint x, gint y, gpointer data)
-{
- GtkWidget *win, *notebook, *vbox;
- notebook_data_t *nbdp;
- GtkAllocation allocation;
-
- /* pick the right notebook page data and return if both are detached */
- if (nbd[0].widget == NULL)
- nbdp = nbd;
- else if (nbd[1].widget == NULL)
- nbdp = nbd + 1;
- else
- return NULL;
-
- nbdp->name = strdup(gtk_widget_get_name(page));
- nbdp->widget = win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title(GTK_WINDOW(win), nbdp->name);
- gtk_window_move(GTK_WINDOW(win), x, y);
-
- /* Destroying the dive list will kill the application */
- nbdp->delete_handler = g_signal_connect(G_OBJECT(win), "delete-event", G_CALLBACK(on_delete), NULL);
- nbdp->destroy_handler = g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL);
-
- nbdp->box = vbox = gtk_vbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(win), vbox);
-
- notebook = gtk_notebook_new();
- gtk_notebook_set_group(GTK_NOTEBOOK(notebook), GRP_ID);
- gtk_widget_set_name(notebook, nbdp->name);
- /* disallow drop events */
- gtk_drag_dest_set(notebook, 0, NULL, 0, 0);
- gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 6);
- gtk_widget_get_allocation(page, &allocation);
- gtk_window_set_default_size(GTK_WINDOW(win), allocation.width, allocation.height);
-
- gtk_widget_show_all(win);
- return GTK_NOTEBOOK(notebook);
-}
-
-static void drag_cb(GtkWidget *widget, GdkDragContext *context,
- gint x, gint y, guint time,
- gpointer user_data)
-{
- GtkWidget *source;
- notebook_data_t *nbdp;
-
- 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);
-
- /* we no longer need the widget - but getting rid of this is hard;
- * remove the signal handler, remove the notebook from the box
- * then destroy the widget (and clear out our data structure) */
- g_signal_handler_disconnect(nbdp->widget,nbdp->delete_handler);
- g_signal_handler_disconnect(nbdp->widget,nbdp->destroy_handler);
- gtk_container_remove(GTK_CONTAINER(nbdp->box), source);
- gtk_widget_destroy(nbdp->widget);
- nbdp->widget = NULL;
- free(nbdp->name);
- nbdp->name = NULL;
-}
-
-#ifdef WIN32
-static int get_from_registry(const char *key)
-{
- DWORD value;
- DWORD type;
- DWORD len = 4;
- LONG success;
-
- success = RegGetValue(HKEY_CURRENT_USER, TEXT("Software\\subsurface"), TEXT(key),
- RRF_RT_ANY, &type, &value, &len);
- if (success != ERROR_SUCCESS)
- return FALSE; /* that's what happens the first time we start */
- return value;
-}
-#endif
-
-void init_ui(int argc, char **argv)
+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;
GtkIconTheme *icon_theme=NULL;
GtkSettings *settings;
- static const GtkTargetEntry notebook_target = {
- "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");
g_type_init();
-#ifndef WIN32
- gconf = gconf_client_get_default();
-
- if (gconf_client_get_bool(gconf, GCONF_NAME(feet), NULL))
+ subsurface_open_conf();
+ if (subsurface_get_conf("feet", PREF_BOOL))
output_units.length = FEET;
- if (gconf_client_get_bool(gconf, GCONF_NAME(psi), NULL))
+ if (subsurface_get_conf("psi", PREF_BOOL))
output_units.pressure = PSI;
- if (gconf_client_get_bool(gconf, GCONF_NAME(cuft), NULL))
+ if (subsurface_get_conf("cuft", PREF_BOOL))
output_units.volume = CUFT;
- if (gconf_client_get_bool(gconf, GCONF_NAME(fahrenheit), NULL))
+ if (subsurface_get_conf("fahrenheit", PREF_BOOL))
output_units.temperature = FAHRENHEIT;
/* an unset key is FALSE - all these are hidden by default */
- visible_cols.cylinder = gconf_client_get_bool(gconf, GCONF_NAME(CYLINDER), NULL);
- visible_cols.temperature = gconf_client_get_bool(gconf, GCONF_NAME(TEMPERATURE), NULL);
- visible_cols.nitrox = gconf_client_get_bool(gconf, GCONF_NAME(NITROX), NULL);
- visible_cols.otu = gconf_client_get_bool(gconf, GCONF_NAME(OTU), NULL);
- 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 type;
- DWORD len = 4;
- LONG success;
-
- output_units.length = get_from_registry("feet");
- output_units.pressure = get_from_registry("psi");
- output_units.volume = get_from_registry("cuft");
- output_units.temperature = get_from_registry("fahrenheit");
- visible_cols.temperature = get_from_registry("temperature");
- visible_cols.cylinder = get_from_registry("cylinder");
- visible_cols.nitrox = get_from_registry("nitrox");
- visible_cols.sac = get_from_registry("sac");
- visible_cols.otu = get_from_registry("otu");
-
- divelist_font = malloc(80);
- len = 80;
- success = RegGetValue(HKEY_CURRENT_USER, TEXT("Software\\subsurface"),
- TEXT("divelist_font"), RRF_RT_ANY, &type, 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;
- }
-#endif
- if (!divelist_font)
- divelist_font = DIVELIST_DEFAULT_FONT;
+ visible_cols.cylinder = PTR_TO_BOOL(subsurface_get_conf("CYLINDER", PREF_BOOL));
+ visible_cols.temperature = PTR_TO_BOOL(subsurface_get_conf("TEMPERATURE", PREF_BOOL));
+ visible_cols.nitrox = PTR_TO_BOOL(subsurface_get_conf("NITROX", PREF_BOOL));
+ visible_cols.otu = PTR_TO_BOOL(subsurface_get_conf("OTU", PREF_BOOL));
+ visible_cols.sac = PTR_TO_BOOL(subsurface_get_conf("SAC", PREF_BOOL));
+
+ divelist_font = subsurface_get_conf("divelist_font", PREF_STRING);
error_info_bar = NULL;
win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_icon_name ("subsurface");
}
}
- 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.bmp", NULL);
-#endif
+ if (need_icon) {
+ const char *icon_name = subsurface_icon_name();
+ if (!access(icon_name, R_OK))
+ gtk_window_set_icon_from_file(GTK_WINDOW(win), icon_name, NULL);
+ }
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;
main_vbox = vbox;
menubar = get_menubar_menu(win);
- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0);
+
+ subsurface_ui_setup(settings, menubar, vbox);
+
+ vpane = gtk_vpaned_new();
+ gtk_box_pack_start(GTK_BOX(vbox), vpane, TRUE, TRUE, 3);
+
+ hpane = gtk_hpaned_new();
+ gtk_paned_add1(GTK_PANED(vpane), hpane);
/* Notebook for dive info vs profile vs .. */
notebook = gtk_notebook_new();
- gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 6);
- gtk_notebook_set_group(GTK_NOTEBOOK(notebook), GRP_ID);
- g_signal_connect(notebook, "create-window", G_CALLBACK(create_new_notebook_window), NULL);
- gtk_drag_dest_set(notebook, GTK_DEST_DEFAULT_ALL, ¬ebook_target, 1, GDK_ACTION_MOVE);
- g_signal_connect(notebook, "drag-drop", G_CALLBACK(drag_cb), notebook);
+ gtk_paned_add1(GTK_PANED(hpane), notebook);
g_signal_connect(notebook, "switch-page", G_CALLBACK(switch_page), NULL);
/* Create the actual divelist */
dive_list = dive_list_create();
gtk_widget_set_name(dive_list, "Dive List");
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dive_list, gtk_label_new("Dive List"));
- gtk_notebook_set_tab_detachable(GTK_NOTEBOOK(notebook), dive_list, 1);
- gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(notebook), dive_list, 1);
+ gtk_paned_add2(GTK_PANED(vpane), dive_list);
/* Frame for dive profile */
dive_profile = dive_profile_widget();
gtk_widget_set_name(dive_profile, "Dive Profile");
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dive_profile, gtk_label_new("Dive Profile"));
- gtk_notebook_set_tab_detachable(GTK_NOTEBOOK(notebook), dive_profile, 1);
- gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(notebook), dive_profile, 1);
+ gtk_paned_add2(GTK_PANED(hpane), dive_profile);
/* Frame for extended dive info */
dive_info = extended_dive_info_widget();
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);
gc.cr = gdk_cairo_create(widget->window);
g_object_set(widget, "has-tooltip", TRUE, NULL);
g_signal_connect(widget, "query-tooltip", G_CALLBACK(profile_tooltip), &drawing_area);
- set_source_rgb(&gc, 0, 0, 0);
+ init_profile_background(&gc);
cairo_paint(gc.cr);
if (dive) {
break;
}
}
- return(ret);
+ return ret;
}
entry = gtk_entry_new();
gtk_container_add(GTK_CONTAINER(frame), entry);
- gtk_entry_set_text(GTK_ENTRY(entry), "/dev/ttyUSB0");
+ gtk_entry_set_text(GTK_ENTRY(entry), subsurface_USB_name());
return GTK_ENTRY(entry);
}