Finish missing web search functionality

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 83c949331c102eed44d71e89ca1ab7a5ce55d61f..48638eb49036d504d27295f8980c2d1db9035311 100644 (file)
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -3391,6 +3391,8 @@ midori_browser_set_property (GObject*      object,
 {
     MidoriBrowser* browser = MIDORI_BROWSER (object);
     MidoriBrowserPrivate* priv = browser->priv;
+    guint last_web_search;
+    MidoriWebItem* web_item;
 
     switch (prop_id)
     {
@@ -3430,7 +3432,14 @@ midori_browser_set_property (GObject*      object,
         g_object_set (priv->search, "search-engines",
                       priv->search_engines, NULL);
         /* FIXME: Connect to updates */
-        _midori_browser_update_actions (browser);
+        if (priv->settings)
+        {
+            g_object_get (priv->settings, "last-web-search",
+                          &last_web_search, NULL);
+            web_item = midori_web_list_get_nth_item (priv->search_engines,
+                                                     last_web_search);
+            g_object_set (priv->search, "current-item", web_item, NULL);
+        }
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);

diff --git a/midori/midori-searchentry.c b/midori/midori-searchentry.c
index e3c3056627900d947414d5441cce58a06f55c5c4..5d23bf38bd1e5d354aa0a4683300420231ba34ce 100644 (file)
--- a/midori/midori-searchentry.c
+++ b/midori/midori-searchentry.c
@@ -159,9 +159,24 @@ midori_search_entry_icon_released_cb (GtkWidget*             widget,
                          NULL, SOKOKE_MENU_POSITION_LEFT);
 }
 
+static void
+_midori_search_entry_move_index (MidoriSearchEntry* search_entry,
+                                 guint              n)
+{
+    gint i;
+    MidoriWebItem* web_item;
+
+    i = midori_web_list_get_item_index (search_entry->search_engines,
+                                        search_entry->current_item);
+    web_item = midori_web_list_get_nth_item (search_entry->search_engines,
+                                             i + n);
+    if (web_item)
+        midori_search_entry_set_current_item (search_entry, web_item);
+}
+
 static gboolean
-midori_search_entry_key_press_event_cb (GtkWidget*   widget,
-                                        GdkEventKey* event)
+midori_search_entry_key_press_event_cb (MidoriSearchEntry* search_entry,
+                                        GdkEventKey*       event)
 {
     GdkModifierType state;
     gint x, y;
@@ -172,26 +187,59 @@ midori_search_entry_key_press_event_cb (GtkWidget*   widget,
     switch (event->keyval)
     {
     case GDK_Up:
-        /* update_searchEngine(config->searchEngine - 1, browser); */
+        _midori_search_entry_move_index (search_entry, - 1);
         return TRUE;
     case GDK_Down:
-        /* update_searchEngine(config->searchEngine + 1, browser); */
+        _midori_search_entry_move_index (search_entry, + 1);
         return TRUE;
     }
     return FALSE;
 }
 
 static gboolean
-midori_search_entry_scroll_event_cb (GtkWidget*      widget,
-                                     GdkEventScroll* event)
+midori_search_entry_scroll_event_cb (MidoriSearchEntry* search_entry,
+                                     GdkEventScroll*    event)
 {
     if (event->direction == GDK_SCROLL_DOWN)
-        ; /* update_searchEngine(config->searchEngine + 1, browser); */
+        _midori_search_entry_move_index (search_entry, + 1);
     else if (event->direction == GDK_SCROLL_UP)
-        ; /* update_searchEngine(config->searchEngine - 1, browser); */
+        _midori_search_entry_move_index (search_entry, - 1);
     return TRUE;
 }
 
+static void
+midori_search_entry_engines_add_item_cb (MidoriWebList*     web_list,
+                                         MidoriWebItem*     item,
+                                         MidoriSearchEntry* search_entry)
+{
+    if (!search_entry->current_item)
+        midori_search_entry_set_current_item (search_entry, item);
+}
+
+static void
+midori_search_entry_engines_remove_item_cb (MidoriWebList*     web_list,
+                                            MidoriWebItem*     item,
+                                            MidoriSearchEntry* search_entry)
+{
+    MidoriWebItem* web_item;
+
+    if (search_entry->current_item == item)
+    {
+        web_item = midori_web_list_get_nth_item (web_list, 0);
+        if (web_item)
+            midori_search_entry_set_current_item (search_entry, web_item);
+        else
+        {
+            sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (search_entry),
+                                      SEXY_ICON_ENTRY_PRIMARY, NULL);
+            sokoke_entry_set_default_text (GTK_ENTRY (search_entry), "");
+
+            katze_object_assign (search_entry->current_item, NULL);
+            g_object_notify (G_OBJECT (search_entry), "current-item");
+        }
+    }
+}
+
 static void
 midori_search_entry_init (MidoriSearchEntry* search_entry)
 {
@@ -210,6 +258,13 @@ midori_search_entry_init (MidoriSearchEntry* search_entry)
                       "signal::scroll-event",
                       midori_search_entry_scroll_event_cb, NULL,
                       NULL);
+
+    g_object_connect (search_entry->search_engines,
+        "signal-after::add-item",
+        midori_search_entry_engines_add_item_cb, search_entry,
+        "signal-after::remove-item",
+        midori_search_entry_engines_remove_item_cb, search_entry,
+        NULL);
 }
 
 static void
@@ -218,6 +273,7 @@ midori_search_entry_finalize (GObject* object)
     MidoriSearchEntry* search_entry = MIDORI_SEARCH_ENTRY (object);
 
     g_object_unref (search_entry->search_engines);
+    g_object_unref (search_entry->current_item);
 
     G_OBJECT_CLASS (midori_search_entry_parent_class)->finalize (object);
 }
@@ -233,10 +289,12 @@ midori_search_entry_set_property (GObject*      object,
     switch (prop_id)
     {
     case PROP_SEARCH_ENGINES:
-        search_entry->search_engines = g_value_get_object (value);
+        midori_search_entry_set_search_engines (search_entry,
+                                                g_value_get_object (value));
         break;
     case PROP_CURRENT_ITEM:
-        search_entry->current_item = g_value_get_object (value);
+        midori_search_entry_set_current_item (search_entry,
+                                              g_value_get_object (value));
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -316,6 +374,13 @@ midori_search_entry_set_search_engines (MidoriSearchEntry* search_entry,
     g_object_ref (search_engines);
     katze_object_assign (search_entry->search_engines, search_engines);
     g_object_notify (G_OBJECT (search_entry), "search-engines");
+
+    g_object_connect (search_engines,
+        "signal-after::add-item",
+        midori_search_entry_engines_add_item_cb, search_entry,
+        "signal-after::remove-item",
+        midori_search_entry_engines_remove_item_cb, search_entry,
+        NULL);
 }
 
 /**
@@ -345,7 +410,9 @@ midori_search_entry_set_current_item (MidoriSearchEntry* search_entry,
     g_object_unref (pixbuf);
     sokoke_entry_set_default_text (GTK_ENTRY (search_entry),
                                    midori_web_item_get_name (web_item));
-    search_entry->current_item = web_item;
+
+    g_object_ref (web_item);
+    katze_object_assign (search_entry->current_item, web_item);
     g_object_notify (G_OBJECT (search_entry), "current-item");
 }
 
@@ -608,6 +675,20 @@ midori_search_entry_dialog_remove_cb (GtkWidget*         widget,
     /* FIXME: we want to allow undo of some kind */
 }
 
+static void
+midori_search_entry_treeview_selection_cb (GtkWidget*         treeview,
+                                           MidoriSearchEntry* search_entry)
+{
+    GtkTreeSelection* selection;
+    gboolean selected;
+
+    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (search_entry->treeview));
+    selected = gtk_tree_selection_get_selected (selection, NULL, NULL);
+
+    gtk_widget_set_sensitive (search_entry->edit_button, selected);
+    gtk_widget_set_sensitive (search_entry->remove_button, selected);
+}
+
 /**
  * midori_search_entry_get_dialog:
  * @search_entry: a #MidoriSearchEntry
@@ -670,6 +751,11 @@ midori_search_entry_get_dialog (MidoriSearchEntry* search_entry)
                                  TRUE, TRUE, 12);
     liststore = gtk_list_store_new (1, MIDORI_TYPE_WEB_ITEM);
     treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (liststore));
+    /*g_signal_connect (treeview, "cursor-changed",
+        G_CALLBACK (midori_search_entry_treeview_selection_cb), search_entry);*/
+    g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
+        "changed", G_CALLBACK (midori_search_entry_treeview_selection_cb),
+        search_entry);
     search_entry->treeview = treeview;
     gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
     column = gtk_tree_view_column_new ();

diff --git a/midori/midori-searchentry.h b/midori/midori-searchentry.h
index f9295085f3243b9c2ff27c5829deb4f3e1283916..588277d6e131f0580b6f6db8a054c9b1c8d250c9 100644 (file)
--- a/midori/midori-searchentry.h
+++ b/midori/midori-searchentry.h
@@ -46,6 +46,13 @@ midori_search_entry_get_type               (void);
 GtkWidget*
 midori_search_entry_new                    (void);
 
+MidoriWebList*
+midori_search_entry_get_search_engines     (MidoriSearchEntry*  search_entry);
+
+void
+midori_search_entry_set_search_engines     (MidoriSearchEntry*  search_entry,
+                                            MidoriWebList*      name);
+
 MidoriWebItem*
 midori_search_entry_get_current_item       (MidoriSearchEntry*  search_entry);
 

diff --git a/midori/midori-weblist.c b/midori/midori-weblist.c
index 6d1f9a268b05fd932f0ff7924dbe164b51faf755..daf2c3b1febaf5caa78cc32794e71d84416b7e34 100644 (file)
--- a/midori/midori-weblist.c
+++ b/midori/midori-weblist.c
@@ -48,6 +48,7 @@ _midori_web_list_remove_item (MidoriWebList* web_list,
                               MidoriWebItem* web_item)
 {
     web_list->items = g_list_remove (web_list->items, web_item);
+    g_object_unref (web_item);
 }
 
 static void
@@ -148,7 +149,7 @@ midori_web_list_remove_item (MidoriWebList* web_list,
  * @web_list: a #MidoriWebList
  * @n: an index in the list
  *
- * Retrieves the item in @web_list at the index @n.
+ * Retrieves the item in @web_list at the position @n.
  *
  * Return value: an item, or %NULL
  **/
@@ -161,6 +162,25 @@ midori_web_list_get_nth_item (MidoriWebList* web_list,
     return g_list_nth_data (web_list->items, n);
 }
 
+/**
+ * midori_web_list_get_item_position:
+ * @web_list: a #MidoriWebList
+ * @item: an item in the list
+ *
+ * Retrieves the index of the item in @web_list.
+ *
+ * Return value: an item, or -1
+ **/
+gint
+midori_web_list_get_item_index (MidoriWebList* web_list,
+                                MidoriWebItem* web_item)
+{
+    g_return_val_if_fail (MIDORI_IS_WEB_LIST (web_list), -1);
+    g_return_val_if_fail (MIDORI_IS_WEB_ITEM (web_item), -1);
+
+    return g_list_index (web_list->items, web_item);
+}
+
 /**
  * midori_web_list_find_token:
  * @web_list: a #MidoriWebList

diff --git a/midori/midori-weblist.h b/midori/midori-weblist.h
index 86660fb302d1594eb3d2e0818dc1affeb3b6b489..64f9866c47ee5f1e25b3b141f8d1fdbc8fa4a63b 100644 (file)
--- a/midori/midori-weblist.h
+++ b/midori/midori-weblist.h
@@ -63,6 +63,10 @@ MidoriWebItem*
 midori_web_list_get_nth_item           (MidoriWebList* web_list,
                                         guint          n);
 
+gint
+midori_web_list_get_item_index         (MidoriWebList* web_list,
+                                        MidoriWebItem* web_item);
+
 MidoriWebItem*
 midori_web_list_find_token             (MidoriWebList* web_list,
                                         const gchar*   token);

diff --git a/midori/sokoke.c b/midori/sokoke.c
index b7024e917e1983f025be3e14f6e0d04b85543601..277ee7189b574e1afd37cafed91f657685e3f0b0 100644 (file)
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -340,9 +340,9 @@ sokoke_on_entry_focus_in_event (GtkEntry*      entry,
                                 GdkEventFocus* event,
                                 gpointer       userdata)
 {
-    gint default_text = GPOINTER_TO_INT (
+    gint has_default = GPOINTER_TO_INT (
         g_object_get_data (G_OBJECT (entry), "sokoke_has_default"));
-    if (default_text)
+    if (has_default)
     {
         gtk_entry_set_text (entry, "");
         g_object_set_data (G_OBJECT(entry), "sokoke_has_default",
@@ -361,9 +361,9 @@ sokoke_on_entry_focus_out_event (GtkEntry*      entry,
     const gchar* text = gtk_entry_get_text (entry);
     if (text && !*text)
     {
-        const gchar* defaultText = (const gchar*)g_object_get_data (
-         G_OBJECT (entry), "sokoke_default_text");
-        gtk_entry_set_text (entry, defaultText);
+        const gchar* default_text = (const gchar*)g_object_get_data (
+            G_OBJECT (entry), "sokoke_default_text");
+        gtk_entry_set_text (entry, default_text);
         g_object_set_data (G_OBJECT(entry),
                            "sokoke_has_default", GINT_TO_POINTER (1));
         sokoke_widget_set_pango_font_style (GTK_WIDGET (entry),
@@ -387,6 +387,17 @@ sokoke_entry_set_default_text (GtkEntry*    entry,
                                             PANGO_STYLE_ITALIC);
         gtk_entry_set_text (entry, default_text);
     }
+    else if (!GTK_WIDGET_HAS_FOCUS (GTK_WIDGET (entry)))
+    {
+        gint has_default = GPOINTER_TO_INT (
+            g_object_get_data (G_OBJECT (entry), "sokoke_has_default"));
+        if (has_default)
+        {
+            gtk_entry_set_text (entry, default_text);
+            sokoke_widget_set_pango_font_style (GTK_WIDGET (entry),
+                                                PANGO_STYLE_ITALIC);
+        }
+    }
     g_object_set_data (G_OBJECT (entry), "sokoke_default_text",
                        (gpointer)default_text);
     g_signal_connect (entry, "focus-in-event",