Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Finish Removing Publishing #761

Merged
merged 1 commit into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions data/io.elementary.photos.gschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -233,20 +233,6 @@
</key>
</schema>

<schema id="io.elementary.photos.sharing" path="/io/elementary/photos/sharing/">
<key name="last-used-service" type="s">
<default>""</default>
<summary>last used publishing service</summary>
<description>A numeric code representing the last service to which photos were published</description>
</key>

<key name="default-service" type="i">
<default>1</default>
<summary>default publishing service</summary>
<description>A numeric code representing the last service to which photos were published</description>
</key>
</schema>

<schema id="io.elementary.photos.video" path="/io/elementary/photos/video/">
<key name="interpreter-state-cookie" type="i">
<default>-1</default>
Expand Down
5 changes: 0 additions & 5 deletions po/POTFILES
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,11 @@ src/photos/PngSupport.vala
src/photos/RawSupport.vala
src/photos/TiffSupport.vala
src/photos/WebPSupport.vala
src/plugins/PublishingInterfaces.vala
src/plugins/SpitInterfaces.vala
src/plugins/TransitionsInterfaces.vala
src/plugins/Plugins.vala
src/plugins/StandardHostInterface.vala
src/plugins/ManifestWidget.vala
src/publishing/APIGlue.vala
src/publishing/PublishingPluginHost.vala
src/publishing/PublishingUI.vala
src/publishing/Publishing.vala
src/searches/Branch.vala
src/searches/SearchBoolean.vala
src/sidebar/Branch.vala
Expand Down
18 changes: 0 additions & 18 deletions src/Views/CollectionPage.vala
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,6 @@ public abstract class CollectionPage : MediaPage {
var flip_action = get_action ("FlipHorizontally");
flip_action.bind_property ("sensitive", flip_button, "sensitive", BindingFlags.SYNC_CREATE);

var publish_button = new Gtk.Button.from_icon_name (Resources.PUBLISH, Gtk.IconSize.LARGE_TOOLBAR);
publish_button.tooltip_text = Resources.PUBLISH_TOOLTIP;
publish_button.clicked.connect (on_publish);

var publish_action = get_action ("Publish");
publish_action.bind_property ("sensitive", publish_button, "sensitive", BindingFlags.SYNC_CREATE);

enhance_button = new Gtk.ToggleButton ();
enhance_button.image = new Gtk.Image.from_icon_name (Resources.ENHANCE, Gtk.IconSize.LARGE_TOOLBAR);
enhance_button.tooltip_text = Resources.ENHANCE_TOOLTIP;
Expand All @@ -110,8 +103,6 @@ public abstract class CollectionPage : MediaPage {
toolbar.pack_start (rotate_button);
toolbar.pack_start (flip_button);
toolbar.pack_start (new Gtk.Separator (Gtk.Orientation.VERTICAL));
toolbar.pack_start (publish_button);
toolbar.pack_start (new Gtk.Separator (Gtk.Orientation.VERTICAL));
toolbar.pack_start (enhance_button);
toolbar.pack_end (show_sidebar_button);
toolbar.pack_end (zoom_assembly);
Expand Down Expand Up @@ -296,7 +287,6 @@ public abstract class CollectionPage : MediaPage {

protected override Gtk.ActionEntry[] init_collect_action_entries () {
Gtk.ActionEntry print = { "Print", null, null, "<Ctrl>P", null, on_print };
Gtk.ActionEntry publish = { "Publish", null, null, "<Ctrl><Shift>P", null, on_publish };
Gtk.ActionEntry rotate_right = { "RotateClockwise", null, null, "<Ctrl>R", null, on_rotate_clockwise };
Gtk.ActionEntry rotate_left = { "RotateCounterclockwise", null, null, "<Ctrl><Shift>R", null, on_rotate_counterclockwise };
Gtk.ActionEntry hflip = { "FlipHorizontally", null, null, null, null, on_flip_horizontally };
Expand All @@ -315,7 +305,6 @@ public abstract class CollectionPage : MediaPage {
Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
actions += copy;
actions += print;
actions += publish;
actions += rotate_right;
actions += rotate_left;
actions += hflip;
Expand Down Expand Up @@ -554,7 +543,6 @@ public abstract class CollectionPage : MediaPage {
set_action_sensitive ("NewEvent", has_selected);
set_action_sensitive ("Slideshow", page_has_photos && (!primary_is_video));
set_action_sensitive ("Print", (!selection_has_videos) && has_selected);
set_action_sensitive ("Publish", has_selected);
if (enhance_button != null) {
enhance_button.sensitive = (!selection_has_videos) && has_selected;
update_enhance_toggled ();
Expand Down Expand Up @@ -797,12 +785,6 @@ public abstract class CollectionPage : MediaPage {
get_command_manager ().execute (command);
}

private void on_publish () {
if (get_view ().get_selected_count () > 0)
PublishingUI.PublishingDialog.go (
(Gee.Collection<MediaSource>) get_view ().get_selected_sources ());
}

private void on_rotate_counterclockwise () {
if (get_view ().get_selected_count () == 0)
return;
Expand Down
1 change: 0 additions & 1 deletion src/Views/DirectPhotoPage.vala
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,6 @@ public class DirectPhotoPage : EditingHostPage {
bool sensitivity = !missing;
set_action_sensitive ("Save", sensitivity);
set_action_sensitive ("SaveAs", sensitivity);
set_action_sensitive ("Publish", sensitivity);
set_action_sensitive ("Print", sensitivity);
((SimpleAction) AppWindow.get_instance ().lookup_action (AppWindow.ACTION_JUMP_TO_FILE)).set_enabled (sensitivity);

Expand Down
9 changes: 0 additions & 9 deletions src/Views/LibraryPhotoPage.vala
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ public class LibraryPhotoPage : EditingHostPage {
protected override Gtk.ActionEntry[] init_collect_action_entries () {
Gtk.ActionEntry export = { "Export", null, null, "<Ctrl><Shift>E", null, on_export };
Gtk.ActionEntry print = { "Print", null, null, "<Ctrl>P", null, on_print };
Gtk.ActionEntry publish = { "Publish", null, null, "<Ctrl><Shift>P", null, on_publish };
Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", null, null, "<Shift>Delete", null, on_remove_from_library };
Gtk.ActionEntry move_to_trash = { "MoveToTrash", null, null, "Delete", null, on_move_to_trash };
Gtk.ActionEntry prev = { "PrevPhoto", null, null, null, null, on_previous_photo };
Expand Down Expand Up @@ -137,7 +136,6 @@ public class LibraryPhotoPage : EditingHostPage {
Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
actions += export;
actions += print;
actions += publish;
actions += remove_from_library;
actions += move_to_trash;
actions += prev;
Expand Down Expand Up @@ -369,7 +367,6 @@ public class LibraryPhotoPage : EditingHostPage {
protected override void update_ui (bool missing) {
bool sensitivity = !missing;

set_action_sensitive ("Publish", sensitivity);
set_action_sensitive ("Print", sensitivity);
((SimpleAction) AppWindow.get_instance ().lookup_action (AppWindow.ACTION_JUMP_TO_FILE)).set_enabled (sensitivity);

Expand Down Expand Up @@ -874,12 +871,6 @@ public class LibraryPhotoPage : EditingHostPage {
}
}

private void on_publish () {
if (get_view ().get_count () > 0)
PublishingUI.PublishingDialog.go (
(Gee.Collection<MediaSource>) get_view ().get_selected_sources ());
}

private void update_development_menu_item_sensitivity () {
PhotoFileFormat format = get_photo ().get_master_file_format () ;
set_action_sensitive ("RawDeveloper", format == PhotoFileFormat.RAW);
Expand Down
1 change: 0 additions & 1 deletion src/direct/Direct.vala
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ public void app_init () throws Error {
Plugins.init ();
Slideshow.init ();
PhotoFileFormat.init_supported ();
Publishing.init ();
assert (initial_file != null);

DirectPhoto.init (initial_file);
Expand Down
1 change: 0 additions & 1 deletion src/library/Library.vala
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ public void app_init () throws Error {
Plugins.init ();
Slideshow.init ();
PhotoFileFormat.init_supported ();
Publishing.init ();
Library.TrashSidebarEntry.init ();
Photo.develop_raw_photos_to_files = true;
}
Expand Down
6 changes: 0 additions & 6 deletions src/meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
library_files = files(
'plugins/PublishingInterfaces.vala',
'plugins/SpitInterfaces.vala',
'plugins/TransitionsInterfaces.vala'
)
Expand Down Expand Up @@ -142,11 +141,6 @@ photos_files = files(
'plugins/StandardHostInterface.vala',
'plugins/ManifestWidget.vala',

'publishing/APIGlue.vala',
'publishing/PublishingPluginHost.vala',
'publishing/PublishingUI.vala',
'publishing/Publishing.vala',

'searches/Branch.vala',
'searches/SearchBoolean.vala',

Expand Down
Loading