evolution-rss r266 - in trunk: . src
- From: lucilanga svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution-rss r266 - in trunk: . src
- Date: Fri, 9 May 2008 06:35:39 +0100 (BST)
Author: lucilanga
Date: Fri May 9 05:35:38 2008
New Revision: 266
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=266&view=rev
Log:
plugin configuration for html rendering
Modified:
trunk/ChangeLog
trunk/TODO
trunk/src/evolution-import-rss.c
trunk/src/rss-config-factory.c
trunk/src/rss-ui.glade
trunk/src/rss.c
Modified: trunk/TODO
==============================================================================
--- trunk/TODO (original)
+++ trunk/TODO Fri May 9 05:35:38 2008
@@ -42,3 +42,4 @@
* make cancel all button work
* add debug points for showing steps of current operation
* check libsoup 2.2 fallback
+ * make ellipsize play nice with feeds list
Modified: trunk/src/evolution-import-rss.c
==============================================================================
--- trunk/src/evolution-import-rss.c (original)
+++ trunk/src/evolution-import-rss.c Fri May 9 05:35:38 2008
@@ -175,7 +175,7 @@
{
system("evolution&");
g_print("fireing evolution...\n");
- sleep(10);
+ sleep(30);
send_dbus_ping ();
g_timeout_add (EVOLUTION_PING_TIMEOUT, err_evo_cb, (gpointer)i++);
g_main_loop_run(loop);
Modified: trunk/src/rss-config-factory.c
==============================================================================
--- trunk/src/rss-config-factory.c (original)
+++ trunk/src/rss-config-factory.c Fri May 9 05:35:38 2008
@@ -1591,16 +1591,15 @@
gtk_widget_show(label_webkit);
#endif
g_signal_connect (combo, "changed", G_CALLBACK (render_engine_changed), NULL);
- g_signal_connect (combo, "value-changed", G_CALLBACK (render_engine_changed), NULL);
gtk_widget_show(combo);
gtk_box_pack_start(GTK_BOX(ui->combobox), combo, FALSE, FALSE, 0);
ui->gconf = gconf_client_get_default ();
- hbox = gtk_vbox_new (FALSE, 0);
+ hbox = gtk_vbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), glade_xml_get_widget (ui->xml, "html-rendering"), FALSE, FALSE, 0);
- g_object_set_data_full (G_OBJECT (hbox), "ui-data", ui, destroy_ui_data);
+ g_object_set_data_full (G_OBJECT (hbox), "ui-data", ui, destroy_ui_data);
return hbox;
}
@@ -1731,8 +1730,13 @@
GCONF_KEY_DISPLAY_SUMMARY);
+#if (EVOLUTION_VERSION < 21900) // include devel too
+
+ /*first make the tab visible */
+ g_object_set(glade_xml_get_widget(sf->gui, "label_HTML"), "visible", TRUE);
+ g_object_set(glade_xml_get_widget(sf->gui, "vbox_HTML"), "visible", TRUE);
/* HTML tab */
-/* sf->combo_hbox = glade_xml_get_widget(sf->gui, "hbox17");
+ sf->combo_hbox = glade_xml_get_widget(sf->gui, "hbox17");
GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
store = gtk_list_store_new(1, G_TYPE_STRING);
GtkWidget *combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(store));
@@ -1780,9 +1784,9 @@
gtk_widget_show(label_webkit);
#endif
g_signal_connect (combo, "changed", G_CALLBACK (render_engine_changed), NULL);
- g_signal_connect (combo, "value-changed", G_CALLBACK (render_engine_changed), NULL);
gtk_widget_show(combo);
- gtk_box_pack_start(GTK_BOX(sf->combo_hbox), combo, FALSE, FALSE, 0);*/
+ gtk_box_pack_start(GTK_BOX(sf->combo_hbox), combo, FALSE, FALSE, 0);
+#endif
/* Network tab */
sf->use_proxy = glade_xml_get_widget(sf->gui, "use_proxy");
Modified: trunk/src/rss-ui.glade
==============================================================================
--- trunk/src/rss-ui.glade (original)
+++ trunk/src/rss-ui.glade Fri May 9 05:35:38 2008
@@ -212,7 +212,7 @@
</widget>
</child>
<child>
- <widget class="GtkLabel" id="label54">
+ <widget class="GtkLabel" id="label_FEEDS">
<property name="visible">True</property>
<property name="label" translatable="yes">Feeds</property>
</widget>
@@ -222,7 +222,7 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox23">
+ <widget class="GtkVBox" id="vbox_HTML">
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
@@ -323,7 +323,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label93">
+ <widget class="GtkLabel" id="label_HTML">
<property name="label" translatable="yes">HTML</property>
</widget>
<packing>
@@ -445,7 +445,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label55">
+ <widget class="GtkLabel" id="label_SETUP">
<property name="visible">True</property>
<property name="label" translatable="yes">Setup</property>
</widget>
@@ -496,42 +496,34 @@
<placeholder/>
</child>
<child>
- <widget class="GtkEntry" id="entry8">
+ <widget class="GtkLabel" id="label84">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="label" translatable="yes">HTTP proxy:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label91">
+ <widget class="GtkEntry" id="host_proxy">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">No proxy for:</property>
+ <property name="can_focus">True</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="details">
+ <widget class="GtkLabel" id="label85">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Details</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
+ <property name="label" translatable="yes">Port:</property>
</widget>
<packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -550,35 +542,43 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label85">
+ <widget class="GtkButton" id="details">
<property name="visible">True</property>
- <property name="label" translatable="yes">Port:</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Details</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="host_proxy">
+ <widget class="GtkLabel" id="label91">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">No proxy for:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label84">
+ <widget class="GtkEntry" id="entry8">
<property name="visible">True</property>
- <property name="label" translatable="yes">HTTP proxy:</property>
+ <property name="can_focus">True</property>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
@@ -598,7 +598,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label81">
+ <widget class="GtkLabel" id="label_NETWORK">
<property name="visible">True</property>
<property name="label" translatable="yes">Network</property>
</widget>
@@ -643,16 +643,26 @@
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkEntry" id="proxy_pass">
+ <widget class="GtkLabel" id="label89">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Username:</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label90">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Password: </property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -668,26 +678,16 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label90">
+ <widget class="GtkEntry" id="proxy_pass">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Password: </property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label89">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Username:</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c (original)
+++ trunk/src/rss.c Fri May 9 05:35:38 2008
@@ -1516,7 +1516,8 @@
// apparently resizing gtkmozembed widget won't redraw if using xulrunner
// there is no point in reload for the rest
#if defined(HAVE_XULRUNNER) || defined(HAVE_LIBXUL)
- gtk_moz_embed_reload(rf->mozembed, GTK_MOZ_EMBED_FLAG_RELOADNORMAL);
+if (2 == gconf_client_get_int(rss_gconf, GCONF_KEY_HTML_RENDER, NULL))
+ gtk_moz_embed_reload(rf->mozembed, GTK_MOZ_EMBED_FLAG_RELOADNORMAL);
#endif
}
}
@@ -1576,7 +1577,9 @@
// }
// webkit_gtk_init();
rf->mozembed = (GtkWidget *)webkit_web_view_new();
- gtk_container_add(GTK_CONTAINER(moz), GTK_WIDGET(rf->mozembed));
+ //gtk_container_add(GTK_CONTAINER(moz), GTK_WIDGET(rf->mozembed));
+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(moz), GTK_WIDGET(rf->mozembed));
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(moz), GTK_SHADOW_ETCHED_OUT);
}
#endif
@@ -1598,8 +1601,7 @@
/* FIXME add all those profile shits */
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(moz), GTK_WIDGET(rf->mozembed));
-// gtk_container_add(GTK_CONTAINER(moz), GTK_WIDGET(rf->mozembed));
-// gtk_box_pack_start(moz, rf->mozembed, FALSE, FALSE, 0);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(moz), GTK_SHADOW_ETCHED_OUT);
}
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
