[cheese/threezero] remove effects and effects selector as we will reimplement them in libcheese
- From: Daniel G. Siegel <dgsiegel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [cheese/threezero] remove effects and effects selector as we will reimplement them in libcheese
- Date: Wed, 25 Nov 2009 12:31:40 +0000 (UTC)
commit a3edc91faa7f5d88c3d9b683e9001c1e353cdc80
Author: daniel g. siegel <siegel in tum de>
Date: Wed Nov 25 13:30:32 2009 +0100
remove effects and effects selector as we will reimplement them in libcheese
configure.ac | 1 -
data/Makefile.am | 2 +-
data/cheese-ui.xml | 2 -
data/cheese.schemas.in | 17 -
data/effects/Hulk.png | Bin 21118 -> 0 bytes
data/effects/Makefile.am | 19 --
data/effects/Mauve.png | Bin 20317 -> 0 bytes
data/effects/NoirBlanc.png | Bin 12765 -> 0 bytes
data/effects/Saturation.png | Bin 12482 -> 0 bytes
data/effects/dicetv.png | Bin 27289 -> 0 bytes
data/effects/edgetv.png | Bin 32141 -> 0 bytes
data/effects/identity.png | Bin 19816 -> 0 bytes
data/effects/shagadelictv.png | Bin 27488 -> 0 bytes
data/effects/vertigotv.png | Bin 26408 -> 0 bytes
data/effects/videoflip_h.png | Bin 19652 -> 0 bytes
data/effects/videoflip_v.png | Bin 19558 -> 0 bytes
data/effects/warptv.png | Bin 20932 -> 0 bytes
data/icons/16x16/actions/Makefile.am | 1 -
data/icons/16x16/actions/browse-webcam-effects.png | Bin 745 -> 0 bytes
data/icons/22x22/actions/Makefile.am | 1 -
data/icons/22x22/actions/browse-webcam-effects.png | Bin 866 -> 0 bytes
data/icons/24x24/actions/Makefile.am | 1 -
data/icons/24x24/actions/browse-webcam-effects.png | Bin 896 -> 0 bytes
data/icons/32x32/actions/Makefile.am | 1 -
data/icons/32x32/actions/browse-webcam-effects.png | Bin 1556 -> 0 bytes
data/icons/48x48/actions/Makefile.am | 1 -
data/icons/48x48/actions/browse-webcam-effects.png | Bin 2722 -> 0 bytes
data/icons/scalable/actions/Makefile.am | 1 -
libcheese/cheese-camera.c | 109 +------
libcheese/cheese-camera.h | 18 -
src/Makefile.am | 2 -
src/cheese-effect-chooser.c | 342 --------------------
src/cheese-effect-chooser.h | 59 ----
src/cheese-gconf.c | 95 ------
src/cheese-gconf.h | 1 -
src/cheese-window.c | 93 ------
36 files changed, 2 insertions(+), 764 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9a55db6..27fd31c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,7 +132,6 @@ AC_OUTPUT([
Makefile
data/Makefile
data/cheese.desktop.in
-data/effects/Makefile
data/icons/Makefile
data/icons/16x16/Makefile
data/icons/22x22/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 7002d84..f80fe0a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = icons effects pixmaps sounds
+SUBDIRS = icons pixmaps sounds
@INTLTOOL_DESKTOP_RULE@
desktopdir = $(datadir)/applications
diff --git a/data/cheese-ui.xml b/data/cheese-ui.xml
index fa87775..f998e3e 100644
--- a/data/cheese-ui.xml
+++ b/data/cheese-ui.xml
@@ -17,8 +17,6 @@
<menuitem action="Quit" />
</menu>
<menu action="Edit" name="Edit">
- <menuitem action="Effects" />
- <separator />
<menuitem action="MoveToTrash" />
<menuitem action="RemoveAll" />
<separator />
diff --git a/data/cheese.schemas.in b/data/cheese.schemas.in
index 4b26be3..39dc49f 100644
--- a/data/cheese.schemas.in
+++ b/data/cheese.schemas.in
@@ -25,23 +25,6 @@
</schema>
<schema>
- <key>/schemas/apps/cheese/selected_effects</key>
- <applyto>/apps/cheese/selected_effects</applyto>
- <owner>cheese</owner>
- <type>list</type>
- <list_type>string</list_type>
- <default>[]</default>
- <locale name="C">
- <short>Selected Effects</short>
- <long><!-- Translators: please note, that the effect names are
- standarized and should not be translated -->
- A list of effects applied on startup. Possible values are: "mauve",
- "noir_blanc", "saturation", "hulk", "vertical-flip", "horizontal-flip",
- "shagadelic", "vertigo", "edge", "dice" and "warp"</long>
- </locale>
- </schema>
-
- <schema>
<key>/schemas/apps/cheese/x_resolution</key>
<applyto>/apps/cheese/x_resolution</applyto>
<owner>cheese</owner>
diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am
index 0568d17..7b482f9 100644
--- a/data/icons/16x16/actions/Makefile.am
+++ b/data/icons/16x16/actions/Makefile.am
@@ -5,7 +5,6 @@ context = actions
iconsdir = $(themedir)/$(size)/$(context)
icons_DATA = \
- browse-webcam-effects.png \
cheese-take-burst.png \
cheese-take-photo.png
diff --git a/data/icons/22x22/actions/Makefile.am b/data/icons/22x22/actions/Makefile.am
index 4d4b69a..cac26f8 100644
--- a/data/icons/22x22/actions/Makefile.am
+++ b/data/icons/22x22/actions/Makefile.am
@@ -5,7 +5,6 @@ context = actions
iconsdir = $(themedir)/$(size)/$(context)
icons_DATA = \
- browse-webcam-effects.png \
cheese-take-burst.png \
cheese-take-photo.png
diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am
index 1539145..348d31f 100644
--- a/data/icons/24x24/actions/Makefile.am
+++ b/data/icons/24x24/actions/Makefile.am
@@ -5,7 +5,6 @@ context = actions
iconsdir = $(themedir)/$(size)/$(context)
icons_DATA = \
- browse-webcam-effects.png \
cheese-take-burst.png \
cheese-take-photo.png
diff --git a/data/icons/32x32/actions/Makefile.am b/data/icons/32x32/actions/Makefile.am
index 17bc75d..112dd8f 100644
--- a/data/icons/32x32/actions/Makefile.am
+++ b/data/icons/32x32/actions/Makefile.am
@@ -5,7 +5,6 @@ context = actions
iconsdir = $(themedir)/$(size)/$(context)
icons_DATA = \
- browse-webcam-effects.png \
cheese-take-burst.png \
cheese-take-photo.png
diff --git a/data/icons/48x48/actions/Makefile.am b/data/icons/48x48/actions/Makefile.am
index 5e7e0f3..17f1022 100644
--- a/data/icons/48x48/actions/Makefile.am
+++ b/data/icons/48x48/actions/Makefile.am
@@ -5,7 +5,6 @@ context = actions
iconsdir = $(themedir)/$(size)/$(context)
icons_DATA = \
- browse-webcam-effects.png \
cheese-take-burst.png \
cheese-take-photo.png
diff --git a/data/icons/scalable/actions/Makefile.am b/data/icons/scalable/actions/Makefile.am
index 36921b7..5acbc28 100644
--- a/data/icons/scalable/actions/Makefile.am
+++ b/data/icons/scalable/actions/Makefile.am
@@ -5,7 +5,6 @@ context = actions
iconsdir = $(themedir)/$(size)/$(context)
icons_DATA = \
- browse-webcam-effects.svg \
cheese-take-burst.svg \
cheese-take-photo.svg
diff --git a/libcheese/cheese-camera.c b/libcheese/cheese-camera.c
index 999e1d4..33cb756 100644
--- a/libcheese/cheese-camera.c
+++ b/libcheese/cheese-camera.c
@@ -78,7 +78,6 @@ typedef struct
GstElement *audio_enc;
GstElement *video_enc;
- GstElement *effect_filter, *csp_post_effect;
GstElement *video_balance, *csp_post_balance;
gulong photo_handler_signal_id;
@@ -122,31 +121,6 @@ typedef enum
YUV
} VideoColorSpace;
-typedef struct
-{
- CheeseCameraEffect effect;
- const char *pipeline_desc;
- VideoColorSpace colorspace; /* The color space the effect works in */
-} EffectToPipelineDesc;
-
-
-static const EffectToPipelineDesc EFFECT_TO_PIPELINE_DESC[] = {
- {CHEESE_CAMERA_EFFECT_NO_EFFECT, "identity", RGB},
- {CHEESE_CAMERA_EFFECT_MAUVE, "videobalance saturation=1.5 hue=+0.5", YUV},
- {CHEESE_CAMERA_EFFECT_NOIR_BLANC, "videobalance saturation=0", YUV},
- {CHEESE_CAMERA_EFFECT_SATURATION, "videobalance saturation=2", YUV},
- {CHEESE_CAMERA_EFFECT_HULK, "videobalance saturation=1.5 hue=-0.5", YUV},
- {CHEESE_CAMERA_EFFECT_VERTICAL_FLIP, "videoflip method=5", YUV},
- {CHEESE_CAMERA_EFFECT_HORIZONTAL_FLIP, "videoflip method=4", YUV},
- {CHEESE_CAMERA_EFFECT_SHAGADELIC, "shagadelictv", RGB},
- {CHEESE_CAMERA_EFFECT_VERTIGO, "vertigotv", RGB},
- {CHEESE_CAMERA_EFFECT_EDGE, "edgetv", RGB},
- {CHEESE_CAMERA_EFFECT_DICE, "dicetv", RGB},
- {CHEESE_CAMERA_EFFECT_WARP, "warptv", RGB}
-};
-
-static const int NUM_EFFECTS = G_N_ELEMENTS (EFFECT_TO_PIPELINE_DESC);
-
GQuark
cheese_camera_error_quark (void)
{
@@ -980,14 +954,6 @@ cheese_camera_create_video_display_bin (CheeseCamera *camera, GError **error)
cheese_camera_create_camera_source_bin (camera);
- if ((priv->effect_filter = gst_element_factory_make ("identity", "effect")) == NULL)
- {
- cheese_camera_set_error_element_not_found (error, "identity");
- }
- if ((priv->csp_post_effect = gst_element_factory_make ("ffmpegcolorspace", "csp_post_effect")) == NULL)
- {
- cheese_camera_set_error_element_not_found (error, "ffmpegcolorspace");
- }
if ((priv->video_balance = gst_element_factory_make ("videobalance", "video_balance")) == NULL)
{
cheese_camera_set_error_element_not_found (error, "videobalance");
@@ -1033,13 +999,11 @@ cheese_camera_create_video_display_bin (CheeseCamera *camera, GError **error)
return FALSE;
gst_bin_add_many (GST_BIN (priv->video_display_bin), priv->camera_source_bin,
- priv->effect_filter, priv->csp_post_effect,
priv->video_balance, priv->csp_post_balance,
tee, save_queue,
video_display_queue, video_scale, video_sink, NULL);
- ok = gst_element_link_many (priv->camera_source_bin, priv->effect_filter,
- priv->csp_post_effect,
+ ok = gst_element_link_many (priv->camera_source_bin,
priv->video_balance, priv->csp_post_balance,
tee, NULL);
@@ -1289,77 +1253,6 @@ cheese_camera_stop (CheeseCamera *camera)
priv->pipeline_is_playing = FALSE;
}
-static void
-cheese_camera_change_effect_filter (CheeseCamera *camera, GstElement *new_filter)
-{
- CheeseCameraPrivate *priv = CHEESE_CAMERA_GET_PRIVATE (camera);
-
- gboolean is_playing = priv->pipeline_is_playing;
- gboolean ok;
-
- cheese_camera_stop (camera);
-
- gst_element_unlink_many (priv->camera_source_bin, priv->effect_filter,
- priv->csp_post_effect, NULL);
-
- gst_bin_remove (GST_BIN (priv->video_display_bin), priv->effect_filter);
-
- gst_bin_add (GST_BIN (priv->video_display_bin), new_filter);
- ok = gst_element_link_many (priv->camera_source_bin, new_filter,
- priv->csp_post_effect, NULL);
- g_return_if_fail (ok);
-
- if (is_playing)
- cheese_camera_play (camera);
-
- priv->effect_filter = new_filter;
-}
-
-void
-cheese_camera_set_effect (CheeseCamera *camera, CheeseCameraEffect effect)
-{
- GString *rgb_effects_str = g_string_new ("");
- GString *yuv_effects_str = g_string_new ("");
- char *effects_pipeline_desc;
- int i;
- GstElement *effect_filter;
- GError *err = NULL;
-
- for (i = 0; i < NUM_EFFECTS; i++)
- {
- if (effect & EFFECT_TO_PIPELINE_DESC[i].effect)
- {
- if (EFFECT_TO_PIPELINE_DESC[i].colorspace == RGB)
- {
- g_string_append (rgb_effects_str, EFFECT_TO_PIPELINE_DESC[i].pipeline_desc);
- g_string_append (rgb_effects_str, " ! ");
- }
- else
- {
- g_string_append (yuv_effects_str, " ! ");
- g_string_append (yuv_effects_str, EFFECT_TO_PIPELINE_DESC[i].pipeline_desc);
- }
- }
- }
- effects_pipeline_desc = g_strconcat ("ffmpegcolorspace ! ",
- rgb_effects_str->str,
- "ffmpegcolorspace",
- yuv_effects_str->str,
- NULL);
-
- effect_filter = gst_parse_bin_from_description (effects_pipeline_desc, TRUE, &err);
- if (!effect_filter || (err != NULL))
- {
- g_error_free (err);
- g_error ("ERROR effect_filter\n");
- }
- cheese_camera_change_effect_filter (camera, effect_filter);
-
- g_free (effects_pipeline_desc);
- g_string_free (rgb_effects_str, TRUE);
- g_string_free (yuv_effects_str, TRUE);
-}
-
void
cheese_camera_start_video_recording (CheeseCamera *camera, char *filename)
{
diff --git a/libcheese/cheese-camera.h b/libcheese/cheese-camera.h
index fe7d1c7..1ee32ec 100644
--- a/libcheese/cheese-camera.h
+++ b/libcheese/cheese-camera.h
@@ -65,23 +65,6 @@ typedef struct
GHashTable *supported_resolutions;
} CheeseCameraDevice;
-typedef enum
-{
- CHEESE_CAMERA_EFFECT_NO_EFFECT = (0),
- CHEESE_CAMERA_EFFECT_MAUVE = (1 << 0),
- CHEESE_CAMERA_EFFECT_NOIR_BLANC = (1 << 1),
- CHEESE_CAMERA_EFFECT_SATURATION = (1 << 2),
- CHEESE_CAMERA_EFFECT_HULK = (1 << 3),
- CHEESE_CAMERA_EFFECT_VERTICAL_FLIP = (1 << 4),
- CHEESE_CAMERA_EFFECT_HORIZONTAL_FLIP = (1 << 5),
- CHEESE_CAMERA_EFFECT_SHAGADELIC = (1 << 6),
- CHEESE_CAMERA_EFFECT_VERTIGO = (1 << 7),
- CHEESE_CAMERA_EFFECT_EDGE = (1 << 8),
- CHEESE_CAMERA_EFFECT_DICE = (1 << 9),
- CHEESE_CAMERA_EFFECT_WARP = (1 << 10),
-}
-CheeseCameraEffect;
-
typedef struct
{
GObject parent;
@@ -105,7 +88,6 @@ CheeseVideoFormat *cheese_camera_get_current_video_format (CheeseCamera *camera)
void cheese_camera_setup (CheeseCamera *camera, char *udi, GError **error);
void cheese_camera_play (CheeseCamera *camera);
void cheese_camera_stop (CheeseCamera *camera);
-void cheese_camera_set_effect (CheeseCamera *camera, CheeseCameraEffect effect);
void cheese_camera_start_video_recording (CheeseCamera *camera, char *filename);
void cheese_camera_stop_video_recording (CheeseCamera *camera);
gboolean cheese_camera_take_photo (CheeseCamera *camera, char *filename);
diff --git a/src/Makefile.am b/src/Makefile.am
index 7e4e86c..91ac525 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,8 +20,6 @@ cheese_SOURCES = \
cheese-countdown.h \
cheese-dbus.c \
cheese-dbus.h \
- cheese-effect-chooser.c \
- cheese-effect-chooser.h \
cheese-fileutil.c \
cheese-fileutil.h \
cheese-gconf.c \
diff --git a/src/cheese-gconf.c b/src/cheese-gconf.c
index 015e8e1..c25ca8d 100644
--- a/src/cheese-gconf.c
+++ b/src/cheese-gconf.c
@@ -50,9 +50,6 @@ cheese_gconf_get_property (GObject *object, guint prop_id, GValue *value,
self = CHEESE_GCONF (object);
CheeseGConfPrivate *priv = CHEESE_GCONF_GET_PRIVATE (self);
- char *effects;
- GSList *list, *tmp;
-
switch (prop_id)
{
case GCONF_PROP_COUNTDOWN:
@@ -65,48 +62,6 @@ cheese_gconf_get_property (GObject *object, guint prop_id, GValue *value,
CHEESE_GCONF_PREFIX "/webcam",
NULL));
break;
- case GCONF_PROP_SELECTED_EFFECTS:
- effects = NULL;
- list = gconf_client_get_list (priv->client,
- CHEESE_GCONF_PREFIX "/selected_effects",
- GCONF_VALUE_STRING,
- NULL);
- tmp = list;
- while (tmp != NULL)
- {
- char *str = tmp->data;
- int j;
- str[0] = g_ascii_toupper (str[0]);
- for (j = 1; j < g_utf8_strlen (str, -1); j++)
- {
- if (str[j] == '-')
- {
- str[j] = ' ';
- str[j + 1] = g_ascii_toupper (str[j + 1]);
- }
- else if (str[j] == '_')
- {
- str[j] = '/';
- str[j + 1] = g_ascii_toupper (str[j + 1]);
- }
- }
- if (effects == NULL)
- effects = g_strdup (str);
- else
- {
- gchar *dummy = effects;
- effects = g_strjoin (",", effects, str, NULL);
- g_free (dummy);
- }
-
- g_free (tmp->data);
- tmp = g_slist_next (tmp);
- }
- g_value_set_string (value, effects);
-
- g_slist_free (list);
- g_slist_free (tmp);
- break;
case GCONF_PROP_X_RESOLUTION:
g_value_set_int (value, gconf_client_get_int (priv->client,
CHEESE_GCONF_PREFIX "/x_resolution",
@@ -202,10 +157,6 @@ cheese_gconf_set_property (GObject *object, guint prop_id, const GValue *value,
self = CHEESE_GCONF (object);
CheeseGConfPrivate *priv = CHEESE_GCONF_GET_PRIVATE (self);
- gchar **effects = NULL;
- GSList *list = NULL;
- int i;
-
switch (prop_id)
{
case GCONF_PROP_COUNTDOWN:
@@ -220,46 +171,6 @@ cheese_gconf_set_property (GObject *object, guint prop_id, const GValue *value,
g_value_get_string (value),
NULL);
break;
- case GCONF_PROP_SELECTED_EFFECTS:
-
- if (g_value_get_string (value) == NULL)
- {
- list = NULL;
- }
- else
- {
- char *str = g_value_dup_string (value);
- int j;
- for (j = 0; j < g_utf8_strlen (str, -1); j++)
- {
- if (g_ascii_isupper (str[j]))
- {
- str[j] = g_ascii_tolower (str[j]);
- }
- else if (str[j] == ' ')
- {
- str[j] = '-';
- }
- else if (str[j] == '/')
- {
- str[j] = '_';
- }
- }
- effects = g_strsplit (str, ",", 12);
- for (i = 0; effects[i] != NULL; i++)
- {
- list = g_slist_append (list, effects[i]);
- }
- g_free (str);
- }
- gconf_client_set_list (priv->client,
- CHEESE_GCONF_PREFIX "/selected_effects",
- GCONF_VALUE_STRING,
- list,
- NULL);
- g_slist_free (list);
- g_strfreev (effects);
- break;
case GCONF_PROP_X_RESOLUTION:
gconf_client_set_int (priv->client,
CHEESE_GCONF_PREFIX "/x_resolution",
@@ -372,12 +283,6 @@ cheese_gconf_class_init (CheeseGConfClass *klass)
NULL,
"",
G_PARAM_READWRITE));
- g_object_class_install_property (object_class, GCONF_PROP_SELECTED_EFFECTS,
- g_param_spec_string ("gconf_prop_selected_effects",
- NULL,
- NULL,
- "",
- G_PARAM_READWRITE));
g_object_class_install_property (object_class, GCONF_PROP_X_RESOLUTION,
g_param_spec_int ("gconf_prop_x_resolution",
diff --git a/src/cheese-gconf.h b/src/cheese-gconf.h
index f7b5c2d..db832d0 100644
--- a/src/cheese-gconf.h
+++ b/src/cheese-gconf.h
@@ -44,7 +44,6 @@ enum
GCONF_PROP_0,
GCONF_PROP_COUNTDOWN,
GCONF_PROP_WEBCAM,
- GCONF_PROP_SELECTED_EFFECTS,
GCONF_PROP_X_RESOLUTION,
GCONF_PROP_Y_RESOLUTION,
GCONF_PROP_BRIGHTNESS,
diff --git a/src/cheese-window.c b/src/cheese-window.c
index 8161823..ed0fbd0 100644
--- a/src/cheese-window.c
+++ b/src/cheese-window.c
@@ -44,7 +44,6 @@
#endif /* HAVE_MMKEYS */
#include "cheese-countdown.h"
-#include "cheese-effect-chooser.h"
#include "cheese-fileutil.h"
#include "cheese-gconf.h"
#include "cheese-thumb-view.h"
@@ -59,7 +58,6 @@
#define SHUTTER_SOUNDS 5
#define FULLSCREEN_POPUP_HEIGHT 40
#define FULLSCREEN_TIMEOUT 5 * 1000
-#define FULLSCREEN_EFFECTS_TIMEOUT 15
#define DEFAULT_WINDOW_WIDTH 600
#define DEFAULT_WINDOW_HEIGHT 450
@@ -110,12 +108,8 @@ typedef struct
GtkWidget *netbook_alignment;
GtkWidget *toolbar_alignment;
- GtkWidget *effect_button_alignment;
GtkWidget *togglegroup_alignment;
- GtkWidget *effect_frame;
- GtkWidget *effect_alignment;
- GtkWidget *effect_chooser;
GtkWidget *throbber_frame;
GtkWidget *throbber;
GtkWidget *countdown_frame;
@@ -125,11 +119,9 @@ typedef struct
GtkWidget *info_bar_frame;
GtkWidget *info_bar;
- GtkWidget *button_effects;
GtkWidget *button_photo;
GtkWidget *button_video;
GtkWidget *button_burst;
- GtkWidget *button_effects_fullscreen;
GtkWidget *button_photo_fullscreen;
GtkWidget *button_video_fullscreen;
GtkWidget *button_burst_fullscreen;
@@ -137,7 +129,6 @@ typedef struct
GtkWidget *image_take_photo;
GtkWidget *image_take_photo_fullscreen;
- GtkWidget *label_effects;
GtkWidget *label_photo;
GtkWidget *label_photo_fullscreen;
GtkWidget *label_take_photo;
@@ -156,7 +147,6 @@ typedef struct
GtkActionGroup *actions_account_photo;
GtkActionGroup *actions_countdown;
- GtkActionGroup *actions_effects;
GtkActionGroup *actions_preferences;
GtkActionGroup *actions_file;
GtkActionGroup *actions_sendto;
@@ -314,7 +304,6 @@ cheese_window_fullscreen_motion_notify_cb (GtkWidget *widget,
cheese_window_fullscreen_show_bar (cheese_window);
}
- /* don't set the timeout in effect-chooser mode */
if (gtk_notebook_get_current_page (GTK_NOTEBOOK (cheese_window->notebook)) != 1)
cheese_window_fullscreen_set_timeout (cheese_window);
}
@@ -364,8 +353,6 @@ cheese_window_toggle_wide_mode (GtkWidget *widget, CheeseWindow *cheese_window)
"bottom-padding", 10, NULL);
g_object_set (G_OBJECT (cheese_window->togglegroup_alignment),
"left-padding", 6, NULL);
- g_object_set (G_OBJECT (cheese_window->effect_button_alignment),
- "right-padding", 0, NULL);
g_object_set (G_OBJECT (cheese_window->netbook_alignment),
"left-padding", 6, NULL);
}
@@ -375,8 +362,6 @@ cheese_window_toggle_wide_mode (GtkWidget *widget, CheeseWindow *cheese_window)
"bottom-padding", 6, NULL);
g_object_set (G_OBJECT (cheese_window->togglegroup_alignment),
"left-padding", 24, NULL);
- g_object_set (G_OBJECT (cheese_window->effect_button_alignment),
- "right-padding", 24, NULL);
g_object_set (G_OBJECT (cheese_window->netbook_alignment),
"left-padding", 0, NULL);
}
@@ -419,7 +404,6 @@ cheese_window_toggle_fullscreen (GtkWidget *widget, CheeseWindow *cheese_window)
gtk_window_fullscreen (GTK_WINDOW (cheese_window->window));
- gtk_widget_set_size_request (cheese_window->effect_alignment, -1, FULLSCREEN_POPUP_HEIGHT);
cheese_window_fullscreen_show_bar (cheese_window);
/* don't set the timeout in effect-chooser mode */
@@ -440,7 +424,6 @@ cheese_window_toggle_fullscreen (GtkWidget *widget, CheeseWindow *cheese_window)
(gpointer) cheese_window_fullscreen_motion_notify_cb, cheese_window);
gtk_window_unfullscreen (GTK_WINDOW (cheese_window->window));
- gtk_widget_set_size_request (cheese_window->effect_alignment, -1, -1);
cheese_window->isFullscreen = FALSE;
cheese_window_fullscreen_clear_timeout (cheese_window);
@@ -470,7 +453,6 @@ cheese_window_photo_saved_cb (CheeseCamera *camera, CheeseWindow *cheese_window)
gdk_threads_enter ();
if (!cheese_window->is_bursting)
{
- gtk_action_group_set_sensitive (cheese_window->actions_effects, TRUE);
gtk_action_group_set_sensitive (cheese_window->actions_toggle, TRUE);
gtk_widget_set_sensitive (cheese_window->take_picture, TRUE);
gtk_widget_set_sensitive (cheese_window->take_picture_fullscreen, TRUE);
@@ -487,7 +469,6 @@ cheese_window_video_saved_cb (CheeseCamera *camera, CheeseWindow *cheese_window)
/* TODO look at this g_free */
g_free (cheese_window->video_filename);
cheese_window->video_filename = NULL;
- gtk_action_group_set_sensitive (cheese_window->actions_effects, TRUE);
gtk_widget_set_sensitive (cheese_window->take_picture, TRUE);
gtk_widget_set_sensitive (cheese_window->take_picture_fullscreen, TRUE);
gdk_flush ();
@@ -501,7 +482,6 @@ cheese_window_cmd_close (GtkWidget *widget, CheeseWindow *cheese_window)
g_object_unref (cheese_window->actions_main);
g_object_unref (cheese_window->actions_account_photo);
g_object_unref (cheese_window->actions_countdown);
- g_object_unref (cheese_window->actions_effects);
g_object_unref (cheese_window->actions_file);
g_object_unref (cheese_window->actions_sendto);
g_object_unref (cheese_window->actions_flickr);
@@ -509,7 +489,6 @@ cheese_window_cmd_close (GtkWidget *widget, CheeseWindow *cheese_window)
g_object_unref (cheese_window->actions_mail);
g_object_unref (cheese_window->actions_photo);
g_object_unref (cheese_window->actions_toggle);
- g_object_unref (cheese_window->actions_effects);
g_object_unref (cheese_window->actions_preferences);
g_object_unref (cheese_window->actions_file);
g_object_unref (cheese_window->actions_video);
@@ -1216,44 +1195,6 @@ cheese_window_button_press_event_cb (GtkWidget *iconview, GdkEventButton *event,
return FALSE;
}
-static void
-cheese_window_effect_button_pressed_cb (GtkWidget *widget, CheeseWindow *cheese_window)
-{
- if (gtk_notebook_get_current_page (GTK_NOTEBOOK (cheese_window->notebook)) == 1)
- {
- gtk_notebook_set_current_page (GTK_NOTEBOOK (cheese_window->notebook), 0);
- gtk_label_set_text_with_mnemonic (GTK_LABEL (cheese_window->label_effects), _("_Effects"));
- gtk_widget_set_sensitive (cheese_window->take_picture, TRUE);
- gtk_widget_set_sensitive (cheese_window->take_picture_fullscreen, TRUE);
- if (cheese_window->camera_mode == CAMERA_MODE_PHOTO)
- {
- gtk_action_group_set_sensitive (cheese_window->actions_photo, TRUE);
- }
- else if (cheese_window->camera_mode == CAMERA_MODE_BURST)
- {
- gtk_action_group_set_sensitive (cheese_window->actions_burst, TRUE);
- }
- else
- {
- gtk_action_group_set_sensitive (cheese_window->actions_video, TRUE);
- }
- cheese_camera_set_effect (cheese_window->camera,
- cheese_effect_chooser_get_selection (CHEESE_EFFECT_CHOOSER (cheese_window->effect_chooser)));
- g_object_set (cheese_window->gconf, "gconf_prop_selected_effects",
- cheese_effect_chooser_get_selection_string (CHEESE_EFFECT_CHOOSER (cheese_window->effect_chooser)),
- NULL);
- }
- else
- {
- gtk_notebook_set_current_page (GTK_NOTEBOOK (cheese_window->notebook), 1);
- gtk_widget_set_sensitive (GTK_WIDGET (cheese_window->take_picture), FALSE);
- gtk_widget_set_sensitive (GTK_WIDGET (cheese_window->take_picture_fullscreen), FALSE);
- gtk_action_group_set_sensitive (cheese_window->actions_photo, FALSE);
- gtk_action_group_set_sensitive (cheese_window->actions_video, FALSE);
- gtk_action_group_set_sensitive (cheese_window->actions_burst, FALSE);
- }
-}
-
void
cheese_window_countdown_hide_cb (gpointer data)
{
@@ -1325,7 +1266,6 @@ cheese_window_stop_recording (CheeseWindow *cheese_window)
{
if (cheese_window->recording)
{
- gtk_action_group_set_sensitive (cheese_window->actions_effects, TRUE);
gtk_action_group_set_sensitive (cheese_window->actions_toggle, TRUE);
gtk_widget_set_sensitive (cheese_window->take_picture, FALSE);
gchar *str = g_strconcat ("<b>", _("_Start Recording"), "</b>", NULL);
@@ -1377,7 +1317,6 @@ cheese_window_escape_key_cb (CheeseWindow *cheese_window,
gtk_notebook_set_current_page (GTK_NOTEBOOK (cheese_window->notebook_bar), 0);
gtk_notebook_set_current_page (GTK_NOTEBOOK (cheese_window->fullscreen_bar), 0);
- gtk_action_group_set_sensitive (cheese_window->actions_effects, TRUE);
gtk_action_group_set_sensitive (cheese_window->actions_toggle, TRUE);
gtk_widget_set_sensitive (cheese_window->take_picture, TRUE);
@@ -1484,7 +1423,6 @@ cheese_window_action_button_clicked_cb (GtkWidget *widget, CheeseWindow *cheese_
{
break;
}
- gtk_action_group_set_sensitive (cheese_window->actions_effects, FALSE);
gtk_action_group_set_sensitive (cheese_window->actions_toggle, FALSE);
g_object_get (cheese_window->gconf, "gconf_prop_burst_repeat", &cheese_window->repeat_count, NULL); /* reset burst counter */
cheese_fileutil_reset_burst (cheese_window->fileutil); /* reset filename counter */
@@ -1494,7 +1432,6 @@ cheese_window_action_button_clicked_cb (GtkWidget *widget, CheeseWindow *cheese_
case CAMERA_MODE_VIDEO:
if (!cheese_window->recording)
{
- gtk_action_group_set_sensitive (cheese_window->actions_effects, FALSE);
gtk_action_group_set_sensitive (cheese_window->actions_toggle, FALSE);
str = g_strconcat ("<b>", _("_Stop Recording"), "</b>", NULL);
gtk_label_set_text_with_mnemonic (GTK_LABEL (cheese_window->label_take_photo), str);
@@ -1550,10 +1487,6 @@ static const GtkToggleActionEntry action_entries_countdown[] = {
{"Countdown", NULL, N_("Countdown"), NULL, NULL, G_CALLBACK (cheese_window_set_countdown), FALSE},
};
-static const GtkToggleActionEntry action_entries_effects[] = {
- {"Effects", NULL, N_("_Effects"), NULL, NULL, G_CALLBACK (cheese_window_effect_button_pressed_cb), FALSE},
-};
-
static const GtkActionEntry action_entries_preferences[] = {
{"Preferences", GTK_STOCK_PREFERENCES, N_("Preferences"), NULL, NULL, G_CALLBACK (cheese_window_preferences_cb)},
};
@@ -1748,19 +1681,16 @@ cheese_window_create_window (CheeseWindow *cheese_window)
}
cheese_window->window = GTK_WIDGET (gtk_builder_get_object (builder, "cheese_window"));
- cheese_window->button_effects = GTK_WIDGET (gtk_builder_get_object (builder, "button_effects"));
cheese_window->button_photo = GTK_WIDGET (gtk_builder_get_object (builder, "button_photo"));
cheese_window->button_video = GTK_WIDGET (gtk_builder_get_object (builder, "button_video"));
cheese_window->button_burst = GTK_WIDGET (gtk_builder_get_object (builder, "button_burst"));
cheese_window->image_take_photo = GTK_WIDGET (gtk_builder_get_object (builder, "image_take_photo"));
- cheese_window->label_effects = GTK_WIDGET (gtk_builder_get_object (builder, "label_effects"));
cheese_window->label_photo = GTK_WIDGET (gtk_builder_get_object (builder, "label_photo"));
cheese_window->label_take_photo = GTK_WIDGET (gtk_builder_get_object (builder, "label_take_photo"));
cheese_window->label_video = GTK_WIDGET (gtk_builder_get_object (builder, "label_video"));
cheese_window->main_vbox = GTK_WIDGET (gtk_builder_get_object (builder, "main_vbox"));
cheese_window->netbook_alignment = GTK_WIDGET (gtk_builder_get_object (builder, "netbook_alignment"));
cheese_window->togglegroup_alignment = GTK_WIDGET (gtk_builder_get_object (builder, "togglegroup_alignment"));
- cheese_window->effect_button_alignment = GTK_WIDGET (gtk_builder_get_object (builder, "effect_button_alignment"));
cheese_window->toolbar_alignment = GTK_WIDGET (gtk_builder_get_object (builder, "toolbar_alignment"));
cheese_window->video_vbox = GTK_WIDGET (gtk_builder_get_object (builder, "video_vbox"));
cheese_window->notebook = GTK_WIDGET (gtk_builder_get_object (builder, "notebook"));
@@ -1770,12 +1700,9 @@ cheese_window_create_window (CheeseWindow *cheese_window)
cheese_window->thumb_scrollwindow = GTK_WIDGET (gtk_builder_get_object (builder, "thumb_scrollwindow"));
cheese_window->throbber_frame = GTK_WIDGET (gtk_builder_get_object (builder, "throbber_frame"));
cheese_window->countdown_frame = GTK_WIDGET (gtk_builder_get_object (builder, "countdown_frame"));
- cheese_window->effect_frame = GTK_WIDGET (gtk_builder_get_object (builder, "effect_frame"));
- cheese_window->effect_alignment = GTK_WIDGET (gtk_builder_get_object (builder, "effect_alignment"));
cheese_window->info_bar_frame = GTK_WIDGET (gtk_builder_get_object (builder, "info_bar_frame"));
cheese_window->fullscreen_popup = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_popup"));
cheese_window->fullscreen_bar = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_notebook_bar"));
- cheese_window->button_effects_fullscreen = GTK_WIDGET (gtk_builder_get_object (builder, "button_effects_fullscreen"));
cheese_window->button_photo_fullscreen = GTK_WIDGET (gtk_builder_get_object (builder, "button_photo_fullscreen"));
cheese_window->button_video_fullscreen = GTK_WIDGET (gtk_builder_get_object (builder, "button_video_fullscreen"));
cheese_window->button_burst_fullscreen = GTK_WIDGET (gtk_builder_get_object (builder, "button_burst_fullscreen"));
@@ -1825,12 +1752,6 @@ cheese_window_create_window (CheeseWindow *cheese_window)
/* show the scroll window to get it included in the size requisition done later */
gtk_widget_show_all (cheese_window->thumb_scrollwindow);
- char *gconf_effects;
- g_object_get (cheese_window->gconf, "gconf_prop_selected_effects", &gconf_effects, NULL);
- cheese_window->effect_chooser = cheese_effect_chooser_new (gconf_effects);
- gtk_container_add (GTK_CONTAINER (cheese_window->effect_frame), cheese_window->effect_chooser);
- g_free (gconf_effects);
-
cheese_window->throbber = ephy_spinner_new ();
ephy_spinner_set_size (EPHY_SPINNER (cheese_window->throbber), GTK_ICON_SIZE_DIALOG);
gtk_container_add (GTK_CONTAINER (cheese_window->throbber_frame), cheese_window->throbber);
@@ -1868,11 +1789,6 @@ cheese_window_create_window (CheeseWindow *cheese_window)
"ActionsRadio",
action_entries_toggle,
G_N_ELEMENTS (action_entries_toggle));
- cheese_window->actions_effects = cheese_window_toggle_action_group_new (cheese_window,
- "ActionsEffects",
- action_entries_effects,
- G_N_ELEMENTS (action_entries_effects));
-
cheese_window->actions_fullscreen = cheese_window_toggle_action_group_new (cheese_window,
"ActionsFullscreen",
action_entries_fullscreen,
@@ -1991,10 +1907,6 @@ cheese_window_create_window (CheeseWindow *cheese_window)
gtk_action_group_set_sensitive (cheese_window->actions_file, FALSE);
- action = gtk_ui_manager_get_action (cheese_window->ui_manager, "/MainMenu/Edit/Effects");
- gtk_activatable_set_related_action (GTK_ACTIVATABLE (cheese_window->button_effects), action);
- gtk_activatable_set_related_action (GTK_ACTIVATABLE (cheese_window->button_effects_fullscreen), action);
-
action = gtk_ui_manager_get_action (cheese_window->ui_manager, "/MainMenu/Cheese/Photo");
gtk_activatable_set_related_action (GTK_ACTIVATABLE (cheese_window->button_photo), action);
gtk_activatable_set_related_action (GTK_ACTIVATABLE (cheese_window->button_photo_fullscreen), action);
@@ -2099,9 +2011,6 @@ setup_camera (CheeseWindow *cheese_window)
g_signal_connect (cheese_window->camera, "video-saved",
G_CALLBACK (cheese_window_video_saved_cb), cheese_window);
- cheese_camera_set_effect (cheese_window->camera,
- cheese_effect_chooser_get_selection (CHEESE_EFFECT_CHOOSER (cheese_window->effect_chooser)));
-
cheese_camera_set_balance_property (cheese_window->camera, "brightness", brightness);
cheese_camera_set_balance_property (cheese_window->camera, "contrast", contrast);
cheese_camera_set_balance_property (cheese_window->camera, "saturation", saturation);
@@ -2124,7 +2033,6 @@ setup_camera (CheeseWindow *cheese_window)
}
gtk_widget_set_sensitive (GTK_WIDGET (cheese_window->take_picture), TRUE);
gtk_widget_set_sensitive (GTK_WIDGET (cheese_window->take_picture_fullscreen), TRUE);
- gtk_action_group_set_sensitive (cheese_window->actions_effects, TRUE);
gdk_threads_leave ();
}
@@ -2153,7 +2061,6 @@ cheese_window_init (char *hal_dev_udi, CheeseDbus *dbus_server, gboolean startup
cheese_window->fullscreen_timeout_source = NULL;
cheese_window_create_window (cheese_window);
- gtk_action_group_set_sensitive (cheese_window->actions_effects, FALSE);
ephy_spinner_start (EPHY_SPINNER (cheese_window->throbber));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
