Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s/impl/dialog/ Don't prefix static functions with _

Browse Source 
2006-03-27  Alexander Larsson  <alexl@redhat.com>

	* gtk/gtkpagesetupunixdialog.c:
	* gtk/gtkprintjob.c:
	* gtk/gtkprintoperation-unix.c:
	* gtk/gtkprintunixdialog.c:
	s/impl/dialog/
	Don't prefix static functions with _
This commit is contained in:
Alexander Larsson
2006-03-27 10:20:17 +00:00
committed by Alexander Larsson
parent fc175bab20
commit 9cb581126d
7 changed files with 115 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2006-03-27 Alexander Larsson <alexl@redhat.com>
* gtk/gtkpagesetupunixdialog.c:
* gtk/gtkprintjob.c:
* gtk/gtkprintoperation-unix.c:
* gtk/gtkprintunixdialog.c:
s/impl/dialog/
Don't prefix static functions with _
2006-03-26 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprintunixdialog.c: Don't use _(""). (#335898,

9
ChangeLog.pre-2-10
View File

@@ -1,3 +1,12 @@
2006-03-27 Alexander Larsson <alexl@redhat.com>
* gtk/gtkpagesetupunixdialog.c:
* gtk/gtkprintjob.c:
* gtk/gtkprintoperation-unix.c:
* gtk/gtkprintunixdialog.c:
s/impl/dialog/
Don't prefix static functions with _
2006-03-26 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprintunixdialog.c: Don't use _(""). (#335898,

47
TODO.printing Normal file
View File

@@ -0,0 +1,47 @@
Temporary file with stuff left to do in the printing work:
Highlevel API:
* Add a way to make the cairo printing callbacks (optionally) happen in a thread
* Add API to EggPrintOperation to handle job status feedback while printing.
Needs something like "job_status_changed" and "job_finished" signals
Also during page generation. Should have progress bar?
* Add API to allow the app to add a custom tab with gtk+ widgets to the
print dialog. We can hopefully implement this on osx & win32.
* Want a print preview API.
full-preview (evince-style) or in-dialog preview, or both?
Lowlevel API:
* Figure out the best way to configure module loading (textfile, gtkrc or
just frob the modules directory)
PDF backend:
* Change to using a GtkFileChooserEntry to get file names when we move to
GTK. It is a private object in GTK right now.
Win32:
* Use threads for the dialog, to allow repaints of other windows while they are up
Cups/Unix print dialog:
* page setup layout-for-printer isn't saved
* Finish the various manual_* stuff
* finish job page print-at-time support
* Use themed icons - need icons
* HIG spacing
* Add custom translations for a lot of standard PPD options
* Actually get default printer from somewhere
* reorder printer columns? The status column is very wide
* Don't select default for a short while, so that we can avoid flashing if the selected printer appears
* Add nicer scaling to print dialog (scale to fit page size)
General:
* should base64 move to glib ?
Page setting dialog:
* land/port icons
* HIG spacing
* null in printer names
* support printer delete
* sort paper lists
* nicer unit editor than spinbutton

40
gtk/gtkpagesetupunixdialog.c
View File

@@ -433,9 +433,9 @@ gtk_page_setup_unix_dialog_finalize (GObject *object)
}
static void
_printer_added_cb (GtkPrintBackend *backend,
GtkPrinter *printer,
GtkPageSetupUnixDialog *dialog)
printer_added_cb (GtkPrintBackend *backend,
GtkPrinter *printer,
GtkPageSetupUnixDialog *dialog)
{
GtkTreeIter iter;
char *str;
@@ -465,23 +465,23 @@ _printer_added_cb (GtkPrintBackend *backend,
}
static void
_printer_removed_cb (GtkPrintBackend *backend,
GtkPrinter *printer,
GtkPageSetupUnixDialog *impl)
printer_removed_cb (GtkPrintBackend *backend,
GtkPrinter *printer,
GtkPageSetupUnixDialog *dialog)
{
}
static void
_printer_status_cb (GtkPrintBackend *backend,
printer_status_cb (GtkPrintBackend *backend,
GtkPrinter *printer,
GtkPageSetupUnixDialog *impl)
GtkPageSetupUnixDialog *dialog)
{
}
static void
_printer_list_initialize (GtkPageSetupUnixDialog *impl,
GtkPrintBackend *print_backend)
printer_list_initialize (GtkPageSetupUnixDialog *dialog,
GtkPrintBackend *print_backend)
{
GList *list, *node;
@@ -490,25 +490,25 @@ _printer_list_initialize (GtkPageSetupUnixDialog *impl,
g_signal_connect (print_backend,
"printer-added",
(GCallback) _printer_added_cb,
impl);
(GCallback) printer_added_cb,
dialog);
g_signal_connect (print_backend,
"printer-removed",
(GCallback) _printer_removed_cb,
impl);
(GCallback) printer_removed_cb,
dialog);
g_signal_connect (print_backend,
"printer-status-changed",
(GCallback) _printer_status_cb,
impl);
(GCallback) printer_status_cb,
dialog);
list = gtk_print_backend_get_printer_list (print_backend);
node = list;
while (node != NULL)
{
_printer_added_cb (print_backend, node->data, impl);
printer_added_cb (print_backend, node->data, dialog);
node = node->next;
}
@@ -517,7 +517,7 @@ _printer_list_initialize (GtkPageSetupUnixDialog *impl,
}
static void
_load_print_backends (GtkPageSetupUnixDialog *dialog)
load_print_backends (GtkPageSetupUnixDialog *dialog)
{
GList *node;
@@ -525,7 +525,7 @@ _load_print_backends (GtkPageSetupUnixDialog *dialog)
dialog->priv->print_backends = gtk_print_backend_load_modules ();
for (node = dialog->priv->print_backends; node != NULL; node = node->next)
_printer_list_initialize (dialog, GTK_PRINT_BACKEND (node->data));
printer_list_initialize (dialog, GTK_PRINT_BACKEND (node->data));
}
static gboolean
@@ -1072,7 +1072,7 @@ populate_dialog (GtkPageSetupUnixDialog *dialog)
g_signal_connect (dialog->priv->printer_combo, "changed", G_CALLBACK (printer_changed_callback), dialog);
gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->printer_combo), 0);
_load_print_backends (dialog);
load_print_backends (dialog);
}
GtkWidget *

26
gtk/gtkprintjob.c
View File

@@ -269,28 +269,28 @@ gtk_print_job_set_property (GObject *object,
GParamSpec *pspec)
{
GtkPrintJob *impl = GTK_PRINT_JOB (object);
GtkPrintJob *job = GTK_PRINT_JOB (object);
switch (prop_id)
{
case GTK_PRINT_JOB_PROP_TITLE:
impl->priv->title = g_value_dup_string (value);
job->priv->title = g_value_dup_string (value);
break;
case GTK_PRINT_JOB_PROP_PRINTER:
impl->priv->printer = GTK_PRINTER (g_value_dup_object (value));
impl->priv->printer_set = TRUE;
impl->priv->backend = g_object_ref (gtk_printer_get_backend (impl->priv->printer));
job->priv->printer = GTK_PRINTER (g_value_dup_object (value));
job->priv->printer_set = TRUE;
job->priv->backend = g_object_ref (gtk_printer_get_backend (job->priv->printer));
break;
case GTK_PRINT_JOB_PROP_PAGE_SETUP:
impl->priv->page_setup = GTK_PAGE_SETUP (g_value_dup_object (value));
impl->priv->page_setup_set = TRUE;
job->priv->page_setup = GTK_PAGE_SETUP (g_value_dup_object (value));
job->priv->page_setup_set = TRUE;
break;
case GTK_PRINT_JOB_PROP_SETTINGS:
impl->priv->settings = GTK_PRINT_SETTINGS (g_value_dup_object (value));
impl->priv->settings_set = TRUE;
job->priv->settings = GTK_PRINT_SETTINGS (g_value_dup_object (value));
job->priv->settings_set = TRUE;
break;
default:
@@ -305,18 +305,18 @@ gtk_print_job_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
GtkPrintJob *impl = GTK_PRINT_JOB (object);
GtkPrintJob *job = GTK_PRINT_JOB (object);
switch (prop_id)
{
case GTK_PRINT_JOB_PROP_PRINTER:
g_value_set_object (value, impl->priv->printer);
g_value_set_object (value, job->priv->printer);
break;
case GTK_PRINT_JOB_PROP_SETTINGS:
g_value_set_object (value, impl->priv->settings);
g_value_set_object (value, job->priv->settings);
break;
case GTK_PRINT_JOB_PROP_PAGE_SETUP:
g_value_set_object (value, impl->priv->page_setup);
g_value_set_object (value, job->priv->page_setup);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);

6
gtk/gtkprintoperation-unix.c
View File

@@ -61,7 +61,7 @@ unix_end_page (GtkPrintOperation *op,
}
static void
_op_unix_free (GtkPrintOperationUnix *op_unix)
op_unix_free (GtkPrintOperationUnix *op_unix)
{
if (op_unix->job)
g_object_unref (G_OBJECT (op_unix->job));
@@ -81,7 +81,7 @@ unix_finish_send (GtkPrintJob *job,
parent = op_unix->parent;
_op_unix_free (op_unix);
op_unix_free (op_unix);
if (error != NULL && *error != NULL)
{
@@ -172,7 +172,7 @@ _gtk_print_operation_platform_backend_run_dialog (GtkPrintOperation *op,
if (error != NULL && *error != NULL)
{
*do_print = FALSE;
_op_unix_free (op_unix);
op_unix_free (op_unix);
result = GTK_PRINT_OPERATION_RESULT_ERROR;
goto out;
}

29
gtk/gtkprintunixdialog.c
View File

@@ -474,12 +474,12 @@ printer_removed_cb (GtkPrintBackend *backend,
static void
printer_status_cb (GtkPrintBackend *backend,
GtkPrinter *printer,
GtkPrintUnixDialog *impl)
GtkPrintUnixDialog *dialog)
{
GtkTreeIter *iter;
iter = g_object_get_data (G_OBJECT (printer), "gtk-print-tree-iter");
gtk_list_store_set (GTK_LIST_STORE (impl->priv->printer_list), iter,
gtk_list_store_set (GTK_LIST_STORE (dialog->priv->printer_list), iter,
PRINTER_LIST_COL_ICON, gtk_printer_get_icon_name (printer),
PRINTER_LIST_COL_STATE, gtk_printer_get_state_message (printer),
PRINTER_LIST_COL_JOBS, gtk_printer_get_job_count (printer),
@@ -537,7 +537,7 @@ printer_added_cb (GtkPrintBackend *backend,
}
static void
printer_list_initialize (GtkPrintUnixDialog *impl,
printer_list_initialize (GtkPrintUnixDialog *dialog,
GtkPrintBackend *print_backend)
{
GList *list;
@@ -549,24 +549,24 @@ printer_list_initialize (GtkPrintUnixDialog *impl,
g_signal_connect (print_backend,
"printer-added",
(GCallback) printer_added_cb,
impl);
dialog);
g_signal_connect (print_backend,
"printer-removed",
(GCallback) printer_removed_cb,
impl);
dialog);
g_signal_connect (print_backend,
"printer-status-changed",
(GCallback) printer_status_cb,
impl);
dialog);
list = gtk_print_backend_get_printer_list (print_backend);
node = list;
while (node != NULL)
{
printer_added_cb (print_backend, node->data, impl);
printer_added_cb (print_backend, node->data, dialog);
node = node->next;
}
@@ -574,15 +574,15 @@ printer_list_initialize (GtkPrintUnixDialog *impl,
}
static void
_load_print_backends (GtkPrintUnixDialog *impl)
load_print_backends (GtkPrintUnixDialog *dialog)
{
GList *node;
if (g_module_supported ())
impl->priv->print_backends = gtk_print_backend_load_modules ();
dialog->priv->print_backends = gtk_print_backend_load_modules ();
for (node = impl->priv->print_backends; node != NULL; node = node->next)
printer_list_initialize (impl, GTK_PRINT_BACKEND (node->data));
for (node = dialog->priv->print_backends; node != NULL; node = node->next)
printer_list_initialize (dialog, GTK_PRINT_BACKEND (node->data));
}
static void
@@ -690,7 +690,7 @@ default_printer_list_sort_func (GtkTreeModel *model,
static void
_create_printer_list_model (GtkPrintUnixDialog *dialog)
create_printer_list_model (GtkPrintUnixDialog *dialog)
{
GtkListStore *model;
GtkTreeSortable *sort;
@@ -2020,7 +2020,7 @@ populate_dialog (GtkPrintUnixDialog *dialog)
priv = dialog->priv;
_create_printer_list_model (dialog);
create_printer_list_model (dialog);
priv->notebook = gtk_notebook_new ();
@@ -2072,8 +2072,7 @@ populate_dialog (GtkPrintUnixDialog *dialog)
gtk_widget_show (dialog->priv->notebook);
_load_print_backends (dialog);
load_print_backends (dialog);
}
/**