debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename Speed dial in news tabs to Customized homepage in new tabs

Browse source
This commit is contained in:
Christian Dywan 2009-05-08 17:41:40 +02:00
parent 581c69f4e8
commit 5e1b3a0bad
3 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
midori/midori-preferences.c
View file

@ -421,8 +421,8 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
FILLED_ADD (hbox, 1, 2, 1, 2);
button = katze_property_proxy (settings, "show-crash-dialog", NULL);
INDENTED_ADD (button, 0, 1, 2, 3);
button = katze_property_proxy (settings, "speed-dial-in-new-tabs", NULL);
INDENTED_ADD (button, 1, 2, 2, 3);
button = katze_property_proxy (settings, "customized-homepage-in-new-tabs", NULL);
FILLED_ADD (button, 1, 2, 2, 3);
FRAME_NEW (_("Transfers"));
TABLE_NEW (2, 2);
label = katze_property_label (settings, "download-folder");

10
midori/midori-view.c
View file

@ -60,7 +60,7 @@ struct _MidoriView
GtkWidget* web_view;
KatzeArray* news_feeds;
gboolean speed_dial_in_new_tabs;
gboolean customized_homepage_in_new_tabs;
gchar* download_manager;
gchar* news_aggregator;
gboolean middle_click_opens_selection;
@ -1617,7 +1617,7 @@ _midori_view_update_settings (MidoriView* view)
gboolean zoom_text_and_images;
g_object_get (view->settings,
"speed-dial-in-new-tabs", &view->speed_dial_in_new_tabs,
"customized-homepage-in-new-tabs", &view->customized_homepage_in_new_tabs,
"download-manager", &view->download_manager,
"news-aggregator", &view->news_aggregator,
"zoom-text-and-images", &zoom_text_and_images,
@ -1645,9 +1645,9 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings,
g_value_init (&value, pspec->value_type);
g_object_get_property (G_OBJECT (view->settings), name, &value);
if (name == g_intern_string ("speed-dial-in-new-tabs"))
if (name == g_intern_string ("customized-homepage-in-new-tabs"))
{
view->speed_dial_in_new_tabs = g_value_get_boolean (&value);
view->customized_homepage_in_new_tabs = g_value_get_boolean (&value);
}
else if (name == g_intern_string ("download-manager"))
{
@ -1913,7 +1913,7 @@ midori_view_set_uri (MidoriView* view,
if (!view->web_view)
midori_view_construct_web_view (view);
if (view->speed_dial_in_new_tabs && !g_strcmp0 (uri, ""))
if (view->customized_homepage_in_new_tabs && !g_strcmp0 (uri, ""))
{
SoupServer* res_server;
guint port;

25
midori/midori-websettings.c
View file

@ -49,7 +49,7 @@ struct _MidoriWebSettings
MidoriStartup load_on_startup;
gchar* homepage;
gboolean show_crash_dialog;
gboolean speed_dial_in_new_tabs;
gboolean customized_homepage_in_new_tabs;
gchar* download_folder;
gboolean ask_for_destination_folder;
gboolean notify_transfer_completed;
@ -122,7 +122,7 @@ enum
PROP_LOAD_ON_STARTUP,
PROP_HOMEPAGE,
PROP_SHOW_CRASH_DIALOG,
PROP_SPEED_DIAL_IN_NEW_TABS,
PROP_CUSTOMIZED_HOMEPAGE_IN_NEW_TABS,
PROP_DOWNLOAD_FOLDER,
PROP_ASK_FOR_DESTINATION_FOLDER,
PROP_NOTIFY_TRANSFER_COMPLETED,
@ -574,19 +574,18 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
flags));
/**
* MidoriWebSettings:speed-dial-in-new-tabs:
* MidoriWebSettings:customized-homepage-in-new-tabs:
*
* Show a speed dial page in newly opened tabs.
* Show a customized homepage in newly opened tabs.
*
* Since: 0.1.7
*/
g_object_class_install_property (gobject_class,
PROP_SPEED_DIAL_IN_NEW_TABS,
PROP_CUSTOMIZED_HOMEPAGE_IN_NEW_TABS,
g_param_spec_boolean (
"speed-dial-in-new-tabs",
/* i18n: Speed dial, webpage shortcuts, named for the phone function */
_("Show speed dial in new tabs"),
_("Show a speed dial page in newly opened tabs"),
"customized-homepage-in-new-tabs",
_("Show customized homepage in new tabs"),
_("Show a customized homepage in newly opened tabs"),
TRUE,
flags));
@ -1138,8 +1137,8 @@ midori_web_settings_set_property (GObject* object,
case PROP_SHOW_CRASH_DIALOG:
web_settings->show_crash_dialog = g_value_get_boolean (value);
break;
case PROP_SPEED_DIAL_IN_NEW_TABS:
web_settings->speed_dial_in_new_tabs = g_value_get_boolean (value);
case PROP_CUSTOMIZED_HOMEPAGE_IN_NEW_TABS:
web_settings->customized_homepage_in_new_tabs = g_value_get_boolean (value);
break;
case PROP_DOWNLOAD_FOLDER:
katze_assign (web_settings->download_folder, g_value_dup_string (value));
@ -1346,8 +1345,8 @@ midori_web_settings_get_property (GObject* object,
case PROP_SHOW_CRASH_DIALOG:
g_value_set_boolean (value, web_settings->show_crash_dialog);
break;
case PROP_SPEED_DIAL_IN_NEW_TABS:
g_value_set_boolean (value, web_settings->speed_dial_in_new_tabs);
case PROP_CUSTOMIZED_HOMEPAGE_IN_NEW_TABS:
g_value_set_boolean (value, web_settings->customized_homepage_in_new_tabs);
break;
case PROP_DOWNLOAD_FOLDER:
g_value_set_string (value, web_settings->download_folder);