Based on a patch by: Dennis Cranston <dennis_cranston@yahoo.com>
2007-08-04 Jens Granseuer <jensgr@gmx.net> Based on a patch by: Dennis Cranston <dennis_cranston@yahoo.com> * appearance-style.c: (update_cursor_size_scale) Toggle sensitivity of the cursor scale labels (bug #463442) svn path=/trunk/; revision=7961
This commit is contained in:
parent
5cfe0df8a6
commit
6c27578959
2 changed files with 27 additions and 12 deletions
|
@ -1,10 +1,16 @@
|
||||||
|
2007-08-04 Jens Granseuer <jensgr@gmx.net>
|
||||||
|
|
||||||
|
Based on a patch by: Dennis Cranston <dennis_cranston@yahoo.com>
|
||||||
|
|
||||||
|
* appearance-style.c: (update_cursor_size_scale) Toggle
|
||||||
|
sensitivity of the cursor scale labels (bug #463442)
|
||||||
|
|
||||||
2007-08-04 Denis Washington <denisw@svn.gnome.org>
|
2007-08-04 Denis Washington <denisw@svn.gnome.org>
|
||||||
|
|
||||||
* appearance-style.c: (prepare_list):
|
* appearance-style.c: (prepare_list):
|
||||||
Only add a "Default Pointer" list item if there is
|
Only add a "Default Pointer" list item if there is
|
||||||
no such GnomeThemeCursorInfo.
|
no such GnomeThemeCursorInfo.
|
||||||
|
|
||||||
|
|
||||||
2007-08-03 Jens Granseuer <jensgr@gmx.net>
|
2007-08-03 Jens Granseuer <jensgr@gmx.net>
|
||||||
|
|
||||||
* appearance-themes.c: (theme_thumbnail_update): oops, remove
|
* appearance-themes.c: (theme_thumbnail_update): oops, remove
|
||||||
|
|
|
@ -370,22 +370,31 @@ update_cursor_size_scale (GnomeThemeCursorInfo *theme,
|
||||||
AppearanceData *data)
|
AppearanceData *data)
|
||||||
{
|
{
|
||||||
GtkWidget *cursor_size_scale;
|
GtkWidget *cursor_size_scale;
|
||||||
|
GtkWidget *cursor_size_label;
|
||||||
|
GtkWidget *cursor_size_small_label;
|
||||||
|
GtkWidget *cursor_size_large_label;
|
||||||
|
gboolean sensitive;
|
||||||
|
|
||||||
cursor_size_scale = glade_xml_get_widget (data->xml, "cursor_size_scale");
|
cursor_size_scale = glade_xml_get_widget (data->xml, "cursor_size_scale");
|
||||||
|
cursor_size_label = glade_xml_get_widget (data->xml, "cursor_size_label");
|
||||||
|
cursor_size_small_label = glade_xml_get_widget (data->xml, "cursor_size_small_label");
|
||||||
|
cursor_size_large_label = glade_xml_get_widget (data->xml, "cursor_size_large_label");
|
||||||
|
|
||||||
if (!theme || theme->sizes->len == 1)
|
sensitive = theme && theme->sizes->len > 1;
|
||||||
{
|
gtk_widget_set_sensitive (cursor_size_scale, sensitive);
|
||||||
gtk_widget_set_sensitive (cursor_size_scale, FALSE);
|
gtk_widget_set_sensitive (cursor_size_label, sensitive);
|
||||||
}
|
gtk_widget_set_sensitive (cursor_size_small_label, sensitive);
|
||||||
else
|
gtk_widget_set_sensitive (cursor_size_large_label, sensitive);
|
||||||
|
|
||||||
|
if (sensitive)
|
||||||
{
|
{
|
||||||
GtkAdjustment *adjustment;
|
GtkAdjustment *adjustment;
|
||||||
gint gconf_size, i;
|
gint gconf_size, i;
|
||||||
gboolean size_found = FALSE;
|
gboolean size_found = FALSE;
|
||||||
|
GtkRange *range = GTK_RANGE (cursor_size_scale);
|
||||||
|
|
||||||
adjustment = gtk_range_get_adjustment (GTK_RANGE (cursor_size_scale));
|
adjustment = gtk_range_get_adjustment (range);
|
||||||
g_object_set (G_OBJECT (adjustment), "upper", (gdouble) theme->sizes->len - 1, NULL);
|
g_object_set (G_OBJECT (adjustment), "upper", (gdouble) theme->sizes->len - 1, NULL);
|
||||||
gtk_widget_set_sensitive (cursor_size_scale, TRUE);
|
|
||||||
|
|
||||||
gconf_size = gconf_client_get_int (data->client, CURSOR_SIZE_KEY, NULL);
|
gconf_size = gconf_client_get_int (data->client, CURSOR_SIZE_KEY, NULL);
|
||||||
|
|
||||||
|
@ -397,7 +406,7 @@ update_cursor_size_scale (GnomeThemeCursorInfo *theme,
|
||||||
|
|
||||||
if (size == gconf_size)
|
if (size == gconf_size)
|
||||||
{
|
{
|
||||||
gtk_range_set_value (GTK_RANGE (cursor_size_scale), (gdouble) i);
|
gtk_range_set_value (range, (gdouble) i);
|
||||||
size_found = TRUE;
|
size_found = TRUE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -405,7 +414,7 @@ update_cursor_size_scale (GnomeThemeCursorInfo *theme,
|
||||||
{
|
{
|
||||||
if (i == 0)
|
if (i == 0)
|
||||||
{
|
{
|
||||||
gtk_range_set_value (GTK_RANGE (cursor_size_scale), 0);
|
gtk_range_set_value (range, 0);
|
||||||
size_found = TRUE;
|
size_found = TRUE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -416,7 +425,7 @@ update_cursor_size_scale (GnomeThemeCursorInfo *theme,
|
||||||
diff = size - gconf_size;
|
diff = size - gconf_size;
|
||||||
diff_to_last = gconf_size - g_array_index (theme->sizes, gint, i - 1);
|
diff_to_last = gconf_size - g_array_index (theme->sizes, gint, i - 1);
|
||||||
|
|
||||||
gtk_range_set_value (GTK_RANGE (cursor_size_scale), (gdouble) (diff < diff_to_last) ? diff : diff_to_last);
|
gtk_range_set_value (range, (gdouble) (diff < diff_to_last) ? diff : diff_to_last);
|
||||||
size_found = TRUE;
|
size_found = TRUE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -426,7 +435,7 @@ update_cursor_size_scale (GnomeThemeCursorInfo *theme,
|
||||||
/* set to the biggest size if the gconf value is bigger than
|
/* set to the biggest size if the gconf value is bigger than
|
||||||
all available sizes */
|
all available sizes */
|
||||||
if (!size_found)
|
if (!size_found)
|
||||||
gtk_range_set_value (GTK_RANGE (cursor_size_scale), (gdouble) g_array_index (theme->sizes, gint, theme->sizes->len - 1));
|
gtk_range_set_value (range, (gdouble) g_array_index (theme->sizes, gint, theme->sizes->len - 1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue