Changeset 2637 for trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-item-view.c

Timestamp:

08/04/07 23:18:11 (6 years ago)

Author:

zecke

Message:

2007-08-04 Holger Hans Peter Freyther <zecke@…>

First version that can fetch feeds again and display some part of the
message to the user.

Some how scrolling with MokoFingerScrollView? and WebKitGtkPage? does not
work.

The application is still very raw, beginning with missing icons, to missing
configuration possibilities to missing features.

• src/Makefile.am:
• src/feed-data.c: (feed_sort_init): (feed_data_load_from_cache): (feed_filter_new): (feed_sort_new):
• src/feed-item-view.c: (do_highlight): (search_entry_changed_closure): (feed_item_view_init): (feed_item_view_highlight):
• src/feed-item-view.h:
• src/feed-selection-view.c: Added. (treeview_selection_changed): (treeview_keypress_event): (refresh_feeds_closure): (feed_selection_view_init): (feed_selection_view_class_init): (feed_selection_view_new): (feed_selection_view_add_column): (feed_selection_view_get_search_string):
• src/feed-selection-view.h:
• src/main.c: (feed_selection_changed): (create_feed_view): (create_configuration_ui): (create_ui):

File:

• trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-item-view.c (modified) (3 diffs)

trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-item-view.c

@@ -57 +57 @@
 }
 
+static void
+do_highlight (FeedItemView* view, const gchar* search_string)
+{
+    /* webkit_gtk_page_search (view->page, search_string); */
+}
+
+static void
+search_entry_changed_closure (GtkEntry* entry, FeedItemView* view)
+{
+    do_highlight (view, gtk_entry_get_text (entry));
+}
+
 
 G_DEFINE_TYPE(FeedItemView, feed_item_view, GTK_TYPE_VBOX)
@@ -69 +81 @@
     gtk_box_pack_start (GTK_BOX(view), toolbar, FALSE, FALSE, 0);
 
-    view->back = gtk_tool_button_new_from_stock (GTK_STOCK_MEDIA_PREVIOUS);
+    view->back = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD);
     gtk_tool_item_set_expand (GTK_TOOL_ITEM(view->back), TRUE);
     gtk_toolbar_insert (GTK_TOOLBAR(toolbar), view->back, 0);
     g_signal_connect (view->back, "clicked", G_CALLBACK(prev_clicked), view);
+
+    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), gtk_separator_tool_item_new (), 1);
     
     view->mail = gtk_tool_button_new_from_stock (MOKO_STOCK_MAIL_SEND);
     gtk_tool_item_set_expand (GTK_TOOL_ITEM(view->mail), TRUE);
-    gtk_toolbar_insert (GTK_TOOLBAR(toolbar), view->mail, 1);
+    gtk_toolbar_insert (GTK_TOOLBAR(toolbar), view->mail, 2);
     g_signal_connect (view->mail, "clicked", G_CALLBACK(mail_clicked), view);
 
-    view->forward = gtk_tool_button_new_from_stock (GTK_STOCK_MEDIA_NEXT);
+    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), gtk_separator_tool_item_new (), 3);
+
+    view->forward = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD);
     gtk_tool_item_set_expand (GTK_TOOL_ITEM(view->forward), TRUE);
-    gtk_toolbar_insert (GTK_TOOLBAR(toolbar), view->forward, 2);
+    gtk_toolbar_insert (GTK_TOOLBAR(toolbar), view->forward, 4);
     g_signal_connect (view->forward, "clicked", G_CALLBACK(next_clicked), view);
 
+    /*
+     * Search Entry
+     */
+    GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (view), hbox, FALSE, FALSE, 0);
+
+    view->search_button = gtk_button_new ();
+    gtk_widget_set_name (GTK_WIDGET (view->search_button), "mokosearchbutton");
+    gtk_button_set_image (GTK_BUTTON (view->search_button), gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_SMALL_TOOLBAR));
+    gtk_box_pack_start (GTK_BOX (hbox), view->search_button, FALSE, FALSE, 0);
+
+    view->search_entry = GTK_ENTRY (gtk_entry_new ());
+    gtk_widget_set_name (GTK_WIDGET (view->search_entry), "mokosearchentry");
+    g_signal_connect (G_OBJECT (view->search_entry), "changed", G_CALLBACK (search_entry_changed_closure), view);
+    gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (view->search_entry), TRUE, TRUE, 0);
+
+    /*
+     * Details 'pane'
+     */
     GtkWidget* scrolled = moko_finger_scroll_new ();
     gtk_box_pack_start (GTK_BOX(view), scrolled, TRUE, TRUE, 0);
@@ -158 +193 @@
 feed_item_view_highlight (FeedItemView* view, const gchar* search_string)
 {
-    /* webkit_gtk_page_search (view->page, search_string); */
+    do_highlight (view, search_string);
 }