[cheese] reindent vala code
- From: Daniel G. Siegel <dgsiegel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cheese] reindent vala code
- Date: Mon, 9 Aug 2010 01:56:57 +0000 (UTC)
commit c4df90e07db78b58adc712fd551313b5e6bdb730
Author: daniel g. siegel <dgsiegel gnome org>
Date: Mon Aug 9 03:51:51 2010 +0200
reindent vala code
src/cheese-effects-manager.vala | 11 +++----
src/cheese-main.vala | 14 ++++----
src/cheese-preferences.vala | 26 +++++++++--------
src/cheese-window.vala | 59 ++++++++++++++++++++-------------------
4 files changed, 56 insertions(+), 54 deletions(-)
---
diff --git a/src/cheese-effects-manager.vala b/src/cheese-effects-manager.vala
index 489a43a..d80e267 100644
--- a/src/cheese-effects-manager.vala
+++ b/src/cheese-effects-manager.vala
@@ -28,9 +28,9 @@ internal class Cheese.EffectsManager : GLib.Object
{
public static Cheese.Effect ? parse_effect_file (string filename)
{
- KeyFile kf = new KeyFile ();
- Effect eff = new Effect ();
- var locale = Intl.setlocale(LocaleCategory.ALL, "");
+ KeyFile kf = new KeyFile ();
+ Effect eff = new Effect ();
+ var locale = Intl.setlocale (LocaleCategory.ALL, "");
try
{
@@ -79,7 +79,7 @@ internal class Cheese.EffectsManager : GLib.Object
if (cur_file.has_suffix (".effect"))
{
Effect effect = EffectsManager.parse_effect_file (GLib.Path.build_filename (directory, cur_file));
- if (!effects.contains(effect))
+ if (!effects.contains (effect))
{
message ("Found %s (%s)", effect.name, effect.pipeline_desc);
list.add (effect);
@@ -99,11 +99,11 @@ internal class Cheese.EffectsManager : GLib.Object
public void load_effects ()
{
string system_effects;
+
foreach (string dir in Environment.get_system_data_dirs ())
{
system_effects = GLib.Path.build_filename (dir, "gnome-video-effects");
effects.add_all (load_effects_from_directory (system_effects));
-
}
string user_effects = GLib.Path.build_filename (Environment.get_user_data_dir (), "gnome-video-effects");
@@ -135,5 +135,4 @@ internal class Cheese.EffectsManager : GLib.Object
{
return a.pipeline_desc == b.pipeline_desc;
}
-
}
diff --git a/src/cheese-main.vala b/src/cheese-main.vala
index 6196bfd..b45f24b 100644
--- a/src/cheese-main.vala
+++ b/src/cheese-main.vala
@@ -27,17 +27,17 @@ using Unique;
public class Cheese.Main
{
- static bool wide;
- static string device;
- static bool version;
+ static bool wide;
+ static string device;
+ static bool version;
static Cheese.MainWindow main_window;
const OptionEntry[] options = {
- { "wide", 'w', 0, OptionArg.NONE, ref wide, N_("Enable wide mode"), null},
- { "device", 'd', 0, OptionArg.FILENAME, ref device, N_("Device to use as a camera"), N_("DEVICE")},
- { "version", 'v', 0, OptionArg.NONE, ref version, N_("Output version information and exit"), null},
- { null}
+ {"wide", 'w', 0, OptionArg.NONE, ref wide, N_("Enable wide mode"), null },
+ {"device", 'd', 0, OptionArg.FILENAME, ref device, N_("Device to use as a camera"), N_("DEVICE")},
+ {"version", 'v', 0, OptionArg.NONE, ref version, N_("Output version information and exit"), null },
+ {null}
};
public static Unique.Response unique_message_received (int command,
diff --git a/src/cheese-preferences.vala b/src/cheese-preferences.vala
index ef592d7..e32c60e 100644
--- a/src/cheese-preferences.vala
+++ b/src/cheese-preferences.vala
@@ -50,14 +50,14 @@ public class Cheese.PreferencesDialog : GLib.Object
this.conf = conf;
Gtk.Builder builder = new Gtk.Builder ();
- try
- {
- builder.add_from_file (GLib.Path.build_filename (Config.PACKAGE_DATADIR, "cheese-prefs.ui"));
- }
- catch (Error err)
- {
- error ("Error: %s", err.message);
- }
+ try
+ {
+ builder.add_from_file (GLib.Path.build_filename (Config.PACKAGE_DATADIR, "cheese-prefs.ui"));
+ }
+ catch (Error err)
+ {
+ error ("Error: %s", err.message);
+ }
this.dialog = (Gtk.Dialog)builder.get_object ("cheese_prefs_dialog");
@@ -88,9 +88,11 @@ public class Cheese.PreferencesDialog : GLib.Object
initialize_camera_devices ();
initialize_values_from_conf ();
- // Connect signals only after all the widgets have been setup
- // Stops a bunch of unnecessary signals from being fired
- builder.connect_signals (this);
+ /*
+ * Connect signals only after all the widgets have been setup
+ * Stops a bunch of unnecessary signals from being fired
+ */
+ builder.connect_signals (this);
}
private void setup_combo_box_models ()
@@ -126,7 +128,7 @@ public class Cheese.PreferencesDialog : GLib.Object
}
}
- setup_resolutions_for_device (camera.get_selected_device ());
+ setup_resolutions_for_device (camera.get_selected_device ());
}
private void setup_resolutions_for_device (Cheese.CameraDevice device)
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
index 033041c..6a12427 100644
--- a/src/cheese-window.vala
+++ b/src/cheese-window.vala
@@ -261,7 +261,7 @@ public class Cheese.MainWindow : Gtk.Window
file_to_trash = File.new_for_path (fileutil.get_photo_path () + GLib.Path.DIR_SEPARATOR_S + file_info.get_name ());
file_to_trash.trash (null);
}
- }catch (Error e)
+ } catch (Error e)
{
warning ("Error: %s\n", e.message);
return;
@@ -329,7 +329,7 @@ public class Cheese.MainWindow : Gtk.Window
screen = this.get_screen ();
try {
Gtk.show_uri (screen, "ghelp:cheese", Gtk.get_current_event_time ());
- }catch (Error err)
+ } catch (Error err)
{
warning ("Error: %s\n", err.message);
}
@@ -439,9 +439,9 @@ public class Cheese.MainWindow : Gtk.Window
{
fullscreen_timeout = new TimeoutSource (FULLSCREEN_TIMEOUT_INTERVAL);
fullscreen_timeout.attach (null);
- fullscreen_timeout.set_callback (() => { buttons_area.hide ();
- clear_fullscreen_timeout ();
- return true;});
+ fullscreen_timeout.set_callback (() => {buttons_area.hide ();
+ clear_fullscreen_timeout ();
+ return true; });
}
private bool fullscreen_motion_notify_callback (Gtk.Widget viewport, EventMotion e)
@@ -863,7 +863,7 @@ public class Cheese.MainWindow : Gtk.Window
private Gee.HashMap<string, bool> action_sensitivities;
public void toggle_camera_actions_sensitivities (bool active)
{
- is_camera_actions_sensitive = active;
+ is_camera_actions_sensitive = active;
if (active)
{
foreach (string key in action_sensitivities.keys)
@@ -886,17 +886,17 @@ public class Cheese.MainWindow : Gtk.Window
}
/* Keep only these actions sensitive. */
- string active_actions[11] = { "cheese_action",
- "edit_action",
- "help_action",
- "quit",
- "help_contents",
- "about",
- "open",
- "save_as",
- "move_to_trash",
- "delete",
- "move_all_to_trash"};
+ string active_actions[11] = {"cheese_action",
+ "edit_action",
+ "help_action",
+ "quit",
+ "help_contents",
+ "about",
+ "open",
+ "save_as",
+ "move_to_trash",
+ "delete",
+ "move_all_to_trash"};
/* Gross hack because Vala's `in` operator doesn't really work */
bool flag;
@@ -922,11 +922,11 @@ public class Cheese.MainWindow : Gtk.Window
private void camera_state_changed (Gst.State new_state)
{
- if (new_state == Gst.State.PLAYING)
- {
- if (!is_camera_actions_sensitive)
- toggle_camera_actions_sensitivities (true);
- }
+ if (new_state == Gst.State.PLAYING)
+ {
+ if (!is_camera_actions_sensitive)
+ toggle_camera_actions_sensitivities (true);
+ }
}
public void setup_ui ()
@@ -944,7 +944,7 @@ public class Cheese.MainWindow : Gtk.Window
gtk_builder.connect_signals (this);
clutter_builder.load_from_file (GLib.Path.build_filename (Config.PACKAGE_DATADIR, "cheese-viewport.json"));
- }catch (Error err)
+ } catch (Error err)
{
error ("Error: %s", err.message);
}
@@ -982,12 +982,12 @@ public class Cheese.MainWindow : Gtk.Window
/* Array contains all 'buttons', for easier manipulation
* IMPORTANT: IF ANOTHER BUTTON IS ADDED UNDER THE VIEWPORT, ADD IT TO THIS ARRAY */
- buttons = { photo_toggle_button,
- video_toggle_button,
- burst_toggle_button,
- take_action_button,
- effects_toggle_button,
- leave_fullscreen_button};
+ buttons = {photo_toggle_button,
+ video_toggle_button,
+ burst_toggle_button,
+ take_action_button,
+ effects_toggle_button,
+ leave_fullscreen_button};
video_preview = (Clutter.Texture)clutter_builder.get_object ("video_preview");
viewport_layout = (Clutter.Box)clutter_builder.get_object ("viewport_layout");
@@ -1035,6 +1035,7 @@ public class Cheese.MainWindow : Gtk.Window
public void setup_camera (string ? uri)
{
string device;
+
if (uri != null && uri.length > 0)
device = uri;
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]