applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mouse: New testing area according to mockup

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=579135
This commit is contained in:
Ondrej Holy 2012-08-23 15:10:19 +02:00 • committed by Bastien Nocera
parent 419a0481a3
commit 1cf9c9b078
7 changed files with 2179 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

12
panels/mouse/Makefile.am
View file

@ -7,7 +7,6 @@ INCLUDES = \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DGNOMECC_UI_DIR="\"$(uidir)\"" \
-DPIXMAP_DIR=\""$(datadir)/gnome-control-center/pixmaps"\" \
$(NULL)
@ -40,16 +39,11 @@ test_gnome_mouse_test_LDADD = $(PANEL_LIBS) $(MOUSE_PANEL_LIBS)
@INTLTOOL_DESKTOP_RULE@
pixmapdir = $(pkgdatadir)/pixmaps
pixmap_DATA = \
double-click-on.png \
double-click-off.png \
double-click-maybe.png
uidir = $(pkgdatadir)/ui
ui_DATA = \
gnome-mouse-properties.ui \
gnome-mouse-test.ui
gnome-mouse-test.ui \
scroll-test.svg
desktopdir = $(datadir)/applications
Desktop_in_files = gnome-mouse-panel.desktop.in
@ -62,6 +56,6 @@ update-from-gsd:
git commit -m "mouse: Update from gnome-settings-daemon" $(INPUTFILES)
CLEANFILES = $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(ui_DATA) $(pixmap_DATA)
EXTRA_DIST = $(ui_DATA)
-include $(top_srcdir)/git.mk

BIN
panels/mouse/double-click-maybe.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.5 KiB

BIN
panels/mouse/double-click-off.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.6 KiB

BIN
panels/mouse/double-click-on.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6.2 KiB

191
panels/mouse/gnome-mouse-test.c
View file

@ -36,6 +36,16 @@
#define WID(x) (GtkWidget*) gtk_builder_get_object (dialog, x)
/* Click test button sizes. */
#define SHADOW_SIZE (10.0 / 180 * size)
#define SHADOW_SHIFT_Y (-1.0 / 180 * size)
#define SHADOW_OPACITY (0.15 / 180 * size)
#define OUTER_CIRCLE_SIZE (22.0 / 180 * size)
#define ANNULUS_SIZE (6.0 / 180 * size)
#define INNER_CIRCLE_SIZE (52.0 / 180 * size)
static void setup_information_label (GtkWidget *widget);
enum
{
DOUBLE_CLICK_TEST_OFF,
@ -47,14 +57,19 @@ enum
* convenience
*/
static gint double_click_state = DOUBLE_CLICK_TEST_OFF;
static gint button_state = 0;
static GSettings *mouse_settings = NULL;
static gint information_label_timeout_id = 0;
static gint button_drawing_area_timeout_id = 0;
/* Double Click handling */
struct test_data_t
{
gint *timeout_id;
GtkWidget *image;
GtkWidget *widget;
};
/* Timeout for the double click test */
@ -64,52 +79,103 @@ test_maybe_timeout (struct test_data_t *data)
{
double_click_state = DOUBLE_CLICK_TEST_OFF;
gtk_image_set_from_icon_name (GTK_IMAGE (data->image), "face-plain", GTK_ICON_SIZE_DIALOG);
gtk_widget_queue_draw (data->widget);
*data->timeout_id = 0;
return FALSE;
}
/* Timeout for the information label */
static gboolean
information_label_timeout (struct test_data_t *data)
{
setup_information_label (data->widget);
*data->timeout_id = 0;
return FALSE;
}
/* Set information label according global state variables. */
static void
setup_information_label (GtkWidget *widget)
{
static struct test_data_t data;
gchar *message = NULL;
gchar *label_text = NULL;
gboolean double_click;
if (information_label_timeout_id != 0)
g_source_remove (information_label_timeout_id);
if (double_click_state == DOUBLE_CLICK_TEST_OFF) {
gtk_label_set_label (GTK_LABEL (widget), _("Try clicking, double clicking, scrolling"));
return;
}
double_click = (double_click_state == DOUBLE_CLICK_TEST_ON);
switch (button_state) {
case 1:
message = (double_click) ? _("Double click, primary button") : _("Single click, primary button");
break;
case 2:
message = (double_click) ? _("Double click, middle button") : _("Single click, middle button");
break;
case 3:
message = (double_click) ? _("Double click, secondary button") : _("Single click, secondary button");
break;
}
label_text = g_strconcat ("<b>", message, "</b>", NULL);
gtk_label_set_markup (GTK_LABEL (widget), label_text);
g_free (label_text);
data.widget = widget;
data.timeout_id = &information_label_timeout_id;
information_label_timeout_id = g_timeout_add (2500,
(GSourceFunc) information_label_timeout,
&data);
}
/* Callback issued when the user clicks the double click testing area. */
static gboolean
event_box_button_press_event (GtkWidget *widget,
GdkEventButton *event,
GtkBuilder *dialog)
button_drawing_area_button_press_event (GtkWidget *widget,
GdkEventButton *event,
GtkBuilder *dialog)
{
gint double_click_time;
static struct test_data_t data;
static gint test_on_timeout_id = 0;
static gint test_maybe_timeout_id = 0;
static guint32 double_click_timestamp = 0;
GtkWidget *image;
if (event->type != GDK_BUTTON_PRESS)
if (event->type != GDK_BUTTON_PRESS || event->button > 3)
return FALSE;
image = g_object_get_data (G_OBJECT (widget), "image");
double_click_time = g_settings_get_int (mouse_settings, "double-click");
if (test_maybe_timeout_id != 0)
g_source_remove (test_maybe_timeout_id);
if (test_on_timeout_id != 0)
g_source_remove (test_on_timeout_id);
if (button_drawing_area_timeout_id != 0)
g_source_remove (button_drawing_area_timeout_id);
/* Ignore fake double click using different buttons. */
if (double_click_state != DOUBLE_CLICK_TEST_OFF && button_state != event->button)
double_click_state = DOUBLE_CLICK_TEST_OFF;
switch (double_click_state) {
case DOUBLE_CLICK_TEST_OFF:
double_click_state = DOUBLE_CLICK_TEST_MAYBE;
data.image = image;
data.timeout_id = &test_maybe_timeout_id;
test_maybe_timeout_id = g_timeout_add (double_click_time, (GSourceFunc) test_maybe_timeout, &data);
data.widget = widget;
data.timeout_id = &button_drawing_area_timeout_id;
button_drawing_area_timeout_id = g_timeout_add (double_click_time, (GSourceFunc) test_maybe_timeout, &data);
break;
case DOUBLE_CLICK_TEST_MAYBE:
if (event->time - double_click_timestamp < double_click_time) {
double_click_state = DOUBLE_CLICK_TEST_ON;
data.image = image;
data.timeout_id = &test_on_timeout_id;
test_on_timeout_id = g_timeout_add (2500, (GSourceFunc) test_maybe_timeout, &data);
data.widget = widget;
data.timeout_id = &button_drawing_area_timeout_id;
button_drawing_area_timeout_id = g_timeout_add (2500, (GSourceFunc) test_maybe_timeout, &data);
}
break;
case DOUBLE_CLICK_TEST_ON:
@ -119,35 +185,90 @@ event_box_button_press_event (GtkWidget *widget,
double_click_timestamp = event->time;
gtk_widget_queue_draw (widget);
button_state = event->button;
setup_information_label (WID ("information_label"));
return TRUE;
}
static gboolean
button_drawing_area_draw_event (GtkWidget *widget,
cairo_t *cr,
GtkBuilder *dialog)
{
gdouble center_x, center_y, size;
GdkRGBA inner_color, outer_color;
cairo_pattern_t *pattern;
size = MIN (gtk_widget_get_allocated_width (widget), gtk_widget_get_allocated_height (widget));
center_x = gtk_widget_get_allocated_width (widget) / 2.0;
center_y = gtk_widget_get_allocated_height (widget) / 2.0;
switch (double_click_state) {
case DOUBLE_CLICK_TEST_ON:
gtk_image_set_from_icon_name (GTK_IMAGE (image), "face-laugh", GTK_ICON_SIZE_INVALID);
gdk_rgba_parse (&outer_color, "#729fcf");
gdk_rgba_parse (&inner_color, "#729fcf");
break;
case DOUBLE_CLICK_TEST_MAYBE:
gtk_image_set_from_icon_name (GTK_IMAGE (image), "face-smile", GTK_ICON_SIZE_INVALID);
gdk_rgba_parse (&outer_color, "#729fcf");
gdk_rgba_parse (&inner_color, "#ffffff");
break;
case DOUBLE_CLICK_TEST_OFF:
gtk_image_set_from_icon_name (GTK_IMAGE (image), "face-plain", GTK_ICON_SIZE_INVALID);
gdk_rgba_parse (&outer_color, "#ffffff");
gdk_rgba_parse (&inner_color, "#ffffff");
break;
}
return TRUE;
/* Draw shadow. */
cairo_rectangle (cr, center_x - size / 2, center_y - size / 2, size, size);
pattern = cairo_pattern_create_radial (center_x, center_y, 0, center_x, center_y, size);
cairo_pattern_add_color_stop_rgba (pattern, 0.5 - SHADOW_SIZE / size, 0, 0, 0, SHADOW_OPACITY);
cairo_pattern_add_color_stop_rgba (pattern, 0.5, 0, 0, 0, 0);
cairo_set_source (cr, pattern);
cairo_fill (cr);
/* Draw outer circle. */
cairo_set_line_width (cr, OUTER_CIRCLE_SIZE);
cairo_arc (cr, center_x, center_y + SHADOW_SHIFT_Y,
INNER_CIRCLE_SIZE + ANNULUS_SIZE + OUTER_CIRCLE_SIZE / 2,
0, 2 * G_PI);
gdk_cairo_set_source_rgba (cr, &outer_color);
cairo_stroke (cr);
/* Draw inner circle. */
cairo_set_line_width (cr, 0);
cairo_arc (cr, center_x, center_y + SHADOW_SHIFT_Y,
INNER_CIRCLE_SIZE,
0, 2 * G_PI);
gdk_cairo_set_source_rgba (cr, &inner_color);
cairo_fill (cr);
return FALSE;
}
/* Set up the property editors in the dialog. */
static void
setup_dialog (GtkBuilder *dialog)
{
GtkImage *image;
GtkAdjustment *adjustment;
GdkRGBA color;
image = GTK_IMAGE (WID ("double_click_image"));
g_signal_connect (WID ("button_drawing_area"), "button_press_event",
G_CALLBACK (button_drawing_area_button_press_event),
dialog);
g_signal_connect (WID ("button_drawing_area"), "draw",
G_CALLBACK (button_drawing_area_draw_event),
dialog);
gtk_image_set_from_icon_name (image, "face-plain", GTK_ICON_SIZE_INVALID);
gtk_image_set_pixel_size (image, 256);
adjustment = GTK_ADJUSTMENT (WID ("scrolled_window_adjustment"));
gtk_adjustment_set_value (adjustment,
gtk_adjustment_get_upper (adjustment));
g_object_set_data (G_OBJECT (WID ("double_click_eventbox")), "image", GTK_WIDGET (image));
g_signal_connect (WID ("double_click_eventbox"), "button_press_event",
G_CALLBACK (event_box_button_press_event), dialog);
gdk_rgba_parse (&color, "#565854");
gtk_widget_override_background_color (WID ("viewport"), GTK_STATE_FLAG_NORMAL, &color);
gtk_widget_override_background_color (WID ("button_drawing_area"), GTK_STATE_FLAG_NORMAL, &color);
}
GtkWidget *
@ -167,5 +288,11 @@ gnome_mouse_test_dispose (GtkWidget *widget)
g_object_unref (mouse_settings);
mouse_settings = NULL;
}
if (information_label_timeout_id != 0)
g_source_remove (information_label_timeout_id);
if (button_drawing_area_timeout_id != 0)
g_source_remove (button_drawing_area_timeout_id);
}

78
panels/mouse/gnome-mouse-test.ui
View file

@ -1,25 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="scrolled_window_adjustment">
<property name="upper">100</property>
<property name="value">100</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkWindow" id="mouse_test_window">
<property name="can_focus">False</property>
<child>
<object class="GtkGrid" id="test_widget">
<property name="height_request">400</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">15</property>
<property name="column_spacing">10</property>
<child>
<object class="GtkLabel" id="label33">
<object class="GtkLabel" id="information_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="halign">center</property>
<property name="margin_top">5</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">To test your settings, try to double-click on the face.</property>
<property name="ypad">5</property>
<property name="label" translatable="yes">Try clicking, double clicking, scrolling</property>
<property name="wrap">True</property>
</object>
<packing>
@ -30,21 +35,58 @@
</packing>
</child>
<child>
<object class="GtkEventBox" id="double_click_eventbox">
<object class="GtkScrolledWindow" id="scrolledwindow">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="visible_window">False</property>
<property name="vadjustment">scrolled_window_adjustment</property>
<property name="hscrollbar_policy">never</property>
<property name="vscrollbar_policy">always</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkImage" id="double_click_image">
<object class="GtkViewport" id="viewport">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="stock">gtk-missing-image</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImage" id="image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">35</property>
<property name="margin_right">35</property>
<property name="pixbuf">scroll-test.svg</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkDrawingArea" id="button_drawing_area">
<property name="width_request">180</property>
<property name="height_request">180</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
<property name="margin_top">20</property>
<property name="margin_bottom">20</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
</object>
@ -58,10 +100,4 @@
</object>
</child>
</object>
<object class="GtkAdjustment" id="scrolled_window_adjustment">
<property name="upper">100</property>
<property name="value">100</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
</interface>

1960
panels/mouse/scroll-test.svg Normal file
View file

File diff suppressed because it is too large Load diff
Side by side

After

Width:  |  Height:  |  Size: 123 KiB