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

No need to check for rows and columns in speed dial now

Browse source
This commit is contained in:
Paweł Forysiuk 2011-10-12 14:39:18 +02:00 committed by Christian Dywan
parent 3fa294d100
commit 7b4f2254ff
2 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
midori/midori-browser.c
View file

@ -1091,12 +1091,19 @@ midori_browser_speed_dial_get_next_free_slot (MidoriView* view)
{ {
MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view)); MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view));
GKeyFile* key_file; GKeyFile* key_file;
guint cols, rows, slot = 1; guint slot_count = 0, slot = 1, i;
gchar** groups;
g_object_get (browser, "speed-dial", &key_file, NULL); g_object_get (browser, "speed-dial", &key_file, NULL);
rows = g_key_file_get_integer (key_file, "settings", "rows", NULL);
cols = g_key_file_get_integer (key_file, "settings", "columns", NULL); groups = g_key_file_get_groups (key_file, NULL);
while (slot <= cols * rows) for (i = 0; groups[i]; i++)
{
if (g_key_file_has_key (key_file, groups[i], "uri", NULL))
slot_count++;
}
while (slot <= slot_count)
{ {
gchar* dial_id = g_strdup_printf ("Dial %d", slot); gchar* dial_id = g_strdup_printf ("Dial %d", slot);
if (!g_key_file_has_group (key_file, dial_id)) if (!g_key_file_has_group (key_file, dial_id))
@ -1107,7 +1114,7 @@ midori_browser_speed_dial_get_next_free_slot (MidoriView* view)
g_free (dial_id); g_free (dial_id);
slot++; slot++;
} }
return NULL; return g_strdup_printf ("s%d", slot_count + 1);
} }
static void static void

19
midori/midori-view.c
View file

@ -3686,7 +3686,7 @@ prepare_speed_dial_html (MidoriView* view)
MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view)); MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view));
GKeyFile* key_file; GKeyFile* key_file;
GString* markup = NULL; GString* markup = NULL;
guint rows, cols, slot = 1; guint slot = 1;
guint slot_count = 1, i, grid_index = 3, slot_size; guint slot_count = 1, i, grid_index = 3, slot_size;
gchar* speed_dial_head; gchar* speed_dial_head;
gchar* file_path; gchar* file_path;
@ -3708,11 +3708,7 @@ prepare_speed_dial_html (MidoriView* view)
"{title}", _("Speed Dial"), "{title}", _("Speed Dial"),
"{click_to_add}", _("Click to add a shortcut"), "{click_to_add}", _("Click to add a shortcut"),
"{enter_shortcut_address}", _("Enter shortcut address"), "{enter_shortcut_address}", _("Enter shortcut address"),
"{enter_shortcut_name}", _("Enter shortcut title"),
"{are_you_sure}", _("Are you sure you want to delete this shortcut?"), "{are_you_sure}", _("Are you sure you want to delete this shortcut?"),
"{set_dial_size}", _("Set number of columns and rows"),
"{enter_dial_size}", _("Enter number of columns and rows:"),
"{invalid_dial_size}", _("Invalid input for the size of the speed dial"),
NULL); NULL);
markup = g_string_new (header); markup = g_string_new (header);
@ -3727,9 +3723,6 @@ prepare_speed_dial_html (MidoriView* view)
return g_strdup (""); return g_strdup ("");
} }
rows = g_key_file_get_integer (key_file, "settings", "rows", NULL);
cols = g_key_file_get_integer (key_file, "settings", "columns", NULL);
groups = g_key_file_get_groups (key_file, NULL); groups = g_key_file_get_groups (key_file, NULL);
for (i = 0; groups[i]; i++) for (i = 0; groups[i]; i++)
{ {
@ -3737,9 +3730,6 @@ prepare_speed_dial_html (MidoriView* view)
slot_count++; slot_count++;
} }
g_string_append_printf (markup,
"<script>var columns=%d; var rows=%d;</script>", cols, rows);
/* try to guess the best X by X grid size */ /* try to guess the best X by X grid size */
while ((grid_index * grid_index) < slot_count) while ((grid_index * grid_index) < slot_count)
grid_index++; grid_index++;
@ -5495,12 +5485,7 @@ midori_view_speed_dial_save (MidoriView* view,
g_object_get (browser, "speed-dial", &key_file, NULL); g_object_get (browser, "speed-dial", &key_file, NULL);
action = parts[0]; action = parts[0];
if (g_str_equal (action, "size")) if (g_str_equal (action, "thumbsize"))
{
g_key_file_set_string (key_file, "settings", "rows", parts[2]);
g_key_file_set_string (key_file, "settings", "columns", parts[1]);
}
else if (g_str_equal (action, "thumbsize"))
{ {
gchar* saved_size; gchar* saved_size;
gchar* thumb_size_type; gchar* thumb_size_type;