added "Zoom" button and improved scaling

[ext/subsurface.git] / gtk-gui.c

diff --git a/gtk-gui.c b/gtk-gui.c
index 0bc79954f49124b413cd84dbb08737f659a817df..4b9f002af60d5967c30338e607ed229e0b9fbd78 100644 (file)
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -22,6 +22,7 @@ GtkWidget *error_info_bar;
 GtkWidget *error_label;
 GtkWidget *vpane, *hpane;
 int        error_count;
+extern char zoomed_plot;
 
 const char *divelist_font;
 
@@ -32,12 +33,18 @@ static GtkWidget *dive_profile;
 visible_cols_t visible_cols = {TRUE, FALSE};
 
 static const char *default_dive_computer;
+static const char *default_dive_computer_device;
 
 static int is_default_dive_computer(const char *name)
 {
        return default_dive_computer && !strcmp(name, default_dive_computer);
 }
 
+static int is_default_dive_computer_device(const char *name)
+{
+       return default_dive_computer_device && !strcmp(name, default_dive_computer_device);
+}
+
 static void set_default_dive_computer(const char *name)
 {
        if (!name || !*name)
@@ -48,6 +55,16 @@ static void set_default_dive_computer(const char *name)
        subsurface_set_conf("dive_computer", PREF_STRING, name);
 }
 
+static void set_default_dive_computer_device(const char *name)
+{
+       if (!name || !*name)
+               return;
+       if (is_default_dive_computer_device(name))
+               return;
+       default_dive_computer_device = name;
+       subsurface_set_conf("dive_computer_device", PREF_STRING, name);
+}
+
 void repaint_dive(void)
 {
        update_dive(current_dive);
@@ -594,6 +611,13 @@ static void view_three(GtkWidget *w, gpointer data)
        gtk_paned_set_position(GTK_PANED(vpane), 200);
 }
 
+static void toggle_zoom(GtkWidget *w, gpointer data)
+{
+       zoomed_plot = (zoomed_plot)?0 : 1;
+       /*Update dive*/
+       repaint_dive();
+}
+
 static GtkActionEntry menu_items[] = {
        { "FileMenuAction", GTK_STOCK_FILE, "File", NULL, NULL, NULL},
        { "LogMenuAction",  GTK_STOCK_FILE, "Log", NULL, NULL, NULL},
@@ -612,7 +636,8 @@ static GtkActionEntry menu_items[] = {
        { "ViewList",       NULL, "List",  CTRLCHAR "1", NULL, G_CALLBACK(view_list) },
        { "ViewProfile",    NULL, "Profile", CTRLCHAR "2", NULL, G_CALLBACK(view_profile) },
        { "ViewInfo",       NULL, "Info", CTRLCHAR "3", NULL, G_CALLBACK(view_info) },
-       { "ViewThree",       NULL, "Three", CTRLCHAR "4", NULL, G_CALLBACK(view_three) },
+       { "ViewThree",      NULL, "Three", CTRLCHAR "4", NULL, G_CALLBACK(view_three) },
+       { "ToggleZoom",     NULL, "Toggle Zoom", CTRLCHAR "0", NULL, G_CALLBACK(toggle_zoom) },
 };
 static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
 
@@ -624,14 +649,15 @@ static const gchar* ui_string = " \
                                <menuitem name=\"Save\" action=\"SaveFile\" /> \
                                <menuitem name=\"Print\" action=\"Print\" /> \
                                <separator name=\"Separator1\"/> \
-                               <menuitem name=\"Import\" action=\"Import\" /> \
-                               <separator name=\"Separator2\"/> \
                                <menuitem name=\"Preferences\" action=\"Preferences\" /> \
-                               <separator name=\"Separator3\"/> \
+                               <separator name=\"Separator2\"/> \
                                <menuitem name=\"Quit\" action=\"Quit\" /> \
                        </menu> \
                        <menu name=\"LogMenu\" action=\"LogMenuAction\"> \
+                               <menuitem name=\"Import\" action=\"Import\" /> \
+                               <separator name=\"Separator\"/> \
                                <menuitem name=\"Renumber\" action=\"Renumber\" /> \
+                               <menuitem name=\"Toggle Zoom\" action=\"ToggleZoom\" /> \
                                <menu name=\"View\" action=\"ViewMenuAction\"> \
                                        <menuitem name=\"List\" action=\"ViewList\" /> \
                                        <menuitem name=\"Profile\" action=\"ViewProfile\" /> \
@@ -709,6 +735,7 @@ void init_ui(int *argcp, char ***argvp)
        divelist_font = subsurface_get_conf("divelist_font", PREF_STRING);
 
        default_dive_computer = subsurface_get_conf("dive_computer", PREF_STRING);
+       default_dive_computer_device = subsurface_get_conf("dive_computer_device", PREF_STRING);
 
        error_info_bar = NULL;
        win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -939,6 +966,14 @@ static GtkComboBox *dive_computer_selector(GtkWidget *vbox)
        return GTK_COMBO_BOX(combo_box);
 }
 
+const char *subsurface_device_name()
+{
+       if (!default_dive_computer_device || !*default_dive_computer_device)
+               return subsurface_USB_name();
+       else
+               return default_dive_computer_device;
+}
+
 static GtkEntry *dive_computer_device(GtkWidget *vbox)
 {
        GtkWidget *hbox, *entry, *frame;
@@ -951,7 +986,7 @@ static GtkEntry *dive_computer_device(GtkWidget *vbox)
 
        entry = gtk_entry_new();
        gtk_container_add(GTK_CONTAINER(frame), entry);
-       gtk_entry_set_text(GTK_ENTRY(entry), subsurface_USB_name());
+       gtk_entry_set_text(GTK_ENTRY(entry), subsurface_device_name());
 
        return GTK_ENTRY(entry);
 }
@@ -1013,20 +1048,26 @@ static void do_import_file(gpointer data, gpointer user_data)
        }
 }
 
-static GtkWidget *import_dive_computer(device_data_t *data, GtkBox *vbox)
+static GtkWidget *import_dive_computer(device_data_t *data, GtkDialog *dialog)
 {
        GError *error;
-       GtkWidget *info, *container, *label;
+       GtkWidget *vbox, *info, *container, *label, *button;
 
        error = do_import(data);
        if (!error)
                return NULL;
 
+       button = gtk_dialog_get_widget_for_response(dialog, GTK_RESPONSE_ACCEPT);
+       gtk_button_set_use_stock(GTK_BUTTON(button), 0);
+       gtk_button_set_label(GTK_BUTTON(button), "Retry");
+
+       vbox = gtk_dialog_get_content_area(dialog);
+
        info = gtk_info_bar_new();
        container = gtk_info_bar_get_content_area(GTK_INFO_BAR(info));
        label = gtk_label_new(error->message);
        gtk_container_add(GTK_CONTAINER(container), label);
-       gtk_box_pack_start(vbox, info, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(vbox), info, FALSE, FALSE, 0);
        return info;
 }
 
@@ -1086,7 +1127,8 @@ repeat:
                        devicedata.name = comp;
                        devicedata.devname = gtk_entry_get_text(device);
                        set_default_dive_computer(devicedata.name);
-                       info = import_dive_computer(&devicedata, GTK_BOX(vbox));
+                       set_default_dive_computer_device(devicedata.devname);
+                       info = import_dive_computer(&devicedata, GTK_DIALOG(dialog));
                        if (info)
                                goto repeat;
                } else {
@@ -1107,6 +1149,10 @@ void update_progressbar(progressbar_t *progress, double value)
        gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress->bar), value);
 }
 
+void update_progressbar_text(progressbar_t *progress, const char *text)
+{
+       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress->bar), text);
+}
 
 void set_filename(const char *filename)
 {