Merge lp:~hunternet93/midori/print-without-dialog into lp:midori

[Isaac Smith]

This branch adds a setting to allow printing directly to the default printer without showing a dialog box, useful for kiosks and other situations where immediate printing is desired. When the setting print-without dialog is set to true, then the dialog box is not shown, if print-without-dialog is false or unset then printing functions normally.

Please note I'm new to C, GTK/Glib, and Midori, so while the feature works fine it probably isn't implemented exactly as it should be.

[lp:~hunternet93/midori/print-without-dialog]

6468. By Launchpad Translations on behalf of midori on 2013-11-12

Launchpad automatic translations update.

[Cris Dywan (kalikiana)]

There's no need to put disclaimers around your code as this is version-controlled and all changes can be traced back to you line by line after merging. Instead you can add your name at the very top of the file with an email address.

Your code works fine. Me thinks this should be documented in the FAQ (wiki.xfce.org/midori/faq) after merging.

review: Approve

[Cris Dywan (kalikiana)]

A little clearer: when I say "no need" above, please remove the inline disclaimers before this can get in.

review: Needs Fixing

[lp:~hunternet93/midori/print-without-dialog]

6469. By Paweł Forysiuk on 2013-11-12

Fix building on Ubuntu 12.04

6470. By Cris Dywan on 2013-11-12

Don't use context-menu signal in WebKitGTK+ < 1.10.0

6471. By Launchpad Translations on behalf of midori on 2013-11-13

Launchpad automatic translations update.

6472. By gue5t <email address hidden> on 2013-11-14

Fix autoscrolling if page contains a frame with our custom error page

[Cris Dywan (kalikiana)]

Nice! Note we're in freeze and close to release so this branch will need to wait a few days before it can land since it's considered a feature.

review: Approve (commit-after-freeze)

[lp:~hunternet93/midori/print-without-dialog]

6473. By Cris Dywan on 2013-11-14

Fix check for found valac and mention VALAC variable

6474. By Paweł Forysiuk on 2013-11-15

Provide sensible default font suggestions on Win32

6475. By André Stösel on 2013-11-15

removed unused preference dialog and related code

6476. By André Stösel on 2013-11-15

Check all browsers for opened sessions and whether they're popups

6477. By André Stösel on 2013-11-15

Remove stored popup sessions from the database

6478. By Cris Dywan on 2013-11-16

Hide WEbGL preference if it is unavailable

6479. By gue5t <email address hidden> on 2013-11-16

Use correct signal when clearing the trash

6480. By Cris Dywan on 2013-11-16

Swap NULL-check with main frame check

6481. By Launchpad Translations on behalf of midori on 2013-11-17

Launchpad automatic translations update.

6482. By gue5t <email address hidden> on 2013-11-17

Tweak searching for resources when running from build folder

6483. By Paweł Forysiuk on 2013-11-18

Add copyright note to appdata file

6484. By Launchpad Translations on behalf of midori on 2013-11-19

Launchpad automatic translations update.

6485. By André Stösel on 2013-11-19

handle tab duplication

6486. By André Stösel on 2013-11-19

Open speed dial or homepage according to preference

6487. By Paweł Forysiuk on 2013-11-19

makedist: Try to use system defaults

6488. By André Stösel on 2013-11-20

instead of creating devpet status icon on extension load, create it only to show new messages

6489. By Cris Dywan on 2013-11-20

Bump version to 0.5.6

6490. By Launchpad Translations on behalf of midori on 2013-11-20

Launchpad automatic translations update.

6491. By Isaac Smith on 2013-11-21

Allow printing without confirmation dialog on kiosk setups

6492. By Matthew Boevink <email address hidden> on 2013-11-22

Add close tabs to right feature

6493. By Isaac Smith on 2013-11-22

Fixed bug in Webkit2-specific code

modified:
  midori/midori-view.c
unknown:
  HACKING.save

Unmerged revisions

6493. By Isaac Smith on 2013-11-22

Fixed bug in Webkit2-specific code

modified:
  midori/midori-view.c
unknown:
  HACKING.save

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-11-12 22:20:34 +0000
+++ midori/midori-view.c	2013-11-13 04:56:32 +0000
@@ -5226,9 +5226,17 @@
     GtkPrintSettings* settings = gtk_print_settings_new ();
     webkit_print_operation_set_print_settings (operation, settings);
     g_object_unref (settings);
-    webkit_print_operation_run_dialog (operation,
-        GTK_WINDOW (midori_browser_get_for_widget (view->web_view)));
+
+    if (katze_object_get_boolean (view->settings, "print-without-dialog")) {
+        webkit_print_operation_run (operation);
+    }
+    else {
+        webkit_print_operation_run_dialog (operation,
+            GTK_WINDOW (midori_browser_get_for_widget (view->web_view)));
+    }
     g_object_unref (operation);
+
+
 #else
     WebKitWebFrame* frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view));
     GtkPrintOperation* operation = gtk_print_operation_new ();
@@ -5237,8 +5245,15 @@
     g_signal_connect (operation, "create-custom-widget",
         G_CALLBACK (midori_view_print_create_custom_widget_cb), view);
     GError* error = NULL;
-    webkit_web_frame_print_full (frame, operation,
-        GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, &error);
+
+    if (katze_object_get_boolean (view->settings, "print-without-dialog")) {
+        webkit_web_frame_print_full (frame, operation,
+            GTK_PRINT_OPERATION_ACTION_PRINT, &error);
+    }
+    else {
+        webkit_web_frame_print_full (frame, operation,
+            GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, &error);
+    }
     g_object_unref (operation);
 
     if (error)

=== modified file 'midori/midori-websettings.c'
--- midori/midori-websettings.c	2013-11-04 20:59:15 +0000
+++ midori/midori-websettings.c	2013-11-13 04:56:32 +0000
@@ -64,6 +64,7 @@
     gchar* user_stylesheet_uri;
     gchar* user_stylesheet_uri_cached;
     GHashTable* user_stylesheets;
+    gboolean print_without_dialog;
 };
 
 struct _MidoriWebSettingsClass
@@ -99,6 +100,7 @@
     PROP_ENABLE_DNS_PREFETCHING,
     PROP_ENFORCE_FONT_FAMILY,
     PROP_USER_STYLESHEET_URI,
+    PROP_PRINT_WITHOUT_DIALOG,
 };
 
 GType
@@ -492,6 +494,16 @@
                                      flags));
 
     g_object_class_install_property (gobject_class,
+                                     PROP_PRINT_WITHOUT_DIALOG,
+                                     g_param_spec_boolean (
+                                     "print-without-dialog",
+                                     "Print without dialog",
+                                     "Print without showing a dialog box",
+                                     FALSE,
+                                     flags));
+
+
+    g_object_class_install_property (gobject_class,
                                      PROP_USER_STYLESHEET_URI,
                                      g_param_spec_string (
                                      "user-stylesheet-uri",
@@ -1017,7 +1029,7 @@
 
     case PROP_PROXY_TYPE:
         web_settings->proxy_type = g_value_get_enum (value);
-    break;
+        break;
     case PROP_IDENTIFY_AS:
         web_settings->identify_as = g_value_get_enum (value);
         if (web_settings->identify_as != MIDORI_IDENT_CUSTOM)
@@ -1101,6 +1113,9 @@
             midori_web_settings_process_stylesheets (web_settings, new_len - old_len);
         }
         break;
+    case PROP_PRINT_WITHOUT_DIALOG:
+        web_settings->print_without_dialog = g_value_get_boolean(value);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
         break;
@@ -1217,6 +1232,9 @@
             WEB_SETTINGS_STRING ("user-stylesheet-uri")));
 #endif
         break;
+    case PROP_PRINT_WITHOUT_DIALOG:
+        g_value_set_boolean (value, web_settings->print_without_dialog);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
         break;