r3001 - in trunk/src/target/OM-2007.2/applications/openmoko-browser2: . src

[zecke at sita.openmoko.org]

Author: zecke
Date: 2007-09-18 03:40:57 +0200 (Tue, 18 Sep 2007)
New Revision: 3001

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/go-page.c
Log:
2007-09-17 Holger Hans Peter Freyther <zecke at selfish.org>

        Change the button label depending on if we are going
        to search or to navigate to a url directly.

        * src/go-page.c:
        (url_entry_changed):
        (search_entry_changed):
        (setup_go_page):


Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog	2007-09-18 01:40:56 UTC (rev 3000)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog	2007-09-18 01:40:57 UTC (rev 3001)
@@ -1,5 +1,15 @@
 2007-09-17  Holger Hans Peter Freyther  <zecke at selfish.org>
 
+        Change the button label depending on if we are going
+        to search or to navigate to a url directly.
+
+        * src/go-page.c:
+        (url_entry_changed):
+        (search_entry_changed):
+        (setup_go_page):
+
+2007-09-17  Holger Hans Peter Freyther  <zecke at selfish.org>
+
         Due the Gtk+ bug disable automatically switching pages. This
         will be reenabled once GtkTreeView, GtkTreeSelection is battled
         again.

Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/go-page.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/go-page.c	2007-09-18 01:40:56 UTC (rev 3000)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/go-page.c	2007-09-18 01:40:57 UTC (rev 3001)
@@ -96,12 +96,22 @@
     return FALSE;
 }
 
-static void search_url_entry_changed(GtkEntry* entry, GtkWidget* complementary_entry)
+static void url_entry_changed(GtkEntry* entry, struct BrowserData* data)
 {
     const gchar* text = gtk_entry_get_text (entry);
-    gtk_widget_set_sensitive(complementary_entry, !strcmp(text, search_names[SearchEntry]) || !strcmp(text, search_names[UrlEntry]) || strlen(text) == 0);
+    gtk_widget_set_sensitive (GTK_WIDGET (data->goSearchEntry), !strcmp(text, search_names[UrlEntry]) || strlen(text) == 0);
+    gtk_button_set_label (GTK_BUTTON(data->goButton), _(search_names[GoUrl]));
+    gtk_button_set_label (GTK_BUTTON(data->goButtonNewPage), _(search_names[GoNewPageUrl]));
 }
 
+static void search_entry_changed(GtkEntry* entry, struct BrowserData* data)
+{
+    const gchar* text = gtk_entry_get_text (entry);
+    gtk_widget_set_sensitive (GTK_WIDGET (data->goUrlEntry), !strcmp(text, search_names[SearchEntry]) || strlen(text) == 0);
+    gtk_button_set_label (GTK_BUTTON(data->goButton), _(search_names[GoSearch]));
+    gtk_button_set_label (GTK_BUTTON(data->goButtonNewPage), _(search_names[GoNewPageSearch]));
+}
+
 static void go_clicked(GtkButton* btn, struct BrowserData* data)
 {
     g_return_if_fail (data->currentPage);
@@ -164,12 +174,12 @@
     data->goUrlEntry = GTK_ENTRY (gtk_entry_new ());
     data->goSearchEntry = GTK_ENTRY (gtk_entry_new ());
     gtk_box_pack_start (box, GTK_WIDGET (data->goUrlEntry), FALSE, TRUE, 0);
-    g_signal_connect(data->goUrlEntry, "changed", G_CALLBACK(search_url_entry_changed), data->goSearchEntry);
+    g_signal_connect(data->goUrlEntry, "changed", G_CALLBACK(url_entry_changed), data);
     g_signal_connect(data->goUrlEntry, "focus-in-event", G_CALLBACK(entry_focus_in), (gpointer)search_names[UrlEntry]);
     g_signal_connect(data->goUrlEntry, "focus-out-event", G_CALLBACK(entry_focus_out), (gpointer)search_names[UrlEntry]); 
 
     gtk_box_pack_start (box, GTK_WIDGET (data->goSearchEntry), FALSE, TRUE, 0);
-    g_signal_connect(data->goSearchEntry, "changed", G_CALLBACK(search_url_entry_changed), data->goUrlEntry);
+    g_signal_connect(data->goSearchEntry, "changed", G_CALLBACK(search_entry_changed), data);
     g_signal_connect(data->goSearchEntry, "focus-in-event", G_CALLBACK(entry_focus_in), (gpointer)search_names[SearchEntry]);
     g_signal_connect(data->goSearchEntry, "focus-out-event", G_CALLBACK(entry_focus_out), (gpointer)search_names[SearchEntry]);