зеркало из https://github.com/mozilla/gecko-dev.git
Moved privacy prefs from Advanced pane to new privacy pane. Removed some white space and bogus comments.
This commit is contained in:
mcafee%netscape.com
Родитель
86265c40fe
Коммит
5226c267ce
|
|
@ -622,11 +622,13 @@ fe_SetMailNewsSortBehavior(MWContext* context, XP_Bool thread, int sortcode)
|
|||
}
|
||||
#endif
|
||||
|
||||
/* This digs data out of fe_globalPrefs and passes it
|
||||
along to the backend. fe_globalPrefs is going away,
|
||||
so this looks like a candidate for nuking. -mcafee */
|
||||
void
|
||||
fe_InstallPreferences (MWContext *context)
|
||||
{
|
||||
/* This function is called from main() */
|
||||
|
||||
fe_installGeneralAppearance();
|
||||
fe_installGeneralFonts();
|
||||
fe_installGeneralColors();
|
||||
|
|
|
|||
|
|
@ -5410,7 +5410,7 @@ Automatically load images and other data types\n\
|
|||
*prefs*advanced*autoInstall.labelString: Enable AutoInstall
|
||||
*prefs*advanced*emailAnonFtp.labelString: Send email address as anonymous FTP password
|
||||
*prefs*advanced*passiveFtp.labelString: Use passive ftp
|
||||
*prefs*cookieFrame*cookieBoxLabel.labelString: Cookies
|
||||
*prefs*cookieFrame*cookieLabel.labelString: Cookies
|
||||
*prefs*cookieFrame*alwaysAcceptCookie.labelString: Accept all cookies
|
||||
*prefs*cookieFrame*noForeignCookie.labelString: \
|
||||
Only accept cookies originating from the same server as\n\
|
||||
|
|
|
|||
|
|
@ -121,11 +121,6 @@ struct PrefsDataGeneralAdvanced
|
|||
#ifdef XFE_PREF_ADVANCED_PASSIVE_FTP
|
||||
Widget passive_ftp_toggle;
|
||||
#endif
|
||||
|
||||
Widget always_accept_cookie_toggle;
|
||||
Widget no_foreign_cookie_toggle;
|
||||
Widget never_accept_cookie_toggle;
|
||||
Widget warn_cookie_toggle;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -135,6 +130,11 @@ struct PrefsDataGeneralPrivacy
|
|||
Widget prompt_dialog;
|
||||
Widget page;
|
||||
|
||||
// Core privacy
|
||||
Widget save_logins_and_passwords;
|
||||
Widget warn_no_privacy;
|
||||
|
||||
// Cookies
|
||||
Widget always_accept_cookie_toggle;
|
||||
Widget no_foreign_cookie_toggle;
|
||||
Widget never_accept_cookie_toggle;
|
||||
|
|
|
|||
|
|
@ -184,7 +184,6 @@ class XFE_PrefsDialog : public XFE_Dialog
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsDialog(Widget parent,
|
||||
char *name,
|
||||
MWContext *context,
|
||||
|
|
@ -216,14 +215,12 @@ public:
|
|||
Dimension calculateHeight(); // calculate the dialog height
|
||||
|
||||
// Callbacks - main
|
||||
|
||||
static void prefsMainCb_ok(Widget, XtPointer, XtPointer);
|
||||
static void prefsMainCb_cancel(Widget, XtPointer, XtPointer);
|
||||
static void prefsMainCb_help(Widget, XtPointer, XtPointer);
|
||||
static void prefsMainCb_destroy(Widget, XtPointer, XtPointer);
|
||||
|
||||
// Callbacks - category outline
|
||||
|
||||
static Boolean categoryDataFunc(Widget, void*, int, fe_OutlineDesc*, int);
|
||||
static void categoryClickFunc(Widget, void*, int, int, const char*,
|
||||
int, int, Boolean, Boolean, int);
|
||||
|
|
@ -259,13 +256,11 @@ class XFE_PrefsPage
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPage(XFE_PrefsDialog *dialog);
|
||||
XFE_PrefsPage(Widget w);
|
||||
virtual ~XFE_PrefsPage();
|
||||
|
||||
// Manipulators
|
||||
|
||||
virtual void create() = 0;
|
||||
virtual void init() = 0;
|
||||
virtual void map();
|
||||
|
|
@ -280,7 +275,6 @@ public:
|
|||
void setChanged(Boolean);
|
||||
|
||||
// Gets
|
||||
|
||||
Boolean isCreated();
|
||||
Boolean isInitialized();
|
||||
Boolean doInitInMap();
|
||||
|
|
@ -293,7 +287,6 @@ public:
|
|||
protected:
|
||||
|
||||
// Data
|
||||
|
||||
MWContext *m_context;
|
||||
XFE_PrefsDialog *m_prefsDialog;
|
||||
Widget m_wPageForm; /* in the prefs dialog */
|
||||
|
|
@ -311,29 +304,24 @@ class XFE_PrefsPageGeneralAppearance : public XFE_PrefsPage
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPageGeneralAppearance(XFE_PrefsDialog *dialog);
|
||||
virtual ~XFE_PrefsPageGeneralAppearance();
|
||||
|
||||
// Manipulators
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
virtual void install();
|
||||
virtual void save();
|
||||
|
||||
// Gets
|
||||
|
||||
PrefsDataGeneralAppearance *getData();
|
||||
|
||||
// Callbacks - page GeneralAppearance
|
||||
|
||||
static void cb_setToolbarAttr(Widget, XtPointer, XtPointer);
|
||||
|
||||
private:
|
||||
|
||||
// Data
|
||||
|
||||
PrefsDataGeneralAppearance *m_prefsDataGeneralAppearance;
|
||||
XP_Bool m_toolbar_needs_updating;
|
||||
};
|
||||
|
|
@ -345,12 +333,10 @@ class XFE_PrefsPageGeneralFonts : public XFE_PrefsPage
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPageGeneralFonts(XFE_PrefsDialog *dialog);
|
||||
virtual ~XFE_PrefsPageGeneralFonts();
|
||||
|
||||
// Manipulators
|
||||
|
||||
virtual void create();
|
||||
virtual void relayout(PrefsDataGeneralFonts *fep);
|
||||
virtual void init();
|
||||
|
|
@ -358,11 +344,9 @@ public:
|
|||
virtual void save();
|
||||
|
||||
// Gets
|
||||
|
||||
PrefsDataGeneralFonts *getData();
|
||||
|
||||
// Callbacks - page General/Fonts
|
||||
|
||||
static void cb_charSet(Widget, XtPointer, XtPointer);
|
||||
static void cb_toggleUseFont(Widget, XtPointer, XtPointer);
|
||||
static void cb_allowScaling(Widget, XtPointer, XtPointer);
|
||||
|
|
@ -370,7 +354,6 @@ public:
|
|||
private:
|
||||
|
||||
// Data
|
||||
|
||||
PrefsDataGeneralFonts *m_prefsDataGeneralFonts;
|
||||
};
|
||||
|
||||
|
|
@ -381,30 +364,25 @@ class XFE_PrefsPageGeneralColors : public XFE_PrefsPage
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPageGeneralColors(XFE_PrefsDialog *dialog);
|
||||
virtual ~XFE_PrefsPageGeneralColors();
|
||||
|
||||
// Manipulators
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
virtual void install();
|
||||
virtual void save();
|
||||
|
||||
// Gets
|
||||
|
||||
PrefsDataGeneralColors *getData();
|
||||
|
||||
// Callbacks - page General/Colors
|
||||
|
||||
static void cb_activateColor(Widget, XtPointer, XtPointer);
|
||||
static void cb_defaultColor(Widget, XtPointer, XtPointer);
|
||||
|
||||
private:
|
||||
|
||||
// Data
|
||||
|
||||
PrefsDataGeneralColors *m_prefsDataGeneralColors;
|
||||
XP_Bool m_underlinelinks_changed;
|
||||
XP_Bool m_colors_changed;
|
||||
|
|
@ -417,29 +395,21 @@ class XFE_PrefsPageGeneralAdvanced : public XFE_PrefsPage
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPageGeneralAdvanced(XFE_PrefsDialog *dialog);
|
||||
virtual ~XFE_PrefsPageGeneralAdvanced();
|
||||
|
||||
// Manipulators
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
virtual void install();
|
||||
virtual void save();
|
||||
|
||||
// Gets
|
||||
|
||||
PrefsDataGeneralAdvanced *getData();
|
||||
|
||||
// Callbacks - page General/Advanced
|
||||
|
||||
static void cb_toggleCookieState(Widget, XtPointer, XtPointer);
|
||||
|
||||
private:
|
||||
|
||||
// Data
|
||||
|
||||
PrefsDataGeneralAdvanced *m_prefsDataGeneralAdvanced;
|
||||
|
||||
XP_Bool m_toolbar_needs_updating;
|
||||
|
|
@ -452,7 +422,6 @@ class XFE_PrefsPageGeneralPrivacy : public XFE_PrefsPage
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPageGeneralPrivacy(XFE_PrefsDialog *dialog);
|
||||
virtual ~XFE_PrefsPageGeneralPrivacy();
|
||||
|
||||
|
|
@ -466,7 +435,7 @@ public:
|
|||
PrefsDataGeneralPrivacy *getData();
|
||||
|
||||
// Callbacks - page General/Advanced
|
||||
//static void cb_toggleCookieState(Widget, XtPointer, XtPointer);
|
||||
static void cb_toggleCookieState(Widget, XtPointer, XtPointer);
|
||||
|
||||
private:
|
||||
PrefsDataGeneralPrivacy *m_prefsDataGeneralPrivacy;
|
||||
|
|
@ -480,12 +449,10 @@ class XFE_PrefsPageGeneralAppl : public XFE_PrefsPage
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPageGeneralAppl(XFE_PrefsDialog *dialog);
|
||||
virtual ~XFE_PrefsPageGeneralAppl();
|
||||
|
||||
// Manipulators
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
virtual void install();
|
||||
|
|
@ -494,20 +461,16 @@ public:
|
|||
void setModified(Boolean);
|
||||
|
||||
// Gets
|
||||
|
||||
PrefsDataGeneralAppl *getData();
|
||||
|
||||
// Callbacks - page General/Applications
|
||||
|
||||
static void cb_new(Widget, XtPointer, XtPointer);
|
||||
static void cb_edit(Widget, XtPointer, XtPointer);
|
||||
static void cb_delete(Widget, XtPointer, XtPointer);
|
||||
static void cb_browse(Widget, XtPointer, XtPointer);
|
||||
|
||||
private:
|
||||
|
||||
// Data
|
||||
|
||||
PrefsDataGeneralAppl *m_prefsDataGeneralAppl;
|
||||
};
|
||||
|
||||
|
|
@ -518,23 +481,19 @@ class XFE_PrefsPageGeneralCache : public XFE_PrefsPage
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPageGeneralCache(XFE_PrefsDialog *dialog);
|
||||
virtual ~XFE_PrefsPageGeneralCache();
|
||||
|
||||
// Manipulators
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
virtual void install();
|
||||
virtual void save();
|
||||
|
||||
// Gets
|
||||
|
||||
PrefsDataGeneralCache *getData();
|
||||
|
||||
// Callbacks - page General/Cache
|
||||
|
||||
static void cb_browse(Widget, XtPointer, XtPointer);
|
||||
static void cb_clearDisk(Widget, XtPointer, XtPointer);
|
||||
static void cb_clearMem(Widget, XtPointer, XtPointer);
|
||||
|
|
@ -542,7 +501,6 @@ public:
|
|||
private:
|
||||
|
||||
// Data
|
||||
|
||||
PrefsDataGeneralCache *m_prefsDataGeneralCache;
|
||||
};
|
||||
|
||||
|
|
@ -553,23 +511,19 @@ class XFE_PrefsPageGeneralProxies : public XFE_PrefsPage
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPageGeneralProxies(XFE_PrefsDialog *dialog);
|
||||
virtual ~XFE_PrefsPageGeneralProxies();
|
||||
|
||||
// Manipulators
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
virtual void install();
|
||||
virtual void save();
|
||||
|
||||
// Gets
|
||||
|
||||
PrefsDataGeneralProxies *getData();
|
||||
|
||||
// Callbacks - page General/Proxies
|
||||
|
||||
static void cb_reloadProxies(Widget, XtPointer, XtPointer);
|
||||
static void cb_setProxies(Widget, XtPointer, XtPointer);
|
||||
static void cb_viewProxies(Widget, XtPointer, XtPointer);
|
||||
|
|
@ -577,7 +531,6 @@ public:
|
|||
private:
|
||||
|
||||
// Data
|
||||
|
||||
PrefsDataGeneralProxies *m_prefsDataGeneralProxies;
|
||||
};
|
||||
|
||||
|
|
@ -588,23 +541,19 @@ class XFE_PrefsPageBrowser : public XFE_PrefsPage
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPageBrowser(XFE_PrefsDialog *dialog);
|
||||
virtual ~XFE_PrefsPageBrowser();
|
||||
|
||||
// Manipulators
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
virtual void install();
|
||||
virtual void save();
|
||||
|
||||
// Gets
|
||||
|
||||
PrefsDataBrowser *getData();
|
||||
|
||||
// Callbacks - page Browser
|
||||
|
||||
static void cb_browse(Widget, XtPointer, XtPointer);
|
||||
static void cb_setStartupPage(Widget, XtPointer, XtPointer);
|
||||
static void cb_expireNow(Widget, XtPointer, XtPointer);
|
||||
|
|
@ -613,7 +562,6 @@ public:
|
|||
private:
|
||||
|
||||
// Data
|
||||
|
||||
PrefsDataBrowser *m_prefsDataBrowser;
|
||||
XP_Bool m_home_changed;
|
||||
};
|
||||
|
|
@ -625,12 +573,10 @@ class XFE_PrefsPageBrowserLang : public XFE_PrefsPage, public XFE_Outlinable
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPageBrowserLang(XFE_PrefsDialog *dialog);
|
||||
virtual ~XFE_PrefsPageBrowserLang();
|
||||
|
||||
// Manipulators
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
virtual void install();
|
||||
|
|
@ -644,7 +590,6 @@ public:
|
|||
void deselectPos(int pos);
|
||||
|
||||
// Gets
|
||||
|
||||
PrefsDataBrowserLang *getData();
|
||||
|
||||
// Outlinable interface methods
|
||||
|
|
@ -676,7 +621,6 @@ public:
|
|||
virtual char *getCellDocString(int /* row */, int /* column */) {return NULL;}
|
||||
|
||||
// Callbacks - page BrowserLang
|
||||
|
||||
static void cb_add(Widget, XtPointer, XtPointer);
|
||||
static void cb_delete(Widget, XtPointer, XtPointer);
|
||||
static void cb_promote(Widget, XtPointer, XtPointer);
|
||||
|
|
@ -685,7 +629,6 @@ public:
|
|||
private:
|
||||
|
||||
// Data
|
||||
|
||||
static const int OUTLINER_COLUMN_ORDER;
|
||||
static const int OUTLINER_COLUMN_LANG;
|
||||
static const int OUTLINER_COLUMN_MAX_LENGTH;
|
||||
|
|
@ -704,30 +647,25 @@ class XFE_PrefsPageMailNews : public XFE_PrefsPage
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPageMailNews(XFE_PrefsDialog *dialog);
|
||||
virtual ~XFE_PrefsPageMailNews();
|
||||
|
||||
// Manipulators
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
virtual void install();
|
||||
virtual void save();
|
||||
|
||||
// Gets
|
||||
|
||||
PrefsDataMailNews *getData();
|
||||
|
||||
// Callbacks - page MailNews
|
||||
|
||||
static void cb_toggleMsgFont(Widget, XtPointer, XtPointer);
|
||||
static void cb_quotedTextColor(Widget, XtPointer, XtPointer);
|
||||
|
||||
private:
|
||||
|
||||
// Data
|
||||
|
||||
PrefsDataMailNews *m_prefsDataMailNews;
|
||||
XP_Bool m_refresh_needed;
|
||||
};
|
||||
|
|
@ -740,12 +678,10 @@ class XFE_PrefsPageMailNewsIdentity : public XFE_PrefsPage
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPageMailNewsIdentity(XFE_PrefsDialog *dialog);
|
||||
virtual ~XFE_PrefsPageMailNewsIdentity();
|
||||
|
||||
// Manipulators
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
virtual void install();
|
||||
|
|
@ -753,11 +689,9 @@ public:
|
|||
virtual Boolean verify();
|
||||
|
||||
// Gets
|
||||
|
||||
PrefsDataMailNewsIdentity *getData();
|
||||
|
||||
// Callbacks - page Mail News/Identity
|
||||
|
||||
#ifdef MOZ_MAIL_NEWS
|
||||
static void cb_browse(Widget, XtPointer, XtPointer);
|
||||
static void cb_toggleAttachCard(Widget, XtPointer, XtPointer);
|
||||
|
|
@ -766,7 +700,6 @@ public:
|
|||
private:
|
||||
|
||||
// Data
|
||||
|
||||
PrefsDataMailNewsIdentity *m_prefsDataMailNewsIdentity;
|
||||
};
|
||||
|
||||
|
|
@ -877,12 +810,10 @@ class XFE_PrefsPageMailNewsMserver : public XFE_PrefsPage
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPageMailNewsMserver(XFE_PrefsDialog *dialog);
|
||||
virtual ~XFE_PrefsPageMailNewsMserver();
|
||||
|
||||
// Manipulators
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
virtual void install();
|
||||
|
|
@ -890,7 +821,6 @@ public:
|
|||
virtual Boolean verify();
|
||||
|
||||
// Callbacks - page Mail News/Mail Server
|
||||
|
||||
static void cb_browseApplication(Widget, XtPointer, XtPointer);
|
||||
static void cb_more(Widget, XtPointer, XtPointer);
|
||||
static void cb_toggleServerType(Widget, XtPointer, XtPointer);
|
||||
|
|
@ -900,10 +830,6 @@ private:
|
|||
XFE_PrefsIncomingMServer *xfe_incoming;
|
||||
XFE_PrefsOutgoingServer *xfe_outgoing;
|
||||
XFE_PrefsLocalMailDir *xfe_local_mail;
|
||||
|
||||
|
||||
// Data
|
||||
|
||||
};
|
||||
|
||||
// ************************* XFE_PrefsPageMailNewsCopies ******************
|
||||
|
|
@ -969,8 +895,6 @@ private:
|
|||
};
|
||||
|
||||
// ************************* XFE_PrefsPageMailNewsHTML ******************
|
||||
|
||||
|
||||
class XFE_PrefsPageMailNewsHTML : public XFE_PrefsPage
|
||||
{
|
||||
public:
|
||||
|
|
@ -998,8 +922,6 @@ private:
|
|||
|
||||
|
||||
// ************************* XFE_PrefsPageMailNewsReceipts ******************
|
||||
|
||||
|
||||
class XFE_PrefsPageMailNewsReceipts : public XFE_PrefsPage
|
||||
{
|
||||
public:
|
||||
|
|
@ -1013,7 +935,6 @@ public:
|
|||
virtual void save();
|
||||
virtual Boolean verify();
|
||||
|
||||
|
||||
private:
|
||||
Widget createRequestReceiptsFrame(Widget parent, Widget attachTo);
|
||||
Widget createReceiptsArriveFrame(Widget parent, Widget attachTo);
|
||||
|
|
@ -1038,12 +959,10 @@ class XFE_PrefsPageEditor : public XFE_PrefsPage
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPageEditor(XFE_PrefsDialog *dialog);
|
||||
virtual ~XFE_PrefsPageEditor();
|
||||
|
||||
// Manipulators
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
virtual void install();
|
||||
|
|
@ -1051,11 +970,9 @@ public:
|
|||
virtual Boolean verify();
|
||||
|
||||
// Gets
|
||||
|
||||
PrefsDataEditor *getData();
|
||||
|
||||
// Callbacks - page Editor
|
||||
|
||||
static void cb_changed(Widget, XtPointer, XtPointer);
|
||||
static void cb_browseToTextField(Widget, XtPointer, XtPointer);
|
||||
static void cb_restoreTemplate(Widget, XtPointer, XtPointer);
|
||||
|
|
@ -1065,7 +982,6 @@ public:
|
|||
private:
|
||||
|
||||
// Data
|
||||
|
||||
PrefsDataEditor *m_prefsDataEditor;
|
||||
};
|
||||
|
||||
|
|
@ -1076,19 +992,16 @@ class XFE_PrefsPageEditorAppearance : public XFE_PrefsPage
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPageEditorAppearance(XFE_PrefsDialog *dialog);
|
||||
virtual ~XFE_PrefsPageEditorAppearance();
|
||||
|
||||
// Manipulators
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
virtual void install();
|
||||
virtual void save();
|
||||
|
||||
// Gets
|
||||
|
||||
PrefsDataEditorAppearance *getData();
|
||||
|
||||
// Callbacks - page Editor/Appearance
|
||||
|
|
@ -1096,7 +1009,6 @@ public:
|
|||
private:
|
||||
|
||||
// Data
|
||||
|
||||
PrefsDataEditorAppearance *m_prefsDataEditorAppearance;
|
||||
};
|
||||
|
||||
|
|
@ -1107,30 +1019,25 @@ class XFE_PrefsPageEditorPublish : public XFE_PrefsPage
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPageEditorPublish(XFE_PrefsDialog *dialog);
|
||||
virtual ~XFE_PrefsPageEditorPublish();
|
||||
|
||||
// Manipulators
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
virtual void install();
|
||||
virtual void save();
|
||||
|
||||
// Gets
|
||||
|
||||
PrefsDataEditorPublish *getData();
|
||||
|
||||
// Callbacks - page Editor/Publish
|
||||
|
||||
static void cb_changed(Widget, XtPointer, XtPointer);
|
||||
static void cb_passwordChanged(Widget, XtPointer, XtPointer);
|
||||
|
||||
private:
|
||||
|
||||
// Data
|
||||
|
||||
PrefsDataEditorPublish *m_prefsDataEditorPublish;
|
||||
};
|
||||
|
||||
|
|
@ -1144,64 +1051,54 @@ class XFE_PrefsPageOffline : public XFE_PrefsPage
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPageOffline(XFE_PrefsDialog *dialog);
|
||||
virtual ~XFE_PrefsPageOffline();
|
||||
|
||||
// Manipulators
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
virtual void install();
|
||||
virtual void save();
|
||||
|
||||
// Gets
|
||||
|
||||
PrefsDataOffline *getData();
|
||||
|
||||
// Callbacks - page Offline
|
||||
|
||||
static void cb_toggleStartup(Widget, XtPointer, XtPointer);
|
||||
|
||||
private:
|
||||
|
||||
// Data
|
||||
|
||||
PrefsDataOffline *m_prefsDataOffline;
|
||||
};
|
||||
|
||||
#ifdef MOZ_MAIL_NEWS
|
||||
|
||||
// ************************* XFE_PrefsPageOfflineNews *************************
|
||||
// ********************** XFE_PrefsPageOfflineNews *************************
|
||||
|
||||
class XFE_PrefsPageOfflineNews : public XFE_PrefsPage
|
||||
{
|
||||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPageOfflineNews(XFE_PrefsDialog *dialog);
|
||||
virtual ~XFE_PrefsPageOfflineNews();
|
||||
|
||||
// Manipulators
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
virtual void install();
|
||||
virtual void save();
|
||||
|
||||
// Gets
|
||||
|
||||
PrefsDataOfflineNews *getData();
|
||||
|
||||
// Callbacks - page OfflineNews
|
||||
|
||||
static void cb_toggleDownLoadByDate(Widget, XtPointer, XtPointer);
|
||||
|
||||
private:
|
||||
|
||||
// Data
|
||||
|
||||
PrefsDataOfflineNews *m_prefsDataOfflineNews;
|
||||
};
|
||||
|
||||
|
|
@ -1216,19 +1113,16 @@ class XFE_PrefsPageDiskSpace : public XFE_PrefsPage
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPageDiskSpace(XFE_PrefsDialog *dialog);
|
||||
virtual ~XFE_PrefsPageDiskSpace();
|
||||
|
||||
// Manipulators
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
virtual void install();
|
||||
virtual void save();
|
||||
|
||||
// Gets
|
||||
|
||||
PrefsDataDiskSpace *getData();
|
||||
|
||||
// Callbacks - page DiskSpace
|
||||
|
|
@ -1239,7 +1133,6 @@ public:
|
|||
private:
|
||||
|
||||
// Data
|
||||
|
||||
PrefsDataDiskSpace *m_prefsDataDiskSpace;
|
||||
};
|
||||
|
||||
|
|
@ -1252,30 +1145,25 @@ class XFE_PrefsPageHelpFiles : public XFE_PrefsPage
|
|||
public:
|
||||
|
||||
// Constructors, Destructors
|
||||
|
||||
XFE_PrefsPageHelpFiles(XFE_PrefsDialog *dialog);
|
||||
virtual ~XFE_PrefsPageHelpFiles();
|
||||
|
||||
// Manipulators
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
virtual void install();
|
||||
virtual void save();
|
||||
|
||||
// Gets
|
||||
|
||||
PrefsDataHelpFiles *getData();
|
||||
|
||||
// Callbacks - page HelpFiles
|
||||
|
||||
static void cb_toggleHelpSite(Widget, XtPointer, XtPointer);
|
||||
static void cb_browse(Widget, XtPointer, XtPointer);
|
||||
|
||||
private:
|
||||
|
||||
// Data
|
||||
|
||||
PrefsDataHelpFiles *m_prefsDataHelpFiles;
|
||||
};
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -2576,46 +2576,200 @@ void XFE_PrefsPageGeneralAdvanced::create()
|
|||
XtManageChild (form1);
|
||||
XtManageChild (frame1);
|
||||
|
||||
// Cookies
|
||||
setCreated(TRUE);
|
||||
}
|
||||
|
||||
Widget frame2;
|
||||
Widget label2;
|
||||
Widget form2;
|
||||
|
||||
void XFE_PrefsPageGeneralAdvanced::init()
|
||||
{
|
||||
XP_ASSERT(m_prefsDataGeneralAdvanced);
|
||||
|
||||
PrefsDataGeneralAdvanced *fep = m_prefsDataGeneralAdvanced;
|
||||
XFE_GlobalPrefs *prefs = &fe_globalPrefs;
|
||||
|
||||
XtVaSetValues(fep->show_image_toggle,
|
||||
XmNset, prefs->autoload_images_p,
|
||||
XmNsensitive, !PREF_PrefIsLocked("general.always_load_images"),
|
||||
0);
|
||||
XtVaSetValues(fep->enable_style_sheet_toggle,
|
||||
XmNset, prefs->enable_style_sheet,
|
||||
XmNsensitive, !PREF_PrefIsLocked("browser.enable_style_sheets"),
|
||||
0);
|
||||
|
||||
#ifdef JAVA
|
||||
XtVaSetValues(fep->enable_java_toggle,
|
||||
XmNset, prefs->enable_java,
|
||||
XmNsensitive, !PREF_PrefIsLocked("security.enable_java"),
|
||||
0);
|
||||
#endif /* JAVA */
|
||||
|
||||
XtVaSetValues(fep->enable_js_toggle,
|
||||
XmNset, prefs->enable_javascript,
|
||||
XmNsensitive, !PREF_PrefIsLocked("javascript.enabled"),
|
||||
0);
|
||||
|
||||
XtVaSetValues(fep->auto_install_toggle,
|
||||
XmNset, prefs->auto_install,
|
||||
XmNsensitive, !PREF_PrefIsLocked("autoupdate.enabled"),
|
||||
0);
|
||||
XtVaSetValues(fep->email_anonftp_toggle,
|
||||
XmNset, prefs->email_anonftp,
|
||||
XmNsensitive, !PREF_PrefIsLocked("security.email_as_ftp_password"),
|
||||
0);
|
||||
|
||||
#ifdef XFE_PREF_ADVANCED_PASSIVE_FTP
|
||||
XtVaSetValues(fep->passive_ftp_toggle,
|
||||
XmNset, prefs->passive_ftp,
|
||||
XmNsensitive, !PREF_PrefIsLocked("network.ftp.passive"),
|
||||
0);
|
||||
#endif
|
||||
|
||||
setInitialized(TRUE);
|
||||
}
|
||||
|
||||
|
||||
void XFE_PrefsPageGeneralAdvanced::install()
|
||||
{
|
||||
fe_installGeneralAdvanced();
|
||||
|
||||
if (m_toolbar_needs_updating) {
|
||||
// Notify whoever is interested in updating toolbar appearance
|
||||
XFE_MozillaApp::theApp()->notifyInterested(XFE_MozillaApp::updateToolbarAppearance);
|
||||
m_toolbar_needs_updating = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void XFE_PrefsPageGeneralAdvanced::save()
|
||||
{
|
||||
PrefsDataGeneralAdvanced *fep = m_prefsDataGeneralAdvanced;
|
||||
Boolean b;
|
||||
|
||||
int old_autoload_images = fe_globalPrefs.autoload_images_p;
|
||||
|
||||
XP_ASSERT(fep);
|
||||
|
||||
XtVaGetValues(fep->show_image_toggle, XmNset, &b, 0);
|
||||
fe_globalPrefs.autoload_images_p = b;
|
||||
|
||||
XtVaGetValues(fep->enable_style_sheet_toggle, XmNset, &b, 0);
|
||||
fe_globalPrefs.enable_style_sheet = b;
|
||||
|
||||
#ifdef JAVA
|
||||
XtVaGetValues(fep->enable_java_toggle, XmNset, &b, 0);
|
||||
fe_globalPrefs.enable_java = b;
|
||||
#endif /* JAVA */
|
||||
|
||||
XtVaGetValues(fep->enable_js_toggle, XmNset, &b, 0);
|
||||
fe_globalPrefs.enable_javascript = b;
|
||||
|
||||
XtVaGetValues(fep->auto_install_toggle, XmNset, &b, 0);
|
||||
fe_globalPrefs.auto_install = b;
|
||||
|
||||
XtVaGetValues(fep->email_anonftp_toggle, XmNset, &b, 0);
|
||||
fe_globalPrefs.email_anonftp = b;
|
||||
|
||||
#ifdef XFE_PREF_ADVANCED_PASSIVE_FTP
|
||||
XtVaGetValues(fep->passive_ftp_toggle, XmNset, &b, 0);
|
||||
NET_UsePASV(fe_globalPrefs.passive_ftp = b);
|
||||
#endif
|
||||
|
||||
if (old_autoload_images != fe_globalPrefs.autoload_images_p) {
|
||||
m_toolbar_needs_updating = TRUE;
|
||||
}
|
||||
|
||||
// Install preferences
|
||||
|
||||
install();
|
||||
}
|
||||
|
||||
|
||||
PrefsDataGeneralAdvanced *XFE_PrefsPageGeneralAdvanced::getData()
|
||||
{
|
||||
return m_prefsDataGeneralAdvanced;
|
||||
}
|
||||
|
||||
|
||||
// ********************************************************************
|
||||
// ************************ General/Privacy **************************
|
||||
// ********************************************************************
|
||||
|
||||
|
||||
XFE_PrefsPageGeneralPrivacy::XFE_PrefsPageGeneralPrivacy(XFE_PrefsDialog *dialog)
|
||||
: XFE_PrefsPage(dialog),
|
||||
m_prefsDataGeneralPrivacy(0)
|
||||
{
|
||||
m_toolbar_needs_updating = FALSE;
|
||||
}
|
||||
|
||||
XFE_PrefsPageGeneralPrivacy::~XFE_PrefsPageGeneralPrivacy()
|
||||
{
|
||||
delete m_prefsDataGeneralPrivacy;
|
||||
}
|
||||
|
||||
|
||||
void XFE_PrefsPageGeneralPrivacy::create()
|
||||
{
|
||||
PrefsDataGeneralPrivacy *fep = NULL;
|
||||
Widget form;
|
||||
int i;
|
||||
int ac;
|
||||
Arg av[30];
|
||||
Widget kids[30];
|
||||
|
||||
// Zap our data structure.
|
||||
fep = new PrefsDataGeneralPrivacy;
|
||||
memset(fep, 0, sizeof(PrefsDataGeneralPrivacy));
|
||||
m_prefsDataGeneralPrivacy = fep;
|
||||
|
||||
fep->context = getContext();
|
||||
fep->prompt_dialog = getPrefsDialog()->getDialogChrome();
|
||||
|
||||
// Form
|
||||
|
||||
ac = 0;
|
||||
XtSetArg (av[ac], XmNleftAttachment, XmATTACH_FORM); ac++;
|
||||
XtSetArg (av[ac], XmNrightAttachment, XmATTACH_FORM); ac++;
|
||||
XtSetArg (av[ac], XmNtopAttachment, XmATTACH_WIDGET); ac++;
|
||||
XtSetArg (av[ac], XmNtopWidget, frame1); ac++;
|
||||
XtSetArg (av[ac], XmNtopOffset, 8); ac++;
|
||||
XtSetArg (av[ac], XmNbottomAttachment, XmATTACH_NONE); ac++;
|
||||
frame2 = XmCreateFrame (form, "cookieFrame", av, ac);
|
||||
|
||||
ac = 0;
|
||||
XtSetArg (av [ac], XmNleftAttachment, XmATTACH_FORM); ac++;
|
||||
XtSetArg (av [ac], XmNrightAttachment, XmATTACH_FORM); ac++;
|
||||
XtSetArg (av [ac], XmNtopAttachment, XmATTACH_FORM); ac++;
|
||||
XtSetArg (av [ac], XmNbottomAttachment, XmATTACH_FORM); ac++;
|
||||
form2 = XmCreateForm (frame2, "cookieBox", av, ac);
|
||||
XtSetArg (av [ac], XmNleftAttachment, XmATTACH_FORM); ac++;
|
||||
XtSetArg (av [ac], XmNrightAttachment, XmATTACH_FORM); ac++;
|
||||
form = XmCreateForm (m_wPageForm, "privacy", av, ac);
|
||||
XtManageChild(form);
|
||||
m_wPage = fep->page = form;
|
||||
|
||||
ac = 0;
|
||||
XtSetArg (av [ac], XmNtopAttachment, XmATTACH_FORM); ac++;
|
||||
XtSetArg (av [ac], XmNbottomAttachment, XmATTACH_NONE); ac++;
|
||||
XtSetArg (av [ac], XmNleftAttachment, XmATTACH_FORM); ac++;
|
||||
XtSetArg (av [ac], XmNrightAttachment, XmATTACH_FORM); ac++;
|
||||
Widget cookieFrame =
|
||||
XmCreateFrame (form, "cookieFrame", av, ac);
|
||||
|
||||
ac = 0;
|
||||
XtSetArg (av [ac], XmNchildType, XmFRAME_TITLE_CHILD); ac++;
|
||||
label2 = XmCreateLabelGadget (frame2, "cookieBoxLabel", av, ac);
|
||||
Widget cookieLabel =
|
||||
XmCreateLabelGadget (cookieFrame, "cookieLabel", av, ac);
|
||||
|
||||
ac = 0;
|
||||
i = 0;
|
||||
XtSetArg (av [ac], XmNtopAttachment, XmATTACH_FORM); ac++;
|
||||
XtSetArg (av [ac], XmNbottomAttachment, XmATTACH_FORM); ac++;
|
||||
XtSetArg (av [ac], XmNleftAttachment, XmATTACH_FORM); ac++;
|
||||
XtSetArg (av [ac], XmNrightAttachment, XmATTACH_FORM); ac++;
|
||||
Widget cookieForm =
|
||||
XmCreateForm (cookieFrame, "cookieForm", av, ac);
|
||||
|
||||
// kids
|
||||
i = 0;
|
||||
kids[i++] = fep->always_accept_cookie_toggle =
|
||||
XmCreateToggleButtonGadget(form2, "alwaysAcceptCookie", av, ac);
|
||||
XmCreateToggleButtonGadget(cookieForm, "alwaysAcceptCookie", NULL, 0);
|
||||
|
||||
kids[i++] = fep->no_foreign_cookie_toggle =
|
||||
XmCreateToggleButtonGadget(form2, "noForeignCookie", av, ac);
|
||||
XmCreateToggleButtonGadget(cookieForm, "noForeignCookie", NULL, 0);
|
||||
|
||||
kids[i++] = fep->never_accept_cookie_toggle =
|
||||
XmCreateToggleButtonGadget(form2, "neverAcceptCookie", av, ac);
|
||||
XmCreateToggleButtonGadget(cookieForm, "neverAcceptCookie", NULL, 0);
|
||||
|
||||
kids[i++] = fep->warn_cookie_toggle =
|
||||
XmCreateToggleButtonGadget(form2, "warnCookie", av, ac);
|
||||
XmCreateToggleButtonGadget(cookieForm, "warnCookie", NULL, 0);
|
||||
|
||||
XtVaSetValues(fep->always_accept_cookie_toggle,
|
||||
XmNindicatorType, XmONE_OF_MANY,
|
||||
|
|
@ -2661,12 +2815,11 @@ void XFE_PrefsPageGeneralAdvanced::create()
|
|||
0);
|
||||
|
||||
XtManageChildren (kids, i);
|
||||
XtManageChild (label2);
|
||||
XtManageChild (form2);
|
||||
XtManageChild (frame2);
|
||||
|
||||
// Add callbacks
|
||||
XtManageChild (cookieLabel);
|
||||
XtManageChild (cookieForm);
|
||||
XtManageChild (cookieFrame);
|
||||
|
||||
// Add cookie callbacks
|
||||
XtAddCallback(fep->always_accept_cookie_toggle, XmNvalueChangedCallback,
|
||||
cb_toggleCookieState, fep);
|
||||
XtAddCallback(fep->no_foreign_cookie_toggle, XmNvalueChangedCallback,
|
||||
|
|
@ -2677,58 +2830,15 @@ void XFE_PrefsPageGeneralAdvanced::create()
|
|||
setCreated(TRUE);
|
||||
}
|
||||
|
||||
// Member: init
|
||||
// Description: Initializes page for GeneralAdvanced
|
||||
// Inputs:
|
||||
// Side effects:
|
||||
|
||||
void XFE_PrefsPageGeneralAdvanced::init()
|
||||
void XFE_PrefsPageGeneralPrivacy::init()
|
||||
{
|
||||
XP_ASSERT(m_prefsDataGeneralAdvanced);
|
||||
XP_ASSERT(m_prefsDataGeneralPrivacy);
|
||||
|
||||
PrefsDataGeneralAdvanced *fep = m_prefsDataGeneralAdvanced;
|
||||
PrefsDataGeneralPrivacy *fep = m_prefsDataGeneralPrivacy;
|
||||
XFE_GlobalPrefs *prefs = &fe_globalPrefs;
|
||||
Boolean sensitive;
|
||||
|
||||
XtVaSetValues(fep->show_image_toggle,
|
||||
XmNset, prefs->autoload_images_p,
|
||||
XmNsensitive, !PREF_PrefIsLocked("general.always_load_images"),
|
||||
0);
|
||||
XtVaSetValues(fep->enable_style_sheet_toggle,
|
||||
XmNset, prefs->enable_style_sheet,
|
||||
XmNsensitive, !PREF_PrefIsLocked("browser.enable_style_sheets"),
|
||||
0);
|
||||
|
||||
#ifdef JAVA
|
||||
XtVaSetValues(fep->enable_java_toggle,
|
||||
XmNset, prefs->enable_java,
|
||||
XmNsensitive, !PREF_PrefIsLocked("security.enable_java"),
|
||||
0);
|
||||
#endif /* JAVA */
|
||||
|
||||
XtVaSetValues(fep->enable_js_toggle,
|
||||
XmNset, prefs->enable_javascript,
|
||||
XmNsensitive, !PREF_PrefIsLocked("javascript.enabled"),
|
||||
0);
|
||||
|
||||
XtVaSetValues(fep->auto_install_toggle,
|
||||
XmNset, prefs->auto_install,
|
||||
XmNsensitive, !PREF_PrefIsLocked("autoupdate.enabled"),
|
||||
0);
|
||||
XtVaSetValues(fep->email_anonftp_toggle,
|
||||
XmNset, prefs->email_anonftp,
|
||||
XmNsensitive, !PREF_PrefIsLocked("security.email_as_ftp_password"),
|
||||
0);
|
||||
|
||||
#ifdef XFE_PREF_ADVANCED_PASSIVE_FTP
|
||||
XtVaSetValues(fep->passive_ftp_toggle,
|
||||
XmNset, prefs->passive_ftp,
|
||||
XmNsensitive, !PREF_PrefIsLocked("network.ftp.passive"),
|
||||
0);
|
||||
#endif
|
||||
|
||||
// Cookie
|
||||
|
||||
// Cookies
|
||||
sensitive = !PREF_PrefIsLocked("network.cookie.cookieBehavior");
|
||||
XtVaSetValues(fep->always_accept_cookie_toggle,
|
||||
XmNset, prefs->accept_cookie == NET_Accept,
|
||||
|
|
@ -2752,108 +2862,63 @@ void XFE_PrefsPageGeneralAdvanced::init()
|
|||
setInitialized(TRUE);
|
||||
}
|
||||
|
||||
// Member: install
|
||||
// Description:
|
||||
// Inputs:
|
||||
// Side effects:
|
||||
|
||||
void XFE_PrefsPageGeneralAdvanced::install()
|
||||
void XFE_PrefsPageGeneralPrivacy::install()
|
||||
{
|
||||
fe_installGeneralAdvanced();
|
||||
// Legacy code?
|
||||
// fe_installGeneralAdvanced();
|
||||
|
||||
if (m_toolbar_needs_updating) {
|
||||
// Notify whoever is interested in updating toolbar appearance
|
||||
XFE_MozillaApp::theApp()->notifyInterested(XFE_MozillaApp::updateToolbarAppearance);
|
||||
XFE_MozillaApp::theApp()->
|
||||
notifyInterested(XFE_MozillaApp::updateToolbarAppearance);
|
||||
|
||||
m_toolbar_needs_updating = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
// Member: save
|
||||
// Description:
|
||||
// Inputs:
|
||||
// Side effects:
|
||||
|
||||
void XFE_PrefsPageGeneralAdvanced::save()
|
||||
void XFE_PrefsPageGeneralPrivacy::save()
|
||||
{
|
||||
PrefsDataGeneralAdvanced *fep = m_prefsDataGeneralAdvanced;
|
||||
PrefsDataGeneralPrivacy *fep = m_prefsDataGeneralPrivacy;
|
||||
Boolean b;
|
||||
|
||||
int old_autoload_images = fe_globalPrefs.autoload_images_p;
|
||||
|
||||
XP_ASSERT(fep);
|
||||
|
||||
XtVaGetValues(fep->show_image_toggle, XmNset, &b, 0);
|
||||
fe_globalPrefs.autoload_images_p = b;
|
||||
|
||||
XtVaGetValues(fep->enable_style_sheet_toggle, XmNset, &b, 0);
|
||||
fe_globalPrefs.enable_style_sheet = b;
|
||||
|
||||
#ifdef JAVA
|
||||
XtVaGetValues(fep->enable_java_toggle, XmNset, &b, 0);
|
||||
fe_globalPrefs.enable_java = b;
|
||||
#endif /* JAVA */
|
||||
|
||||
XtVaGetValues(fep->enable_js_toggle, XmNset, &b, 0);
|
||||
fe_globalPrefs.enable_javascript = b;
|
||||
|
||||
XtVaGetValues(fep->auto_install_toggle, XmNset, &b, 0);
|
||||
fe_globalPrefs.auto_install = b;
|
||||
|
||||
XtVaGetValues(fep->email_anonftp_toggle, XmNset, &b, 0);
|
||||
fe_globalPrefs.email_anonftp = b;
|
||||
|
||||
#ifdef XFE_PREF_ADVANCED_PASSIVE_FTP
|
||||
XtVaGetValues(fep->passive_ftp_toggle, XmNset, &b, 0);
|
||||
NET_UsePASV(fe_globalPrefs.passive_ftp = b);
|
||||
#endif
|
||||
|
||||
// Cookies
|
||||
|
||||
XtVaGetValues(fep->always_accept_cookie_toggle, XmNset, &b, 0);
|
||||
if (b) fe_globalPrefs.accept_cookie = NET_Accept;
|
||||
if (b) {
|
||||
fe_globalPrefs.accept_cookie = NET_Accept;
|
||||
}
|
||||
|
||||
XtVaGetValues(fep->no_foreign_cookie_toggle, XmNset, &b, 0);
|
||||
if (b) fe_globalPrefs.accept_cookie = NET_DontAcceptForeign;
|
||||
if (b) {
|
||||
fe_globalPrefs.accept_cookie = NET_DontAcceptForeign;
|
||||
}
|
||||
|
||||
XtVaGetValues(fep->never_accept_cookie_toggle, XmNset, &b, 0);
|
||||
|
||||
if (b) fe_globalPrefs.accept_cookie = NET_DontUse;
|
||||
if (b) {
|
||||
fe_globalPrefs.accept_cookie = NET_DontUse;
|
||||
}
|
||||
|
||||
XtVaGetValues(fep->warn_cookie_toggle, XmNset, &b, 0);
|
||||
fe_globalPrefs.warn_accept_cookie = b;
|
||||
|
||||
if (old_autoload_images != fe_globalPrefs.autoload_images_p) {
|
||||
m_toolbar_needs_updating = TRUE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Install preferences
|
||||
|
||||
install();
|
||||
}
|
||||
|
||||
// Member: getData
|
||||
// Description:
|
||||
// Inputs:
|
||||
// Side effects:
|
||||
|
||||
PrefsDataGeneralAdvanced *XFE_PrefsPageGeneralAdvanced::getData()
|
||||
PrefsDataGeneralPrivacy *XFE_PrefsPageGeneralPrivacy::getData()
|
||||
{
|
||||
return m_prefsDataGeneralAdvanced;
|
||||
return m_prefsDataGeneralPrivacy;
|
||||
}
|
||||
|
||||
// Member: cb_toggleCookieState
|
||||
// Description:
|
||||
// Inputs:
|
||||
// Side effects:
|
||||
|
||||
void XFE_PrefsPageGeneralAdvanced::cb_toggleCookieState(Widget w,
|
||||
void XFE_PrefsPageGeneralPrivacy::cb_toggleCookieState(Widget w,
|
||||
XtPointer closure,
|
||||
XtPointer callData)
|
||||
{
|
||||
XmToggleButtonCallbackStruct *cb = (XmToggleButtonCallbackStruct *)callData;
|
||||
PrefsDataGeneralAdvanced *fep = (PrefsDataGeneralAdvanced *)closure;
|
||||
PrefsDataGeneralPrivacy *fep = (PrefsDataGeneralPrivacy *)closure;
|
||||
|
||||
if (! cb->set) {
|
||||
XtVaSetValues(w, XmNset, True, 0);
|
||||
|
|
@ -2874,63 +2939,6 @@ void XFE_PrefsPageGeneralAdvanced::cb_toggleCookieState(Widget w,
|
|||
abort();
|
||||
}
|
||||
|
||||
// ********************************************************************
|
||||
// ************************ General/Privacy **************************
|
||||
// ********************************************************************
|
||||
|
||||
|
||||
XFE_PrefsPageGeneralPrivacy::XFE_PrefsPageGeneralPrivacy(XFE_PrefsDialog *dialog)
|
||||
: XFE_PrefsPage(dialog),
|
||||
m_prefsDataGeneralPrivacy(0)
|
||||
{
|
||||
m_toolbar_needs_updating = FALSE;
|
||||
}
|
||||
|
||||
XFE_PrefsPageGeneralPrivacy::~XFE_PrefsPageGeneralPrivacy()
|
||||
{
|
||||
delete m_prefsDataGeneralPrivacy;
|
||||
}
|
||||
|
||||
|
||||
void XFE_PrefsPageGeneralPrivacy::create()
|
||||
{
|
||||
PrefsDataGeneralPrivacy *fep = NULL;
|
||||
Widget form;
|
||||
|
||||
// Zap our data structure.
|
||||
fep = new PrefsDataGeneralPrivacy;
|
||||
memset(fep, 0, sizeof(PrefsDataGeneralPrivacy));
|
||||
m_prefsDataGeneralPrivacy = fep;
|
||||
|
||||
// Form
|
||||
form = XmCreateForm (m_wPageForm, "privacy", NULL, 0);
|
||||
XtManageChild(form);
|
||||
m_wPage = fep->page = form;
|
||||
|
||||
setCreated(TRUE);
|
||||
}
|
||||
|
||||
void XFE_PrefsPageGeneralPrivacy::init()
|
||||
{
|
||||
|
||||
setInitialized(TRUE);
|
||||
}
|
||||
|
||||
void XFE_PrefsPageGeneralPrivacy::install()
|
||||
{
|
||||
}
|
||||
|
||||
void XFE_PrefsPageGeneralPrivacy::save()
|
||||
{
|
||||
|
||||
install();
|
||||
}
|
||||
|
||||
PrefsDataGeneralPrivacy *XFE_PrefsPageGeneralPrivacy::getData()
|
||||
{
|
||||
return m_prefsDataGeneralPrivacy;
|
||||
}
|
||||
|
||||
// ************************************************************************
|
||||
// ************************** General/Appl ***************************
|
||||
// ************************************************************************
|
||||
|
|
@ -2979,7 +2987,7 @@ mimetype_is_locked(char* pref_name)
|
|||
* locked by preferences.
|
||||
*/
|
||||
static void
|
||||
selection_cb(Widget w, XtPointer closure, XtPointer callData)
|
||||
selection_cb(Widget /*w*/, XtPointer closure, XtPointer callData)
|
||||
{
|
||||
XmLGridCallbackStruct* cb = (XmLGridCallbackStruct*) callData;
|
||||
PrefsDataGeneralAppl* fep = (PrefsDataGeneralAppl*) closure;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче