summaryrefslogtreecommitdiff
path: root/src/camera/ImportPage.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2018-10-01 07:17:16 +0200
committerJörg Frings-Fürst <debian@jff.email>2018-10-01 07:17:16 +0200
commit71137cc5832110d91599d68790402cf196762ed3 (patch)
treee7985bbfb6ca50ea738b38a9f852ee51431d48a7 /src/camera/ImportPage.vala
parent8ae550d463720d5d1c0e253af29843ff15de1a54 (diff)
parent1e92964463e564bb3359a7110342182fcfdc67f2 (diff)
Merge branch 'release/debian/0.30.1-1'debian/0.30.1-1
Diffstat (limited to 'src/camera/ImportPage.vala')
-rw-r--r--src/camera/ImportPage.vala16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
index f7698a6..0839590 100644
--- a/src/camera/ImportPage.vala
+++ b/src/camera/ImportPage.vala
@@ -272,11 +272,7 @@ class ImportPreview : MediaSourceItem {
base(source, Dimensions(), source.get_name(), null);
this.duplicated_file = null;
-
- // draw sprocket holes as visual indications on video previews
- if (source is VideoImportSource)
- set_enable_sprockets(true);
-
+
// scale down pixbuf if necessary
Gdk.Pixbuf pixbuf = null;
try {
@@ -394,6 +390,10 @@ class ImportPreview : MediaSourceItem {
public ImportSource get_import_source() {
return (ImportSource) get_source();
}
+
+ protected override Gdk.Pixbuf? get_top_left_trinket(int scale) {
+ return (get_import_source() is VideoImportSource) ? Resources.get_video_trinket (scale) : null;
+ }
}
public class CameraViewTracker : Core.ViewTracker {
@@ -802,7 +802,7 @@ public class ImportPage : CheckerboardPage {
// Find button
Gtk.ToggleToolButton find_button = new Gtk.ToggleToolButton();
- find_button.set_icon_name("edit-find");
+ find_button.set_icon_name("edit-find-symbolic");
find_button.set_action_name ("win.CommonDisplaySearchbar");
toolbar.insert(find_button, -1);
@@ -812,7 +812,7 @@ public class ImportPage : CheckerboardPage {
// Import selected
Gtk.ToolButton import_selected_button = new Gtk.ToolButton(null, null);
- import_selected_button.set_icon_name("import");
+ import_selected_button.set_icon_name(Resources.IMPORT);
import_selected_button.set_label(_("Import _Selected"));
import_selected_button.is_important = true;
import_selected_button.use_underline = true;
@@ -822,7 +822,7 @@ public class ImportPage : CheckerboardPage {
// Import all
Gtk.ToolButton import_all_button = new Gtk.ToolButton(null, null);
- import_all_button.set_icon_name("import-all");
+ import_all_button.set_icon_name(Resources.IMPORT_ALL);
import_all_button.set_label(_("Import _All"));
import_all_button.is_important = true;
import_all_button.use_underline = true;