Fix indentation
This commit is contained in:
parent
4d716abc23
commit
55d6d23392
8 changed files with 251 additions and 246 deletions
|
|
@ -86,11 +86,15 @@ calculate_pupil_xy (EyesPlugin *eyes_applet,
|
|||
halign = gtk_widget_get_halign (GTK_WIDGET (widget));
|
||||
valign = gtk_widget_get_valign (GTK_WIDGET (widget));
|
||||
|
||||
if (halign == GTK_ALIGN_CENTER) xalign = 0.5;
|
||||
else if (halign == GTK_ALIGN_END) xalign = 1;
|
||||
if (halign == GTK_ALIGN_CENTER)
|
||||
xalign = 0.5;
|
||||
else if (halign == GTK_ALIGN_END)
|
||||
xalign = 1;
|
||||
|
||||
if (valign == GTK_ALIGN_CENTER) yalign = 0.5;
|
||||
else if (valign == GTK_ALIGN_END) yalign = 1;
|
||||
if (valign == GTK_ALIGN_CENTER)
|
||||
yalign = 0.5;
|
||||
else if (valign == GTK_ALIGN_END)
|
||||
yalign = 1;
|
||||
|
||||
/* calculate x,y pointer offsets wrt to eye center */
|
||||
nx = x - MAX (width - eyes_applet->eye_width, 0) * xalign
|
||||
|
|
@ -149,11 +153,9 @@ draw_eye (EyesPlugin *eyes,
|
|||
rect.width,
|
||||
rect.height,
|
||||
pupil_x - eyes->pupil_width / 2,
|
||||
pupil_y - eyes->pupil_height / 2, 1.0, 1.0,
|
||||
GDK_INTERP_BILINEAR,
|
||||
255);
|
||||
gtk_image_set_from_pixbuf (GTK_IMAGE (eyes->eyes[eye_num]),
|
||||
pixbuf);
|
||||
pupil_y - eyes->pupil_height / 2,
|
||||
1.0, 1.0, GDK_INTERP_BILINEAR, 255);
|
||||
gtk_image_set_from_pixbuf (GTK_IMAGE (eyes->eyes[eye_num]), pixbuf);
|
||||
g_object_unref (G_OBJECT (pixbuf));
|
||||
}
|
||||
|
||||
|
|
@ -331,7 +333,8 @@ combobox_changed (GtkComboBox *combobox,
|
|||
setup_eyes (eyes);
|
||||
eyes_applet_fill (eyes);
|
||||
|
||||
eyes_set_size(eyes->plugin, xfce_panel_plugin_get_size(eyes->plugin),
|
||||
eyes_set_size (eyes->plugin,
|
||||
xfce_panel_plugin_get_size (eyes->plugin),
|
||||
eyes);
|
||||
}
|
||||
|
||||
|
|
@ -342,7 +345,8 @@ check_single_row_toggled (GtkWidget *check,
|
|||
EyesPlugin *eyes)
|
||||
{
|
||||
eyes->single_row = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check));
|
||||
eyes_set_size(eyes->plugin, xfce_panel_plugin_get_size(eyes->plugin),
|
||||
eyes_set_size (eyes->plugin,
|
||||
xfce_panel_plugin_get_size (eyes->plugin),
|
||||
eyes);
|
||||
}
|
||||
|
||||
|
|
@ -369,7 +373,8 @@ eyes_properties_dialog (XfcePanelPlugin *plugin,
|
|||
gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER);
|
||||
gtk_window_set_icon_name (GTK_WINDOW (dlg), "xfce4-settings");
|
||||
|
||||
g_signal_connect (dlg, "response", G_CALLBACK (eyes_properties_dialog_response),
|
||||
g_signal_connect (dlg, "response",
|
||||
G_CALLBACK (eyes_properties_dialog_response),
|
||||
eyes);
|
||||
|
||||
area = gtk_dialog_get_content_area (GTK_DIALOG (dlg));
|
||||
|
|
@ -412,8 +417,7 @@ eyes_properties_dialog (XfcePanelPlugin *plugin,
|
|||
g_signal_connect (G_OBJECT (combobox), "changed",
|
||||
G_CALLBACK (combobox_changed), eyes);
|
||||
|
||||
check = gtk_check_button_new_with_mnemonic
|
||||
(_("Use single _row in multi-row panel"));
|
||||
check = gtk_check_button_new_with_mnemonic (_("Use single _row in multi-row panel"));
|
||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), eyes->single_row);
|
||||
gtk_box_pack_start (GTK_BOX (area), check, FALSE, FALSE, 0);
|
||||
g_signal_connect (check, "toggled", G_CALLBACK (check_single_row_toggled), eyes);
|
||||
|
|
|
|||
|
|
@ -35,11 +35,13 @@ gchar *theme_directories[] = {
|
|||
#define NUM_THEME_DIRECTORIES 1
|
||||
|
||||
static void
|
||||
parse_theme_file (EyesPlugin *eyes, FILE *theme_file)
|
||||
parse_theme_file (EyesPlugin *eyes,
|
||||
FILE *theme_file)
|
||||
{
|
||||
gchar line_buf [512]; /* prolly overkill */
|
||||
gchar *token;
|
||||
fgets (line_buf, 512, theme_file);
|
||||
|
||||
while (!feof (theme_file)) {
|
||||
token = strtok (line_buf, "=");
|
||||
if (strncmp (token, "wall-thickness",
|
||||
|
|
@ -77,11 +79,11 @@ parse_theme_file (EyesPlugin *eyes, FILE *theme_file)
|
|||
token = strtok (NULL, "\"");
|
||||
if (eyes->pupil_filename != NULL)
|
||||
g_free (eyes->pupil_filename);
|
||||
eyes->pupil_filename
|
||||
= g_strdup_printf ("%s%s",
|
||||
eyes->pupil_filename = g_strdup_printf ("%s%s",
|
||||
eyes->theme_dir,
|
||||
token);
|
||||
}
|
||||
|
||||
fgets (line_buf, 512, theme_file);
|
||||
}
|
||||
}
|
||||
|
|
@ -124,5 +126,4 @@ load_theme (EyesPlugin *eyes,
|
|||
eyes->pupil_width = gdk_pixbuf_get_width (eyes->pupil_image);
|
||||
|
||||
g_free (file_name);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
#include <gtk/gtk.h>
|
||||
|
||||
void
|
||||
load_theme (EyesPlugin *eyes, const gchar *theme_dir);
|
||||
load_theme (EyesPlugin *eyes,
|
||||
const gchar *theme_dir);
|
||||
|
||||
#endif /* __THEMES_H__ */
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ Tango_DATA = \
|
|||
tango-pupil.png \
|
||||
config
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(Tango_DATA)
|
||||
EXTRA_DIST = $(Tango_DATA)
|
||||
|
||||
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
|
||||
|
|
|
|||
Reference in a new issue