diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/file.cpp | 16 | ||||
| -rw-r--r-- | src/file.h | 5 | ||||
| -rw-r--r-- | src/menus-skeleton.h | 7 | ||||
| -rw-r--r-- | src/print.cpp | 2 | ||||
| -rw-r--r-- | src/print.h | 2 | ||||
| -rw-r--r-- | src/verbs.cpp | 5 | ||||
| -rw-r--r-- | src/verbs.h | 1 |
7 files changed, 3 insertions, 35 deletions
diff --git a/src/file.cpp b/src/file.cpp index 9b5f39312..355b1c50a 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -1379,23 +1379,9 @@ sp_file_print(Gtk::Window& parentWindow) { SPDocument *doc = SP_ACTIVE_DOCUMENT; if (doc) - sp_print_document(parentWindow, doc, FALSE); + sp_print_document(parentWindow, doc); } - -/** - * Print the current document, if any. Do not use - * the machine's print drivers. - */ -void -sp_file_print_direct(Gtk::Window& parentWindow) -{ - SPDocument *doc = SP_ACTIVE_DOCUMENT; - if (doc) - sp_print_document(parentWindow, doc, TRUE); -} - - /** * Display what the drawing would look like, if * printed. diff --git a/src/file.h b/src/file.h index f3ba1576b..e90e555bb 100644 --- a/src/file.h +++ b/src/file.h @@ -184,11 +184,6 @@ void sp_file_print (Gtk::Window& parentWindow); /** * */ -void sp_file_print_direct (Gtk::Window& parentWindow); - -/** - * - */ void sp_file_print_preview (gpointer object, gpointer data); /*##################### diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h index c039dcefd..bdbbc51de 100644 --- a/src/menus-skeleton.h +++ b/src/menus-skeleton.h @@ -34,13 +34,6 @@ static char const menus_skeleton[] = " <verb verb-id=\"FileExportToOCAL\" />\n" #endif " <separator/>\n" -/* These are ugly, but what needs to happen here is allowing users - to use the native PS support if they are using another print driver. - This is done through the "Print Direct" command. Which is inserted - here based on if those other drivers are being built. */ -#ifdef WIN32 -" <verb verb-id=\"FilePrintDirect\" />\n" -#endif " <verb verb-id=\"FilePrint\" />\n" " <separator/>\n" " <verb verb-id=\"FileVacuum\" />\n" diff --git a/src/print.cpp b/src/print.cpp index a24a01ff7..cc5d8c0a1 100644 --- a/src/print.cpp +++ b/src/print.cpp @@ -123,7 +123,7 @@ sp_print_preview_document(SPDocument *doc) } void -sp_print_document(Gtk::Window& parentWindow, SPDocument *doc, unsigned int /*direct*/) +sp_print_document(Gtk::Window& parentWindow, SPDocument *doc) { sp_document_ensure_up_to_date(doc); diff --git a/src/print.h b/src/print.h index 69d4f8369..3109b4947 100644 --- a/src/print.h +++ b/src/print.h @@ -41,7 +41,7 @@ void sp_print_get_param(SPPrintContext *ctx, gchar *name, bool *value); /* UI */ void sp_print_preview_document(SPDocument *doc); -void sp_print_document(Gtk::Window& parentWindow, SPDocument *doc, unsigned int direct); +void sp_print_document(Gtk::Window& parentWindow, SPDocument *doc); void sp_print_document_to_file(SPDocument *doc, gchar const *filename); diff --git a/src/verbs.cpp b/src/verbs.cpp index e96eca2ce..53650a262 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -784,9 +784,6 @@ FileVerb::perform(SPAction *action, void *data, void */*pdata*/) case SP_VERB_FILE_VACUUM: sp_file_vacuum(); break; - case SP_VERB_FILE_PRINT_DIRECT: - sp_file_print_direct(*parent); - break; case SP_VERB_FILE_PRINT_PREVIEW: sp_file_print_preview(NULL, NULL); break; @@ -2136,8 +2133,6 @@ Verb *Verb::_base_verbs[] = { // TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions) new FileVerb(SP_VERB_FILE_VACUUM, "FileVacuum", N_("Vac_uum Defs"), N_("Remove unused definitions (such as gradients or clipping paths) from the <defs> of the document"), "file_vacuum" ), - new FileVerb(SP_VERB_FILE_PRINT_DIRECT, "FilePrintDirect", N_("Print _Direct"), - N_("Print directly without prompting to a file or pipe"), NULL ), new FileVerb(SP_VERB_FILE_PRINT_PREVIEW, "FilePrintPreview", N_("Print Previe_w"), N_("Preview document printout"), GTK_STOCK_PRINT_PREVIEW ), new FileVerb(SP_VERB_FILE_IMPORT, "FileImport", N_("_Import..."), diff --git a/src/verbs.h b/src/verbs.h index fce826c8f..9f5cbe3c8 100644 --- a/src/verbs.h +++ b/src/verbs.h @@ -37,7 +37,6 @@ enum { SP_VERB_FILE_SAVE_A_COPY, /**< Save a copy of the current file */ SP_VERB_FILE_PRINT, SP_VERB_FILE_VACUUM, - SP_VERB_FILE_PRINT_DIRECT, SP_VERB_FILE_PRINT_PREVIEW, SP_VERB_FILE_IMPORT, SP_VERB_FILE_EXPORT, |