Changeset 74 for mh-shot-tool

Timestamp:

10/26/07 21:01:02 (1 year ago)

Author:

inz

Message:

Blink the led while waiting for re-grab.

Files:

• mh-shot-tool/trunk/Makefile (modified) (2 diffs)
• mh-shot-tool/trunk/debian/changelog (modified) (1 diff)
• mh-shot-tool/trunk/debian/mh-shot-tool.postinst (added)
• mh-shot-tool/trunk/debian/mh-shot-tool.postrm (added)
• mh-shot-tool/trunk/shot.c (modified) (14 diffs)

mh-shot-tool/trunk/Makefile

@@ -48 +48 @@
-        else pkg-config gtk+-2.0 --cflags; 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)
+mh_shot_tool_CFLAGS += $(shell if pkg-config dbus-1 mce --exists; then \
+        pkg-config dbus-1 mce --cflags; echo -DMCE; fi)
+mh_shot_tool_LDFLAGS += $(shell if pkg-config dbus-1 mce --exists; then \
+        pkg-config dbus-1 mce --libs; fi)
-
-mh_shot_tool_CFLAGS += `pkg-config gtk+-2.0 libsoup-2.2 libosso gconf-2.0 --cflags` \
@@ -74 +78 @@
-        @$(MAKE) LIBDIR="$(LIBDIR)" PLUGINDIR="$(PLUGINDIR)" -s PART="$(patsubst %.build,%,$@)" $(patsubst %.build,%,$@)
-
-
+ Makefile
-        @echo -n "  Building $@..."
-        @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) $($(call CLEAN,${PART})_CFLAGS) -c $< -o $@

mh-shot-tool/trunk/debian/changelog

@@ +1 @@
+mh-shot-tool (0.0.5) mistral; urgency=low
+
+  * Blink the led while waiting for re-grab.
+
+ -- Santtu Lakkala <inz@inz.fi>  Fri, 26 Oct 2007 21:00:30 +0300
+
-mh-shot-tool (0.0.4) mistral; urgency=low
-

mh-shot-tool/trunk/shot.c

@@ -25 +25 @@
-#else
-# define HILDON_MARGIN_DEFAULT 5
+#endif
+#ifdef MCE
+# include <mce/dbus-names.h>
-#endif
-
@@ -311 +314 @@
-};
-
+static void _quit_loop(SoupMessage *message, gpointer loop)
+{
+        (void)message;
+        g_main_loop_quit(loop);
+}
+
+static gboolean _pulse(gpointer data)
+{
+        gtk_progress_bar_pulse(data);
+        return TRUE;
+}
+
-static gboolean flickr_save(GdkPixbuf *buf, GtkWindow *parent,
-                            osso_context_t *osso)
@@ -329 +344 @@
-        time_t now = time(NULL);
-        struct tm times;
+        GMainLoop *loop;
+        GtkWidget *banner;
+        GtkWidget *pbar;
+        guint timer;
-
-        localtime_r(&now, &times);
-        strftime(buffer, 1023, "shot-%Y-%m-%d-%H-%M-%S.png", &times);
-
-
+a
-        msg = flickr_soup_call("flickr.auth.getFrob",
-                               API_SECRET,
@@ -420 +439 @@
-        form_multipart_builder_to_message(builder, message);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        return TRUE;
-}
@@ -508 +538 @@
-        GtkWidget *window;
-        GtkWidget *spinner;
+        GConfClient *gc;
+#ifdef MCE_ACTIVATE_LED_PATTERN
+        GtkWidget *cbox;
+        DBusConnection *conn;
+#endif
-};
-
@@ -513 +548 @@
-{
-        GdkPixbuf *thumb;
+
+#ifdef MCE_ACTIVATE_LED_PATTERN
+        const gchar *pattern_name = "PatternCaptureFast";
+        DBusMessage *msg;
+        if (grab->conn) {
+                msg = dbus_message_new_method_call(MCE_SERVICE,
+                                                   MCE_REQUEST_PATH,
+                                                   MCE_REQUEST_IF,
+                                                   MCE_DEACTIVATE_LED_PATTERN);
+
+                dbus_message_append_args(msg,
+                                         DBUS_TYPE_STRING, &pattern_name,
+                                         DBUS_TYPE_INVALID);
+                dbus_connection_send(grab->conn, msg, NULL);
+                dbus_message_unref(msg);
+                dbus_connection_flush(grab->conn);
+                dbus_connection_unref(grab->conn);
+                grab->conn = NULL;
+        }
+#endif
+
-        grab->buf = gdk_pixbuf_get_from_drawable(NULL,
-                                                 GDK_DRAWABLE(gdk_get_default_root_window()),
@@ -534 +590 @@
-}
-
+#ifdef MCE_ACTIVATE_LED_PATTERN
+static gboolean _enable_slow_pattern(gpointer connection)
+{
+        const gchar *pattern_name = "PatternCaptureSlow";
+        DBusMessage *msg;
+        msg = dbus_message_new_method_call(MCE_SERVICE,
+                                           MCE_REQUEST_PATH,
+                                           MCE_REQUEST_IF,
+                                           MCE_ACTIVATE_LED_PATTERN);
+
+        dbus_message_append_args(msg,
+                                 DBUS_TYPE_STRING, &pattern_name,
+                                 DBUS_TYPE_INVALID);
+        dbus_connection_send(connection, msg, NULL);
+        dbus_message_unref(msg);
+        dbus_connection_flush(connection);
+
+        return FALSE;
+}
+
+static gboolean _enable_fast_pattern(gpointer connection)
+{
+        const gchar *pattern_name = "PatternCaptureSlow";
+        DBusMessage *msg;
+        msg = dbus_message_new_method_call(MCE_SERVICE,
+                                           MCE_REQUEST_PATH,
+                                           MCE_REQUEST_IF,
+                                           MCE_DEACTIVATE_LED_PATTERN);
+
+        dbus_message_append_args(msg,
+                                 DBUS_TYPE_STRING, &pattern_name,
+                                 DBUS_TYPE_INVALID);
+        dbus_connection_send(connection, msg, NULL);
+        dbus_message_unref(msg);
+        dbus_connection_flush(connection);
+
+        msg = dbus_message_new_method_call(MCE_SERVICE,
+                                           MCE_REQUEST_PATH,
+                                           MCE_REQUEST_IF,
+                                           MCE_ACTIVATE_LED_PATTERN);
+        pattern_name = "PatternCaptureFast";
+
+        dbus_message_append_args(msg,
+                                 DBUS_TYPE_STRING, &pattern_name,
+                                 DBUS_TYPE_INVALID);
+        dbus_connection_send(connection, msg, NULL);
+        dbus_message_unref(msg);
+        dbus_connection_flush(connection);
+
+        return FALSE;
+}
+#endif
+
-static void _regrab(GtkWidget *button, struct GrabbedData *grab)
-{
+        gdouble t = gtk_spin_button_get_value(GTK_SPIN_BUTTON(grab->spinner));
+#ifdef MCE_ACTIVATE_LED_PATTERN
+        gint secs = t;
+        gboolean use_led;
+        grab->conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
+#endif
-        (void)button;
-
-        g_object_unref(grab->buf);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                      (GSourceFunc)do_grab,
-                      grab);
@@ -547 +681 @@
-int main(int argc, char **argv)
-{
-        GConfClient *gc;
-        struct GrabbedData grab;
-        GtkWidget *combo;
@@ -557 +690 @@
-        gint ret = GTK_RESPONSE_NONE;
-        gchar *last_handler;
+#ifdef MCE_ACTIVATE_LED_PATTERN
+        gboolean use_led;
+#endif
-
-        g_set_application_name("MH Shot Tool");
-        g_thread_init(NULL);
-        gtk_init(&argc, &argv);
+
+        memset(&grab, 0, sizeof(grab));
-
-        osso = osso_initialize("org.MaemoHackers.MhShotTool", "0.0.1",
@@ -586 +724 @@
-        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);
-
+
+
+
+
+
+
+
+
+
+
+
-        
-        hbox = gtk_hbutton_box_new();
@@ -600 +748 @@
-        gtk_container_add(GTK_CONTAINER(hbox), button);
-                                             
-
-
+
-                                               "/apps/mh-shot-tool/handler",
-                                               NULL);
@@ -616 +763 @@
-                gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
-
-FALS
+TRU
-        gtk_box_pack_end(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
-        gtk_container_add(GTK_CONTAINER(grab.window), vbox);
@@ -629 +776 @@
-                i = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
-                handlers[i].save(grab.buf, GTK_WINDOW(grab.window), osso);
-
+rab.g
-                                        "/apps/mh-shot-tool/handler",
-                                        handlers[i].name,
@@ -639 +786 @@
-        }
-        g_object_unref(grab.buf);
-
+rab.g
-        g_free(last_handler);
-        osso_deinitialize(osso);