From 5868173118fc790b7371a4bac8511358db7438bd Mon Sep 17 00:00:00 2001 From: David Bordoley Date: Thu, 24 Apr 2003 03:51:26 +0000 Subject: Always save a page's content if there i content to be saved. Remove the 2003-04-23 David Bordoley * embed/ephy-embed-single.c: (ephy_embed_single_show_file_picker): * embed/ephy-embed-single.h: * embed/ephy-embed-utils.c: (ephy_embed_utils_save): * embed/ephy-embed-utils.h: * embed/mozilla/FilePicker.cpp: (GFilePicker::GFilePicker), (GFilePicker::Show), (GFilePicker::HandleFilePickerR): * embed/mozilla/FilePicker.h: * embed/mozilla/mozilla-embed-persist.cpp: (impl_save): * embed/mozilla/mozilla-embed-single.cpp: (impl_show_file_picker): * src/window-commands.c: (window_cmd_file_open): Always save a page's content if there i content to be saved. Remove the checkbox from the save as dialog. Patch from Christian Persch --- ChangeLog | 18 ++++++++++++++++++ embed/ephy-embed-single.c | 3 +-- embed/ephy-embed-single.h | 2 -- embed/ephy-embed-utils.c | 13 ++++--------- embed/ephy-embed-utils.h | 2 +- embed/mozilla/FilePicker.cpp | 28 ++-------------------------- embed/mozilla/FilePicker.h | 9 ++------- embed/mozilla/mozilla-embed-persist.cpp | 2 +- embed/mozilla/mozilla-embed-single.cpp | 20 ++------------------ src/window-commands.c | 2 +- 10 files changed, 32 insertions(+), 67 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a2f09ab6..634e8127b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2003-04-23 David Bordoley + + * embed/ephy-embed-single.c: (ephy_embed_single_show_file_picker): + * embed/ephy-embed-single.h: + * embed/ephy-embed-utils.c: (ephy_embed_utils_save): + * embed/ephy-embed-utils.h: + * embed/mozilla/FilePicker.cpp: (GFilePicker::GFilePicker), + (GFilePicker::Show), (GFilePicker::HandleFilePickerR): + * embed/mozilla/FilePicker.h: + * embed/mozilla/mozilla-embed-persist.cpp: (impl_save): + * embed/mozilla/mozilla-embed-single.cpp: (impl_show_file_picker): + * src/window-commands.c: (window_cmd_file_open): + + Always save a page's content if there i content to be saved. + Remove the checkbox from the save as dialog. + + Patch from Christian Persch + 2003-04-23 David Bordoley * src/bookmarks/ephy-topic-action.c: (create_tool_item): diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c index 071ed1b48..dfeaf4c44 100644 --- a/embed/ephy-embed-single.c +++ b/embed/ephy-embed-single.c @@ -255,14 +255,13 @@ ephy_embed_single_show_file_picker (EphyEmbedSingle *shell, const char *file, FilePickerMode mode, char **ret_fullpath, - gboolean *ret_save_content, FileFormat *file_formats, int *ret_file_format) { EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); return klass->show_file_picker (shell, parentWidget, title, directory, file, mode, - ret_fullpath, ret_save_content, + ret_fullpath, file_formats, ret_file_format); } diff --git a/embed/ephy-embed-single.h b/embed/ephy-embed-single.h index 174158db7..ebd065a92 100644 --- a/embed/ephy-embed-single.h +++ b/embed/ephy-embed-single.h @@ -161,7 +161,6 @@ struct EphyEmbedSingleClass const char* file, FilePickerMode mode, char **ret_fullpath, - gboolean *ret_save_content, FileFormat *file_formats, gint *ret_file_format); }; @@ -222,7 +221,6 @@ gresult ephy_embed_single_show_file_picker (EphyEmbedSingle *shell, const char *file, FilePickerMode mode, char **ret_fullpath, - gboolean *ret_save_content, FileFormat *file_formats, int *ret_file_format); diff --git a/embed/ephy-embed-utils.c b/embed/ephy-embed-utils.c index 33a8935ad..e564bb084 100644 --- a/embed/ephy-embed-utils.c +++ b/embed/ephy-embed-utils.c @@ -44,7 +44,8 @@ void ephy_embed_utils_save (GtkWidget *window, const char *default_dir_pref, - gboolean ask_dest, gboolean ask_content, + gboolean ask_dest, + gboolean with_content, EphyEmbedPersist *persist) { GnomeVFSURI *uri; @@ -57,7 +58,6 @@ ephy_embed_utils_save (GtkWidget *window, gresult ret; EphyEmbed *embed; EmbedPersistFlags flags; - gboolean content; EphyEmbedSingle *single; single = ephy_embed_shell_get_embed_single @@ -132,7 +132,6 @@ ephy_embed_utils_save (GtkWidget *window, (single, window, _("Select the destination filename"), dirName, fileName, modeSave, &retPath, - ask_content ? &content : NULL, NULL, NULL); } @@ -143,12 +142,8 @@ ephy_embed_utils_save (GtkWidget *window, retDir = gnome_vfs_uri_extract_dirname (uri); - if (ask_content && content) - { - flags |= EMBED_PERSIST_SAVE_CONTENT; - ephy_embed_persist_set_flags (persist, - flags); - } + if (with_content) flags |= EMBED_PERSIST_SAVE_CONTENT; + ephy_embed_persist_set_flags (persist, flags); ephy_embed_persist_set_dest (persist, retPath); diff --git a/embed/ephy-embed-utils.h b/embed/ephy-embed-utils.h index 19f7b72f1..c24119828 100644 --- a/embed/ephy-embed-utils.h +++ b/embed/ephy-embed-utils.h @@ -35,7 +35,7 @@ typedef struct void ephy_embed_utils_save (GtkWidget *window, const char *default_dir_pref, gboolean ask_dest, - gboolean ask_content, + gboolean with_content, EphyEmbedPersist *persist); void ephy_embed_utils_build_charsets_submenu (BonoboUIComponent *ui_component, diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp index 8ae5429f7..fb8a82313 100644 --- a/embed/mozilla/FilePicker.cpp +++ b/embed/mozilla/FilePicker.cpp @@ -76,9 +76,7 @@ /* Implementation file */ NS_IMPL_ISUPPORTS1(GFilePicker, nsIFilePicker) -GFilePicker::GFilePicker(PRBool aShowContentCheck, FileFormat *aFileFormats) : - mShowContentCheck(aShowContentCheck), - mSaveContentCheck(NULL), +GFilePicker::GFilePicker(FileFormat *aFileFormats) : mFileFormats(aFileFormats) { NS_INIT_ISUPPORTS(); @@ -246,24 +244,6 @@ NS_IMETHODIMP GFilePicker::Show(PRInt16 *_retval) gtk_window_set_transient_for(GTK_WINDOW(mFileSelector), GTK_WINDOW(mParentWidget)); - if (mShowContentCheck) - { - GtkWidget *bbox = gtk_hbutton_box_new (); - gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), - GTK_BUTTONBOX_END); - gtk_box_set_spacing(GTK_BOX(bbox), 0); - gtk_box_pack_end(GTK_BOX(GTK_FILE_SELECTION(mFileSelector)->action_area), - bbox, TRUE, TRUE, 0); - - mSaveContentCheck = - gtk_check_button_new_with_label(_("Save with content")); - - gtk_box_pack_start(GTK_BOX(bbox), mSaveContentCheck, - FALSE, FALSE, 0); - - gtk_widget_show_all(bbox); - } - if (mFileFormats) { mFormatChooser = gtk_option_menu_new(); @@ -482,11 +462,7 @@ NS_METHOD GFilePicker::HandleFilePickerResult(PRInt16 *retval) } } - if (GTK_IS_TOGGLE_BUTTON(mSaveContentCheck)) - *retval = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mSaveContentCheck)) ? - returnOKSaveContent : returnOK; - else - *retval = returnOK; + *retval = returnOK; return NS_OK; } diff --git a/embed/mozilla/FilePicker.h b/embed/mozilla/FilePicker.h index 8f8fdf571..c478ce7a1 100644 --- a/embed/mozilla/FilePicker.h +++ b/embed/mozilla/FilePicker.h @@ -52,11 +52,9 @@ class GFilePicker : public nsIFilePicker NS_DECL_NSIFILEPICKER enum { returnOK = nsIFilePicker::returnOK, returnCancel = nsIFilePicker::returnCancel, - returnReplace = nsIFilePicker::returnReplace, - returnOKSaveContent = 256 }; + returnReplace = nsIFilePicker::returnReplace }; - GFilePicker(PRBool aShowContentCheck = PR_FALSE, - FileFormat *aFileFormats = nsnull); + GFilePicker(FileFormat *aFileFormats = nsnull); virtual ~GFilePicker(); /* additional members */ @@ -80,12 +78,9 @@ class GFilePicker : public nsIFilePicker PRInt16 mMode; - PRBool mShowContentCheck; - GtkWidget *mParentWidget; GtkWidget *mFileSelector; GtkWidget *mFormatChooser; - GtkWidget *mSaveContentCheck; FileFormat *mFileFormats; }; diff --git a/embed/mozilla/mozilla-embed-persist.cpp b/embed/mozilla/mozilla-embed-persist.cpp index 2b19bcc69..5668e14fb 100644 --- a/embed/mozilla/mozilla-embed-persist.cpp +++ b/embed/mozilla/mozilla-embed-persist.cpp @@ -190,7 +190,7 @@ impl_save (EphyEmbedPersist *persist) if (flags & EMBED_PERSIST_SAVE_CONTENT) { char *datapath; - datapath = g_strconcat (filename, "content", NULL); + datapath = g_strconcat (filename, ".content", NULL); NS_NewLocalFile(NS_ConvertUTF8toUCS2(datapath), PR_TRUE, getter_AddRefs(path)); g_free (datapath); } diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index 20ccdfdca..355e33583 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -108,7 +108,6 @@ impl_show_file_picker (EphyEmbedSingle *shell, const char *file, FilePickerMode mode, char **ret_fullpath, - gboolean *ret_save_content, FileFormat *file_formats, int *ret_file_format); @@ -887,20 +886,12 @@ impl_show_file_picker (EphyEmbedSingle *shell, const char *file, FilePickerMode mode, char **ret_fullpath, - gboolean *ret_save_content, FileFormat *file_formats, int *ret_file_format) { - PRBool showContentCheck; - gchar *expanded_directory; + gchar *expanded_directory; - if (ret_save_content == NULL) - showContentCheck = PR_FALSE; - else - showContentCheck = PR_TRUE; - - GFilePicker *filePicker = new GFilePicker (showContentCheck, - file_formats); + GFilePicker *filePicker = new GFilePicker (file_formats); /* FIXME sane path: expand tilde ... */ expanded_directory = g_strdup (directory); @@ -926,13 +917,6 @@ impl_show_file_picker (EphyEmbedSingle *shell, PRInt16 retval; filePicker->Show (&retval); - if (ret_save_content != NULL) - { - if (retval == GFilePicker::returnOKSaveContent) - *ret_save_content = TRUE; - else - *ret_save_content = FALSE; - } if (ret_file_format != NULL) { *ret_file_format = filePicker->mSelectedFileFormat; diff --git a/src/window-commands.c b/src/window-commands.c index 07efcdf6d..246d79337 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -309,7 +309,7 @@ window_cmd_file_open (EggAction *action, (single, wmain, _("Select the file to open"), dir, NULL, modeOpen, - &file, NULL, NULL, NULL); + &file, NULL, NULL); if (result == G_OK) { -- cgit v1.2.3