Commit 881d80b5 authored by Jim Nelson's avatar Jim Nelson

Cade changes in preparation for 0.11 (but these do not require 0.11 to...

Cade changes in preparation for 0.11 (but these do not require 0.11 to compile).  0.11 features better code analysis, which is what it's warning about here.
parent 95ed7ae0
......@@ -124,7 +124,7 @@ SRC_FILES = \
FSpotDatabaseDriver.vala \
FSpotDatabaseTables.vala \
VideoSupport.vala \
VideosPage.vala \
VideosPage.vala \
Tombstone.vala \
MetadataWriter.vala \
Application.vala \
......@@ -216,7 +216,7 @@ ICON_FILES = \
shotwell-24.svg
HELP_FILES = \
edit-adjustments.page \
edit-adjustments.page \
edit-crop.page \
edit-enhance.page \
edit-external.page \
......@@ -410,9 +410,9 @@ LIBRAW_CONFIG=./libraw-config --windows
endif
$(LANG_STAMP): $(EXPANDED_PO_FILES)
$(foreach po,$(SUPPORTED_LANGUAGES),`mkdir -p $(LOCAL_LANG_DIR)/$(po)/LC_MESSAGES ; \
msgfmt -o $(LOCAL_LANG_DIR)/$(po)/LC_MESSAGES/shotwell.mo po/$(po).po`)
touch $(LANG_STAMP)
@$(foreach po,$(SUPPORTED_LANGUAGES),`mkdir -p $(LOCAL_LANG_DIR)/$(po)/LC_MESSAGES ; \
msgfmt -o $(LOCAL_LANG_DIR)/$(po)/LC_MESSAGES/shotwell.mo po/$(po).po`)
@touch $(LANG_STAMP)
clean:
rm -f $(EXPANDED_C_FILES)
......@@ -454,16 +454,16 @@ install:
cp misc/shotwell.desktop.head misc/shotwell.desktop
cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop
$(foreach lang,$(SUPPORTED_LANGUAGES), echo Name[$(lang)]=`TEXTDOMAINDIR=locale-langpack \
LANGUAGE=$(lang) gettext --domain=shotwell $(DESKTOP_APPLICATION_NAME)` \
>> misc/shotwell.desktop ; \
echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) \
gettext --domain=shotwell $(DESKTOP_APPLICATION_CLASS)` >> misc/shotwell.desktop ; \
echo Comment[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
--domain=shotwell $(DESKTOP_APPLICATION_COMMENT)` >> misc/shotwell.desktop ; \
echo Name[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
--domain=shotwell $(DIRECT_EDIT_DESKTOP_APPLICATION_NAME)` >> misc/shotwell-viewer.desktop ; \
echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
--domain=shotwell $(DIRECT_EDIT_DESKTOP_APPLICATION_CLASS)` >> misc/shotwell-viewer.desktop ;)
LANGUAGE=$(lang) gettext --domain=shotwell $(DESKTOP_APPLICATION_NAME)` \
>> misc/shotwell.desktop ; \
echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) \
gettext --domain=shotwell $(DESKTOP_APPLICATION_CLASS)` >> misc/shotwell.desktop ; \
echo Comment[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
--domain=shotwell $(DESKTOP_APPLICATION_COMMENT)` >> misc/shotwell.desktop ; \
echo Name[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
--domain=shotwell $(DIRECT_EDIT_DESKTOP_APPLICATION_NAME)` >> misc/shotwell-viewer.desktop ; \
echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
--domain=shotwell $(DIRECT_EDIT_DESKTOP_APPLICATION_CLASS)` >> misc/shotwell-viewer.desktop ;)
touch $(LANG_STAMP)
mkdir -p $(DESTDIR)$(PREFIX)/bin
$(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin
......@@ -501,8 +501,8 @@ ifndef DISABLE_HELP_INSTALL
endif
endif
-$(foreach lang,$(SUPPORTED_LANGUAGES),`mkdir -p $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES ; \
$(INSTALL_DATA) $(LOCAL_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo \
$(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`)
$(INSTALL_DATA) $(LOCAL_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo \
$(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`)
uninstall:
rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM)
......
......@@ -119,7 +119,7 @@ public class FullscreenWindow : PageWindow {
return monitor;
}
private override bool configure_event(Gdk.EventConfigure event) {
public override bool configure_event(Gdk.EventConfigure event) {
bool result = base.configure_event(event);
if (!switched_to) {
......@@ -142,7 +142,7 @@ public class FullscreenWindow : PageWindow {
return actions;
}
private override bool key_press_event(Gdk.EventKey event) {
public override bool key_press_event(Gdk.EventKey event) {
// check for an escape/abort
if (Gdk.keyval_name(event.keyval) == "Escape") {
on_close();
......@@ -161,7 +161,7 @@ public class FullscreenWindow : PageWindow {
AppWindow.get_instance().end_fullscreen();
}
private override void destroy() {
public override void destroy() {
Page? page = get_current_page();
clear_current_page();
......@@ -173,14 +173,14 @@ public class FullscreenWindow : PageWindow {
base.destroy();
}
private override bool delete_event(Gdk.Event event) {
public override bool delete_event(Gdk.Event event) {
on_close();
AppWindow.get_instance().destroy();
return true;
}
private override bool motion_notify_event(Gdk.EventMotion event) {
public override bool motion_notify_event(Gdk.EventMotion event) {
if (!is_toolbar_shown) {
// if pointer is in toolbar height range without the mouse down (i.e. in the middle of
// an edit operation) and it stays there the necessary amount of time, invoke the
......@@ -336,7 +336,7 @@ public abstract class PageWindow : Gtk.Window {
switched_pages(old_page, null);
}
private override bool key_press_event(Gdk.EventKey event) {
public override bool key_press_event(Gdk.EventKey event) {
if (keyboard_trapping == 0) {
if (current_page != null && current_page.notify_app_key_pressed(event))
return true;
......@@ -345,7 +345,7 @@ public abstract class PageWindow : Gtk.Window {
return (base.key_press_event != null) ? base.key_press_event(event) : false;
}
private override bool key_release_event(Gdk.EventKey event) {
public override bool key_release_event(Gdk.EventKey event) {
if (keyboard_trapping == 0) {
if (current_page != null && current_page.notify_app_key_released(event))
return true;
......@@ -354,21 +354,21 @@ public abstract class PageWindow : Gtk.Window {
return (base.key_release_event != null) ? base.key_release_event(event) : false;
}
private override bool focus_in_event(Gdk.EventFocus event) {
public override bool focus_in_event(Gdk.EventFocus event) {
if (current_page != null && current_page.notify_app_focus_in(event))
return true;
return (base.focus_in_event != null) ? base.focus_in_event(event) : false;
}
private override bool focus_out_event(Gdk.EventFocus event) {
public override bool focus_out_event(Gdk.EventFocus event) {
if (current_page != null && current_page.notify_app_focus_out(event))
return true;
return (base.focus_out_event != null) ? base.focus_out_event(event) : false;
}
private override bool configure_event(Gdk.EventConfigure event) {
public override bool configure_event(Gdk.EventConfigure event) {
if (current_page != null) {
if (current_page.notify_configure_event(event))
return true;
......@@ -673,7 +673,7 @@ public abstract class AppWindow : PageWindow {
}
}
private override void destroy() {
protected override void destroy() {
on_quit();
}
......@@ -832,7 +832,7 @@ public abstract class AppWindow : PageWindow {
page.get_view().select_all();
}
private override bool configure_event(Gdk.EventConfigure event) {
public override bool configure_event(Gdk.EventConfigure event) {
if (window.get_state() == Gdk.WindowState.MAXIMIZED)
maximized = !maximized;
......
......@@ -1139,7 +1139,7 @@ private class PrepareFilesJob : BackgroundImportJob {
return (value == null || value.length == 0) ? 0 : value.to_int();
}
private override void execute() {
public override void execute() {
Timer timer = new Timer();
Gee.ArrayList<PreparedFile> list = new Gee.ArrayList<PreparedFile>();
......@@ -1355,7 +1355,7 @@ private class PreparedFilesImportJob : BackgroundJob {
not_ready.add_all(prepared_files);
}
private override void execute() {
public override void execute() {
while (not_ready.size > 0) {
PreparedFile prepared_file = not_ready.remove_at(0);
process_prepared_file(prepared_file);
......
......@@ -1484,7 +1484,7 @@ public class CheckerboardLayout : Gtk.DrawingArea {
}
}
private override void map() {
public override void map() {
base.map();
selected_gc = new Gdk.GC(window);
......@@ -1541,13 +1541,13 @@ public class CheckerboardLayout : Gtk.DrawingArea {
background_gc.set_foreground(this.get_style().bg[Gtk.StateType.NORMAL]);
}
private override void size_allocate(Gdk.Rectangle allocation) {
public override void size_allocate(Gdk.Rectangle allocation) {
base.size_allocate(allocation);
viewport_resized();
}
private override bool expose_event(Gdk.EventExpose event) {
public override bool expose_event(Gdk.EventExpose event) {
// Note: It's possible for expose_event to be called when in_view is false; this happens
// when pages are switched prior to switched_to() being called, and some of the other
// controls allow for events to be processed while they are orienting themselves. Since
......@@ -1626,7 +1626,7 @@ public class CheckerboardLayout : Gtk.DrawingArea {
selection_band.width - 1, selection_band.height - 1);
}
private override bool query_tooltip(int x, int y, bool keyboard_mode, Gtk.Tooltip tooltip) {
public override bool query_tooltip(int x, int y, bool keyboard_mode, Gtk.Tooltip tooltip) {
CheckerboardItem? item = get_item_at_pixel(x, y);
return (item != null) ? item.query_tooltip(x, y, tooltip) : false;
......@@ -1637,14 +1637,14 @@ public class CheckerboardLayout : Gtk.DrawingArea {
set_colors();
}
private override bool focus_in_event(Gdk.EventFocus event) {
public override bool focus_in_event(Gdk.EventFocus event) {
set_colors(true);
items_dirty("focus_in_event", view.get_selected());
return base.focus_in_event(event);
}
private override bool focus_out_event(Gdk.EventFocus event) {
public override bool focus_out_event(Gdk.EventFocus event) {
set_colors(false);
items_dirty("focus_out_event", view.get_selected());
......
......@@ -806,20 +806,20 @@ public abstract class CollectionPage : MediaPage {
Config.get_instance().set_display_photo_tags(display);
}
private override bool on_ctrl_pressed(Gdk.EventKey? event) {
protected override bool on_ctrl_pressed(Gdk.EventKey? event) {
rotate_button.set_related_action(get_action("RotateCounterclockwise"));
rotate_button.set_label(Resources.ROTATE_CCW_LABEL);
return base.on_ctrl_pressed(event);
}
private override bool on_ctrl_released(Gdk.EventKey? event) {
protected override bool on_ctrl_released(Gdk.EventKey? event) {
rotate_button.set_related_action(get_action("RotateClockwise"));
rotate_button.set_label(Resources.ROTATE_CW_LABEL);
return base.on_ctrl_released(event);
}
private void set_display_tags(bool display) {
get_view().freeze_notifications();
get_view().set_property(Thumbnail.PROP_SHOW_TAGS, display);
......
......@@ -12,7 +12,8 @@ public class Config {
public const int HEIGHT_DEFAULT = 768;
public const int SIDEBAR_MIN_POSITION = 180;
public const int SIDEBAR_MAX_POSITION = 1000;
private const string DEFAULT_BG_COLOR = "#444";
public const string DEFAULT_BG_COLOR = "#444";
private const uint BLACK_THRESHOLD = 40000;
private const string DARK_SELECTED_COLOR = "#0AD";
private const string LIGHT_SELECTED_COLOR = "#2DF";
......
......@@ -58,7 +58,7 @@ public class DirectWindow : AppWindow {
update_title(photo.get_file(), photo.has_alterations());
}
private override void on_quit() {
protected override void on_quit() {
if (!get_direct_page().check_quit())
return;
......@@ -67,14 +67,14 @@ public class DirectWindow : AppWindow {
base.on_quit();
}
private override bool delete_event(Gdk.Event event) {
public override bool delete_event(Gdk.Event event) {
if (!get_direct_page().check_quit())
return true;
return (base.delete_event != null) ? base.delete_event(event) : false;
}
private override bool key_press_event(Gdk.EventKey event) {
public override bool key_press_event(Gdk.EventKey event) {
// check for an escape
if (Gdk.keyval_name(event.keyval) == "Escape") {
on_quit();
......
......@@ -41,7 +41,7 @@ public abstract class EditingToolWindow : Gtk.Window {
return user_moved;
}
private override bool button_press_event(Gdk.EventButton event) {
public override bool button_press_event(Gdk.EventButton event) {
// LMB only
if (event.button != 1)
return (base.button_press_event != null) ? base.button_press_event(event) : true;
......@@ -52,7 +52,7 @@ public abstract class EditingToolWindow : Gtk.Window {
return true;
}
private override void realize() {
public override void realize() {
set_opacity(Resources.TRANSIENT_WINDOW_OPACITY);
base.realize();
......
......@@ -94,7 +94,7 @@ class EventDirectoryItem : CheckerboardItem {
set_title(get_formatted_title(event), true, Pango.Alignment.CENTER);
}
private override void thumbnail_altered() {
protected override void thumbnail_altered() {
LibraryPhoto photo = event.get_primary_photo();
// get new center square
......
......@@ -1254,7 +1254,7 @@ public class ImportPage : CheckerboardPage {
on_view_changed();
}
private override void set_display_titles(bool display) {
public override void set_display_titles(bool display) {
base.set_display_titles(display);
Gtk.ToggleAction action = (Gtk.ToggleAction) action_group.get_action("ViewTitle");
......
......@@ -427,7 +427,7 @@ public class LibraryWindow : AppWindow {
return Resources.APP_LIBRARY_ROLE;
}
private override void on_quit() {
protected override void on_quit() {
Config.get_instance().set_library_window_state(maximized, dimensions);
Config.get_instance().set_sidebar_position(client_paned.position);
......@@ -437,7 +437,7 @@ public class LibraryWindow : AppWindow {
base.on_quit();
}
private override void on_fullscreen() {
protected override void on_fullscreen() {
CollectionPage collection = null;
Thumbnail start = null;
......@@ -701,7 +701,7 @@ public class LibraryWindow : AppWindow {
return Gdk.DragAction.DEFAULT;
}
private override bool drag_motion(Gdk.DragContext context, int x, int y, uint time) {
public override bool drag_motion(Gdk.DragContext context, int x, int y, uint time) {
Gdk.Atom target = Gtk.drag_dest_find_target(this, context, Gtk.drag_dest_get_target_list(this));
if (((int) target) == ((int) Gdk.NONE)) {
debug("drag target is GDK_NONE");
......@@ -728,7 +728,7 @@ public class LibraryWindow : AppWindow {
return true;
}
private override void drag_data_received(Gdk.DragContext context, int x, int y,
public override void drag_data_received(Gdk.DragContext context, int x, int y,
Gtk.SelectionData selection_data, uint info, uint time) {
if (selection_data.length < 0)
debug("failed to retrieve SelectionData");
......@@ -1772,7 +1772,7 @@ public class LibraryWindow : AppWindow {
}
#endif
private override bool key_press_event(Gdk.EventKey event) {
public override bool key_press_event(Gdk.EventKey event) {
return (sidebar.has_focus && Gdk.keyval_name(event.keyval) == "F2") ?
sidebar.key_press_event(event) : base.key_press_event(event);
}
......
......@@ -430,7 +430,7 @@ public abstract class Page : Gtk.ScrolledWindow, SidebarPage {
super = (mask & Gdk.ModifierType.MOD4_MASK) != 0; // not SUPER_MASK
}
private virtual void update_modifiers() {
private void update_modifiers() {
bool ctrl_currently_pressed, alt_currently_pressed, shift_currently_pressed,
super_currently_pressed;
get_modifiers(out ctrl_currently_pressed, out alt_currently_pressed,
......@@ -2005,7 +2005,7 @@ public abstract class SinglePhotoPage : Page {
internal_repaint(true);
}
private override void on_resize_finished(Gdk.Rectangle rect) {
protected override void on_resize_finished(Gdk.Rectangle rect) {
base.on_resize_finished(rect);
// when the resize is completed, do a high-quality repaint
......
......@@ -3880,7 +3880,7 @@ public class LibraryPhoto : Photo {
notify_thumbnail_altered();
}
private override void notify_altered(Alteration alteration) {
protected override void notify_altered(Alteration alteration) {
// generate new thumbnails in the background
if (!block_thumbnail_generation && alteration.has_subject("image"))
thumbnail_scheduler.at_priority_idle(Priority.LOW);
......@@ -4245,7 +4245,7 @@ public class DirectPhoto : Photo {
get_orientation().rotate_pixbuf(get_metadata().get_preview(0).get_pixbuf());
}
private override void notify_altered(Alteration alteration) {
protected override void notify_altered(Alteration alteration) {
preview = null;
base.notify_altered(alteration);
......
......@@ -4,7 +4,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
errordomain PhotoFormatError {
public errordomain PhotoFormatError {
READ_ONLY
}
......
......@@ -1177,13 +1177,13 @@ public abstract class EditingHostPage : SinglePhotoPage {
return false;
}
private override void on_resize(Gdk.Rectangle rect) {
protected override void on_resize(Gdk.Rectangle rect) {
base.on_resize(rect);
track_tool_window();
}
private override void on_resize_finished(Gdk.Rectangle rect) {
protected override void on_resize_finished(Gdk.Rectangle rect) {
// because we've loaded SinglePhotoPage with an image scaled to window size, as the window
// is resized it scales that, which pixellates, especially scaling upward. Once the window
// resize is complete, we get a fresh image for the new window's size
......@@ -1209,7 +1209,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
enhance_button.sensitive = photo != null ? is_enhance_available(photo) : false;
}
private override bool on_shift_pressed(Gdk.EventKey? event) {
protected override bool on_shift_pressed(Gdk.EventKey? event) {
// show quick compare of original only if no tool is in use, the original pixbuf is handy
if (current_tool == null && !get_ctrl_pressed() && !get_alt_pressed())
swap_in_original();
......@@ -1217,21 +1217,21 @@ public abstract class EditingHostPage : SinglePhotoPage {
return base.on_shift_pressed(event);
}
private override bool on_shift_released(Gdk.EventKey? event) {
protected override bool on_shift_released(Gdk.EventKey? event) {
if (current_tool == null)
swap_out_original();
return base.on_shift_released(event);
}
private override bool on_alt_pressed(Gdk.EventKey? event) {
protected override bool on_alt_pressed(Gdk.EventKey? event) {
if (current_tool == null)
swap_out_original();
return base.on_alt_pressed(event);
}
private override bool on_alt_released(Gdk.EventKey? event) {
protected override bool on_alt_released(Gdk.EventKey? event) {
if (current_tool == null && get_shift_pressed() && !get_ctrl_pressed())
swap_in_original();
......@@ -1423,7 +1423,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
return false;
}
private override bool on_right_click(Gdk.EventButton event) {
protected override bool on_right_click(Gdk.EventButton event) {
return on_context_buttonpress(event);
}
......@@ -1467,7 +1467,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
}
// Return true to block the DnD handler from activating a drag
private override bool on_motion(Gdk.EventMotion event, int x, int y, Gdk.ModifierType mask) {
protected override bool on_motion(Gdk.EventMotion event, int x, int y, Gdk.ModifierType mask) {
if (current_tool != null) {
current_tool.on_motion(x, y, mask);
return true;
......@@ -1501,7 +1501,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
}
}
private override void on_move(Gdk.Rectangle rect) {
protected override void on_move(Gdk.Rectangle rect) {
track_tool_window();
base.on_move(rect);
......@@ -1547,7 +1547,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
return true;
}
private override bool key_press_event(Gdk.EventKey event) {
public override bool key_press_event(Gdk.EventKey event) {
// editing tool gets first crack at the keypress
if (current_tool != null) {
if (current_tool.on_keypress(event))
......@@ -1749,7 +1749,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
}
#endif
private override bool on_ctrl_pressed(Gdk.EventKey? event) {
protected override bool on_ctrl_pressed(Gdk.EventKey? event) {
rotate_button.set_icon_name(Resources.COUNTERCLOCKWISE);
rotate_button.set_label(Resources.ROTATE_CCW_LABEL);
rotate_button.set_tooltip_text(Resources.ROTATE_CCW_TOOLTIP);
......@@ -1762,7 +1762,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
return base.on_ctrl_pressed(event);
}
private override bool on_ctrl_released(Gdk.EventKey? event) {
protected override bool on_ctrl_released(Gdk.EventKey? event) {
rotate_button.set_icon_name(Resources.CLOCKWISE);
rotate_button.set_label(Resources.ROTATE_CW_LABEL);
rotate_button.set_tooltip_text(Resources.ROTATE_CW_TOOLTIP);
......@@ -2575,7 +2575,7 @@ public class LibraryPhotoPage : EditingHostPage {
base.notify_photo_backing_missing(photo, missing);
}
private override bool key_press_event(Gdk.EventKey event) {
public override bool key_press_event(Gdk.EventKey event) {
if (base.key_press_event != null && base.key_press_event(event) == true)
return true;
......@@ -2661,13 +2661,13 @@ public class LibraryPhotoPage : EditingHostPage {
return base.on_left_released(event);
}
private override bool on_context_buttonpress(Gdk.EventButton event) {
protected override bool on_context_buttonpress(Gdk.EventButton event) {
popup_context_menu(context_menu, event);
return true;
}
private override bool on_context_keypress() {
protected override bool on_context_keypress() {
popup_context_menu(context_menu);
return true;
......@@ -3363,7 +3363,7 @@ public class DirectPhotoPage : EditingHostPage {
return false;
}
private override void realize() {
public override void realize() {
if (base.realize != null)
base.realize();
......@@ -3388,7 +3388,7 @@ public class DirectPhotoPage : EditingHostPage {
return get_photo().get_file();
}
private override bool on_context_buttonpress(Gdk.EventButton event) {
protected override bool on_context_buttonpress(Gdk.EventButton event) {
popup_context_menu(context_menu, event);
return true;
......@@ -3529,7 +3529,7 @@ public class DirectPhotoPage : EditingHostPage {
return check_ok_to_close_photo(get_photo());
}
private override bool confirm_replace_photo(Photo? old_photo, Photo new_photo) {
protected override bool confirm_replace_photo(Photo? old_photo, Photo new_photo) {
return (old_photo != null) ? check_ok_to_close_photo(old_photo) : true;
}
......
......@@ -132,7 +132,7 @@ private class BasicProperties : Properties {
public BasicProperties() {
}
private override void clear_properties() {
protected override void clear_properties() {
base.clear_properties();
title = "";
start_time = 0;
......@@ -146,7 +146,7 @@ private class BasicProperties : Properties {
clip_duration = 0.0;
}
private override void get_single_properties(DataView view) {
protected override void get_single_properties(DataView view) {
base.get_single_properties(view);
DataSource source = view.get_source();
......@@ -191,7 +191,7 @@ private class BasicProperties : Properties {
}
}
private override void get_multiple_properties(Gee.Iterable<DataView>? iter) {
protected override void get_multiple_properties(Gee.Iterable<DataView>? iter) {
base.get_multiple_properties(iter);
photo_count = 0;
......@@ -238,7 +238,7 @@ private class BasicProperties : Properties {
}
}
private override void get_properties(Page current_page) {
protected override void get_properties(Page current_page) {
base.get_properties(current_page);
if (end_time == 0)
......@@ -247,7 +247,7 @@ private class BasicProperties : Properties {
start_time = end_time;
}
private override void internal_update_properties(Page page) {
protected override void internal_update_properties(Page page) {
base.internal_update_properties(page);
// display the title if a Tag page
......@@ -491,7 +491,7 @@ private class ExtendedPropertiesWindow : Gtk.Window {
add(alignment);
}
private override bool button_press_event(Gdk.EventButton event) {
public override bool button_press_event(Gdk.EventButton event) {
// LMB only
if (event.button != 1)
return (base.button_press_event != null) ? base.button_press_event(event) : true;
......@@ -501,7 +501,7 @@ private class ExtendedPropertiesWindow : Gtk.Window {
return true;
}
private override bool key_press_event(Gdk.EventKey event) {
public override bool key_press_event(Gdk.EventKey event) {
// send through to AppWindow
return AppWindow.get_instance().key_press_event(event);
}
......
......@@ -493,7 +493,7 @@ public class Sidebar : Gtk.TreeView {
return (context_menu != null) ? page.popup_context_menu(context_menu, event) : false;
}
private override bool button_press_event(Gdk.EventButton event) {
public override bool button_press_event(Gdk.EventButton event) {
if (event.button == 3 && event.type == Gdk.EventType.BUTTON_PRESS) {
// single right click
Gtk.TreePath? path = get_path_from_event(event);
......@@ -514,7 +514,7 @@ public class Sidebar : Gtk.TreeView {
return base.button_press_event(event);
}
private override bool key_press_event(Gdk.EventKey event) {
public override bool key_press_event(Gdk.EventKey event) {
if (Gdk.keyval_name(event.keyval) == "Return" || Gdk.keyval_name(event.keyval) == "KP_Enter") {
toggle_branch_expansion(current_path);
return false;
......@@ -638,7 +638,7 @@ public class Sidebar : Gtk.TreeView {
}
}
private override void drag_data_received(Gdk.DragContext context, int x, int y,
public override void drag_data_received(Gdk.DragContext context, int x, int y,
Gtk.SelectionData selection_data, uint info, uint time) {
Gtk.TreePath path = null;
......@@ -652,7 +652,7 @@ public class Sidebar : Gtk.TreeView {
drop_received(context, x, y, selection_data, info, time, path, page);
}
private override bool drag_motion(Gdk.DragContext context, int x, int y, uint time) {
public override bool drag_motion(Gdk.DragContext context, int x, int y, uint time) {
// call the base signal to get rows with children to spring open
base.drag_motion(context, x, y, time);
......
......@@ -272,7 +272,7 @@ class SlideshowPage : SinglePhotoPage {
return true;
}
private override bool key_press_event(Gdk.EventKey event) {
public override bool key_press_event(Gdk.EventKey event) {
bool handled = true;
switch (Gdk.keyval_name(event.keyval)) {
case "space":
......
......@@ -102,7 +102,7 @@ public class TagSourceCollection : ContainerSourceCollection {
return found;
}
private override void notify_items_added(Gee.Iterable<DataObject> added) {
protected override void notify_items_added(Gee.Iterable<DataObject> added) {
foreach (DataObject object in added) {
Tag tag = (Tag) object;
......@@ -113,7 +113,7 @@ public class TagSourceCollection : ContainerSourceCollection {
base.notify_items_added(added);
}
private override void notify_items_removed(Gee.Iterable<DataObject> removed) {
protected override void notify_items_removed(Gee.Iterable<DataObject> removed) {
foreach (DataObject object in removed) {
Tag tag = (Tag) object;
......@@ -124,7 +124,7 @@ public class TagSourceCollection : ContainerSourceCollection {
base.notify_items_removed(removed);
}
public override void notify_items_altered(Gee.Map<DataObject, Alteration> map) {
protected override void notify_items_altered(Gee.Map<DataObject, Alteration> map) {
foreach (DataObject object in map.keys) {
Tag tag = (Tag) object;
......@@ -156,7 +156,7 @@ public class TagSourceCollection : ContainerSourceCollection {
return ((Tag *) a)->get_name().collate(((Tag *) b)->get_name());
}
public override void notify_container_contents_added(ContainerSource container,
protected override void notify_container_contents_added(ContainerSource container,
Gee.Collection<DataSource> added) {
Tag tag = (Tag) container;
Gee.Collection<LibraryPhoto> photos = (Gee.Collection<LibraryPhoto>) added;
......@@ -184,7 +184,7 @@ public class TagSourceCollection : ContainerSourceCollection {
base.notify_container_contents_added(container, added);
}
public override void notify_container_contents_removed(ContainerSource container,
protected override void notify_container_contents_removed(ContainerSource container,
Gee.Collection<DataSource> removed) {
Tag tag = (Tag) container;
Gee.Collection<LibraryPhoto> photos = (Gee.Collection<LibraryPhoto>) removed;
......
......@@ -203,7 +203,7 @@ public class Thumbnail : CheckerboardItem {
return alteration.has_detail("metadata", "rating");