projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
06289ea
)
Add hint paramater to Window Load method
author
John Darrington
<john@darrington.wattle.id.au>
Sat, 18 May 2013 14:36:16 +0000
(16:36 +0200)
committer
John Darrington
<john@darrington.wattle.id.au>
Fri, 24 May 2013 15:19:54 +0000
(17:19 +0200)
src/ui/gui/psppire-data-window.c
patch
|
blob
|
history
src/ui/gui/psppire-data-window.h
patch
|
blob
|
history
src/ui/gui/psppire-syntax-window.c
patch
|
blob
|
history
src/ui/gui/psppire-window.c
patch
|
blob
|
history
src/ui/gui/psppire-window.h
patch
|
blob
|
history
src/ui/gui/psppire.c
patch
|
blob
|
history
diff --git
a/src/ui/gui/psppire-data-window.c
b/src/ui/gui/psppire-data-window.c
index f36283289f324e7779b46f9175eee82b93013771..927f9d5de3dc90c5b671a6c00712821be53cffe4 100644
(file)
--- a/
src/ui/gui/psppire-data-window.c
+++ b/
src/ui/gui/psppire-data-window.c
@@
-336,7
+336,7
@@
name_has_suffix (const gchar *name)
}
static gboolean
}
static gboolean
-load_file (PsppireWindow *de, const gchar *file_name)
+load_file (PsppireWindow *de, const gchar *file_name
, gpointer not_used
)
{
struct string filename;
gchar *utf8_file_name;
{
struct string filename;
gchar *utf8_file_name;
@@
-701,7
+701,7
@@
on_recent_data_select (GtkMenuShell *menushell,
g_free (uri);
g_free (uri);
- open_data_window (window, file);
+ open_data_window (window, file
, NULL
);
g_free (file);
}
g_free (file);
}
@@
-764,7
+764,7
@@
on_recent_files_select (GtkMenuShell *menushell, gpointer user_data)
free (encoding);
free (encoding);
- if ( psppire_window_load (PSPPIRE_WINDOW (se), file) )
+ if ( psppire_window_load (PSPPIRE_WINDOW (se), file
, NULL
) )
gtk_widget_show (se);
else
gtk_widget_destroy (se);
gtk_widget_show (se);
else
gtk_widget_destroy (se);
@@
-1317,7
+1317,7
@@
create_data_window (void)
}
void
}
void
-open_data_window (PsppireWindow *victim, const char *file_name)
+open_data_window (PsppireWindow *victim, const char *file_name
, gpointer hint
)
{
GtkWidget *window;
{
GtkWidget *window;
@@
-1330,7
+1330,7
@@
open_data_window (PsppireWindow *victim, const char *file_name)
else
window = psppire_data_window_new (NULL);
else
window = psppire_data_window_new (NULL);
- psppire_window_load (PSPPIRE_WINDOW (window), file_name);
+ psppire_window_load (PSPPIRE_WINDOW (window), file_name
, hint
);
gtk_widget_show_all (window);
}
gtk_widget_show_all (window);
}
diff --git
a/src/ui/gui/psppire-data-window.h
b/src/ui/gui/psppire-data-window.h
index d63f49aed751a70c4ae40da32109d01d28b1207a..63510b397b3da080b9252d4bdeee87121aa5556d 100644
(file)
--- a/
src/ui/gui/psppire-data-window.h
+++ b/
src/ui/gui/psppire-data-window.h
@@
-95,7
+95,7
@@
PsppireDataWindow *psppire_data_window_for_data_store (PsppireDataStore *);
bool psppire_data_window_is_empty (PsppireDataWindow *);
void create_data_window (void);
bool psppire_data_window_is_empty (PsppireDataWindow *);
void create_data_window (void);
-void open_data_window (PsppireWindow *victim, const char *file_name);
+void open_data_window (PsppireWindow *victim, const char *file_name
, gpointer hint
);
G_END_DECLS
G_END_DECLS
diff --git
a/src/ui/gui/psppire-syntax-window.c
b/src/ui/gui/psppire-syntax-window.c
index 0c05fdc58e167436ac0419faaf118ca894f3f200..854ff700bd0dd81692c3dc4ffbd7657c78a286a7 100644
(file)
--- a/
src/ui/gui/psppire-syntax-window.c
+++ b/
src/ui/gui/psppire-syntax-window.c
@@
-669,7
+669,7
@@
load_and_show_syntax_window (GtkWidget *se, const gchar *filename)
gboolean ok;
gtk_source_buffer_begin_not_undoable_action (PSPPIRE_SYNTAX_WINDOW (se)->buffer);
gboolean ok;
gtk_source_buffer_begin_not_undoable_action (PSPPIRE_SYNTAX_WINDOW (se)->buffer);
- ok = psppire_window_load (PSPPIRE_WINDOW (se), filename);
+ ok = psppire_window_load (PSPPIRE_WINDOW (se), filename
, NULL
);
gtk_source_buffer_end_not_undoable_action (PSPPIRE_SYNTAX_WINDOW (se)->buffer);
if (ok )
gtk_source_buffer_end_not_undoable_action (PSPPIRE_SYNTAX_WINDOW (se)->buffer);
if (ok )
@@
-944,7
+944,7
@@
error_dialog (GtkWindow *w, const gchar *filename, GError *err)
Loads the buffer from the file called FILENAME
*/
gboolean
Loads the buffer from the file called FILENAME
*/
gboolean
-syntax_load (PsppireWindow *window, const gchar *filename)
+syntax_load (PsppireWindow *window, const gchar *filename
, gpointer not_used
)
{
GError *err = NULL;
gchar *text_locale = NULL;
{
GError *err = NULL;
gchar *text_locale = NULL;
diff --git
a/src/ui/gui/psppire-window.c
b/src/ui/gui/psppire-window.c
index 23c512d792dbb6a58769549f5408719093adc8a0..0a4021f71841585bd02544a07d5103ad32c0a9ee 100644
(file)
--- a/
src/ui/gui/psppire-window.c
+++ b/
src/ui/gui/psppire-window.c
@@
-660,7
+660,7
@@
psppire_window_save_as (PsppireWindow *w)
static void delete_recent (const char *file_name);
gboolean
static void delete_recent (const char *file_name);
gboolean
-psppire_window_load (PsppireWindow *w, const gchar *file)
+psppire_window_load (PsppireWindow *w, const gchar *file
, gpointer hint
)
{
gboolean ok;
PsppireWindowIface *i = PSPPIRE_WINDOW_MODEL_GET_IFACE (w);
{
gboolean ok;
PsppireWindowIface *i = PSPPIRE_WINDOW_MODEL_GET_IFACE (w);
@@
-671,7
+671,7
@@
psppire_window_load (PsppireWindow *w, const gchar *file)
g_return_val_if_fail (i->load, FALSE);
g_return_val_if_fail (i->load, FALSE);
- ok = i->load (w, file);
+ ok = i->load (w, file
, hint
);
if ( ok )
{
if ( ok )
{
@@
-804,7
+804,7
@@
psppire_window_open (PsppireWindow *de)
gtk_file_chooser_get_extra_widget (GTK_FILE_CHOOSER (dialog)));
if (any_reader_may_open (sysname))
gtk_file_chooser_get_extra_widget (GTK_FILE_CHOOSER (dialog)));
if (any_reader_may_open (sysname))
- open_data_window (de, name);
+ open_data_window (de, name
, NULL
);
else
open_syntax_window (name, encoding);
else
open_syntax_window (name, encoding);
diff --git
a/src/ui/gui/psppire-window.h
b/src/ui/gui/psppire-window.h
index f1273b17a84989e02d0635b6572215ca10029aeb..7831f53d2776dd8ccfb505ac32949324a1e43c34 100644
(file)
--- a/
src/ui/gui/psppire-window.h
+++ b/
src/ui/gui/psppire-window.h
@@
-91,7
+91,7
@@
struct _PsppireWindowIface
void (*save) (PsppireWindow *w);
void (*pick_filename) (PsppireWindow *);
void (*save) (PsppireWindow *w);
void (*pick_filename) (PsppireWindow *);
- gboolean (*load) (PsppireWindow *w, const gchar *);
+ gboolean (*load) (PsppireWindow *w, const gchar *
, gpointer hint
);
};
};
@@
-112,7
+112,7
@@
gint psppire_window_query_save (PsppireWindow *);
void psppire_window_save (PsppireWindow *w);
void psppire_window_save_as (PsppireWindow *w);
void psppire_window_save (PsppireWindow *w);
void psppire_window_save_as (PsppireWindow *w);
-gboolean psppire_window_load (PsppireWindow *w, const gchar *file);
+gboolean psppire_window_load (PsppireWindow *w, const gchar *file
, gpointer hint
);
void psppire_window_open (PsppireWindow *de);
GtkWidget *psppire_window_file_chooser_dialog (PsppireWindow *toplevel);
void psppire_window_open (PsppireWindow *de);
GtkWidget *psppire_window_file_chooser_dialog (PsppireWindow *toplevel);
diff --git
a/src/ui/gui/psppire.c
b/src/ui/gui/psppire.c
index 36716f3a26b9a537d7ad3707965de7463c36e9be..34811473fb8f76cee46464bc142bd1ffe2a81685 100644
(file)
--- a/
src/ui/gui/psppire.c
+++ b/
src/ui/gui/psppire.c
@@
-104,7
+104,7
@@
initialize (const char *data_file)
/* Check to see if the file is a .sav or a .por file. If not
assume that it is a syntax file */
if ( any_reader_may_open (filename))
/* Check to see if the file is a .sav or a .por file. If not
assume that it is a syntax file */
if ( any_reader_may_open (filename))
- open_data_window (NULL, filename);
+ open_data_window (NULL, filename
, NULL
);
else
{
create_data_window ();
else
{
create_data_window ();