Changeset 73

Timestamp:

10/25/07 14:35:39 (1 year ago)

Author:

inz

Message:

• Save method and path to gconf.
  
• Add progress bar.
  

Files:

• mh-shot-tool/trunk/Makefile (modified) (1 diff)
• mh-shot-tool/trunk/debian/changelog (modified) (1 diff)
• mh-shot-tool/trunk/shot.c (modified) (11 diffs)

mh-shot-tool/trunk/Makefile

@@ -42 +42 @@
-mh_shot_tool_CFLAGS += $(shell if pkg-config osso-browser-interface --exists; then pkg-config osso-browser-interface --cflags; echo -DOSSO_BROWSER; fi)
-#mh_shot_tool_LDFLAGS += $(shell if pkg-config hildon-fm-2 --exists; then pkg-config hildon-fm-2 --libs; elif pkg-config hildon-fm --exists; then pkg-config hildon-fm --libs; fi)
-
+
+
+
+
+
-mh_shot_tool_LDFLAGS += $(shell if pkg-config hildon-1 --exists; then pkg-config hildon-1 --libs; elif pkg-config hildon-libs --exists; then pkg-config hildon-libs --libs; else pkg-config gtk+-2.0 --libs; fi)
-
-
+gconf-2.0 
-                -DPLUGINDIR=\"$(PLUGINDIR)\" -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\"
-
+gconf-2.0 
-
-mh_shot_tool_SOURCES := shot.c

mh-shot-tool/trunk/debian/changelog

@@ +1 @@
+mh-shot-tool (0.0.4) mistral; urgency=low
+
+  * Save method and path to gconf.
+  * Add progress bar.
+
+ -- Santtu Lakkala <inz@inz.fi>  Thu, 25 Oct 2007 14:34:29 +0300
+
-mh-shot-tool (0.0.3) mistral; urgency=low
-

mh-shot-tool/trunk/shot.c

@@ -7 +7 @@
-#include <string.h>
-#include <libosso.h>
+#include <gconf/gconf-client.h>
-#if defined(TABLET_BROWSER)
-# include <tablet-browser-interface.h>
@@ -16 +17 @@
-#  include <hildon/hildon-window.h>
-#  include <hildon/hildon-defines.h>
+#  include <hildon/hildon-banner.h>
-# else
-#  include <hildon-widgets/hildon-window.h>
-#  include <hildon-widgets/hildon-defines.h>
+#  include <hildon-widgets/hildon-banner.h>
-# endif
-#else
@@ -26 +29 @@
-#define API_KEY "73fc51d360159c5bb4a8f147270cf0c9"
-#define API_SECRET "2537d871c9392998"
+
+struct PixbufWriteData {
+        GtkWidget *progbar;
+        GString *string;
+        FILE *file;
+        gsize data_written;
+};
+
+static gboolean string_append_data(const gchar *bytes,
+                                   gsize len,
+                                   GError **error,
+                                   gpointer user_data)
+{
+        struct PixbufWriteData *data = user_data;
+
+        (void)error;
+
+        if (data->file) {
+                fwrite(bytes, 1, len, data->file);
+        } else {
+                g_string_append_len(data->string, bytes, len);
+        }
+
+        data->data_written += len;
+
+        if (len > 0x800) {
+                gtk_progress_bar_pulse(GTK_PROGRESS_BAR(data->progbar));
+                while (gtk_events_pending())
+                        gtk_main_iteration();
+        }
+
+        return TRUE;
+}
+
+static gchar *pixbuf_png_pack(GdkPixbuf *buf,
+                              const gchar *file,
+                              gsize *len,
+                              GtkWidget *parent)
+{
+        struct PixbufWriteData data = { NULL, NULL, NULL, 0 };
+        GtkWidget *banner;
+        GError *error = NULL;
+
+        data.progbar = gtk_progress_bar_new();
+
+        if (file) {
+                data.file = fopen(file, "w");
+        } else {
+                data.string = g_string_new("");
+        }
+
+        gtk_progress_bar_pulse(GTK_PROGRESS_BAR(data.progbar));
+        banner = hildon_banner_show_progress(parent,
+                                             GTK_PROGRESS_BAR(data.progbar),
+                                             "Compressing...");
+
+        while (gtk_events_pending())
+                gtk_main_iteration();
+
+        gdk_pixbuf_save_to_callback(buf,
+                                    string_append_data,
+                                    &data,
+                                    "png",
+                                    &error,
+                                    NULL);
+
+        if (error != NULL) {
+                g_error_free(error);
+        }
+
+        if (len) {
+                *len = data.data_written;
+        }
+
+        gtk_widget_destroy(banner);
+
+        return data.string ? g_string_free(data.string, FALSE) : NULL;
+}
+
-
-struct form_multipart_builder
@@ -331 +413 @@
-        form_multipart_builder_append_string(builder, "auth_token", frob);
-        form_multipart_builder_append_string(builder, "content_type", "2");
-
-
-
-
-
-
+
+
+
+
-        form_multipart_builder_append_file_data(builder, "photo", "image/png", buffer, buf_data, (gssize)buf_size);
-        form_multipart_builder_to_message(builder, message);
@@ -365 +445 @@
-        time_t now = time(NULL);
-        struct tm times;
+        gchar *last_path;
-        gchar *save;
+        GConfClient *gc;
+
-        (void)osso;
+
+        gc = gconf_client_get_default();
+
+        last_path = gconf_client_get_string(gc,
+                                            "/apps/mh-shot-tool/disk/path",
+                                            NULL);
-
-        localtime_r(&now, &times);
-        strftime(buffer, 1023, "shot-%Y-%m-%d-%H-%M-%S.png", &times);
-        gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(chooser), buffer);
+        if (last_path)
+                gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser),
+                                                    last_path);
-        gtk_widget_show_all(chooser);
-
@@ -376 +468 @@
-        case SHOT_RESPONSE_OK:
-                save = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(chooser));
-
+
+
+
+
+
-                gtk_widget_destroy(chooser);
+                g_object_unref(gc);
-                return TRUE;
-                break;
-        case SHOT_RESPONSE_CANCEL:
-        default:
+                g_object_unref(gc);
-                return FALSE;
-                break;
@@ -449 +547 @@
-int main(int argc, char **argv)
-{
+        GConfClient *gc;
-        struct GrabbedData grab;
-        GtkWidget *combo;
@@ -457 +556 @@
-        GtkWidget *button;
-        gint ret = GTK_RESPONSE_NONE;
+        gchar *last_handler;
-
-        g_set_application_name("MH Shot Tool");
@@ -486 +586 @@
-        gtk_box_pack_start(GTK_BOX(hbox), grab.spinner, FALSE, FALSE, 0);
-        gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new("second interval"), FALSE, FALSE, 0);
-container_add(GTK_CONTAINER(vbox), hbox
+box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0
-        
-ox_new(FALSE, HILDON_MARGIN_DEFAULT
+utton_box_new(
-        button = gtk_button_new_with_label("Ok");
-        g_object_set_data(G_OBJECT(button), "response",
-                          GINT_TO_POINTER(SHOT_RESPONSE_OK));
-        g_signal_connect(button, "clicked", G_CALLBACK(_my_quit), &ret);
-box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0
+container_add(GTK_CONTAINER(hbox), button
-        button = gtk_button_new_with_label("Cancel");
-        g_object_set_data(G_OBJECT(button), "response",
-                          GINT_TO_POINTER(SHOT_RESPONSE_CANCEL));
-        g_signal_connect(button, "clicked", G_CALLBACK(_my_quit), &ret);
-box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0
+container_add(GTK_CONTAINER(hbox), button
-                                             
+        gc = gconf_client_get_default();
+        last_handler = gconf_client_get_string(gc,
+                                               "/apps/mh-shot-tool/handler",
+                                               NULL);
+        
-        combo = gtk_combo_box_new_text();
-        for (i = 0; handlers[i].name; i++) {
-                gtk_combo_box_append_text(GTK_COMBO_BOX(combo),
-                                          handlers[i].name);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        gtk_container_add(GTK_CONTAINER(grab.window), vbox);
-
@@ -518 +627 @@
-        {
-        case SHOT_RESPONSE_OK:
-
+
+
+
+
+
+
-                break;
-        case SHOT_RESPONSE_CANCEL:
@@ -525 +639 @@
-        }
-        g_object_unref(grab.buf);
+        g_object_unref(gc);
+        g_free(last_handler);
-        osso_deinitialize(osso);
-