Commit d46d1d31 authored by Jim Nelson's avatar Jim Nelson

#1188: Print multiple photos per page in various layouts. #3159: Print...

#1188: Print multiple photos per page in various layouts.  #3159: Print multiple photos on successive pages.  Both courtesy Nikola Radovanovic.
parent 74e259dc
......@@ -26,6 +26,7 @@ Rafael Monica <monraaf@gmail.com>
Paul Novak <pnovak@alumni.caltech.edu>
Evgeniy Polyakov <zbr@ioremap.net>
Siddhesh Poyarekar <siddhesh.poyarekar@gmail.com>
Nikola Radovanovic <nrad@eunet.rs>
Louis-Francis Ratté-Boulianne <louis-francis@ratte-boulianne.com>
Martin Robinson <martin.james.robinson@gmail.com>
Elliott S <quantum.analyst@gmail.com>
......
......@@ -320,7 +320,7 @@ public abstract class CollectionPage : MediaPage {
}
}
set_action_sensitive("Print", (!selection_has_videos) && one_selected);
set_action_sensitive("Print", (!selection_has_videos) && has_selected);
set_action_sensitive("Publish", has_selected);
set_action_important("Publish", true);
......@@ -333,8 +333,8 @@ public abstract class CollectionPage : MediaPage {
}
private void on_print() {
if (get_view().get_selected_count() == 1)
PrintManager.get_instance().spool_photo((Photo) get_view().get_selected_at(0).get_source());
if (get_view().get_selected_count() > 0)
PrintManager.get_instance().spool_photo((Gee.Collection<MediaSource>) get_view().get_selected_sources());
}
private void on_external_app_changed() {
......
......@@ -417,6 +417,14 @@ public class Config {
return get_int("/apps/shotwell/printing/size_selection", 1) - 1;
}
public bool set_image_per_page_selection(int image_per_page) {
return set_int("/apps/shotwell/printing/image_per_page_selection", image_per_page + 1);
}
public int get_image_per_page_selection() {
return get_int("/apps/shotwell/printing/image_per_page_selection", 1) - 1;
}
public bool set_printing_match_aspect_ratio(bool match_aspect_ratio) {
return set_bool("/apps/shotwell/printing/match_aspect_ratio", match_aspect_ratio);
}
......@@ -425,6 +433,22 @@ public class Config {
return get_bool("/apps/shotwell/printing/match_aspect_ratio", true);
}
public bool set_printing_print_titles(bool print_titles) {
return set_bool("/apps/shotwell/printing/print_titles", print_titles);
}
public bool get_printing_print_titles() {
return get_bool("/apps/shotwell/printing/print_titles", true);
}
public bool set_printing_print_titles_font(string font_name) {
return set_string("/apps/shotwell/printing/print_titles_font", font_name);
}
public string get_printing_print_titles_font() {
return get_string("/apps/shotwell/printing/print_titles_font", "Sans Bold 12");
}
public bool set_display_basic_properties(bool display) {
return set_bool("/apps/shotwell/preferences/ui/display_basic_properties", display);
}
......@@ -838,4 +862,4 @@ public class Config {
public void set_use_lowercase_filenames(bool b) {
set_bool(PATH_SHOTWELL_PREFS + "/files/user_lowercase_filenames", b);
}
}
}
\ No newline at end of file
......@@ -2903,7 +2903,7 @@ public class LibraryPhotoPage : EditingHostPage {
}
private void on_print() {
PrintManager.get_instance().spool_photo(get_photo());
PrintManager.get_instance().spool_photo((Gee.Collection<MediaSource>) get_view().get_selected_sources());
}
private void on_external_app_changed() {
......
This diff is collapsed.
......@@ -534,7 +534,7 @@ public class DirectPhotoPage : EditingHostPage {
}
private void on_print() {
PrintManager.get_instance().spool_photo(get_photo());
PrintManager.get_instance().spool_photo((Gee.Collection<MediaSource>) get_view().get_selected_sources());
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment