summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog18
-rw-r--r--TODO1
-rw-r--r--embed/mozilla/EphyAboutRedirector.cpp1
-rw-r--r--embed/mozilla/EphyAboutRedirector.h1
-rw-r--r--embed/mozilla/MozRegisterComponents.cpp7
-rw-r--r--embed/mozilla/MozillaPrivate.cpp1
-rw-r--r--lib/egg/egg-action-group.c4
-rw-r--r--src/ephy-automation.c5
-rw-r--r--src/ephy-encoding-menu.c6
-rw-r--r--src/ephy-shell.c6
-rw-r--r--src/ephy-window.c2
11 files changed, 46 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 52f29e8cd..f03451daf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
2003-03-04 Marco Pesenti Gritti <marco@it.gnome.org>
+ * TODO:
+ * embed/mozilla/EphyAboutRedirector.cpp:
+ * embed/mozilla/EphyAboutRedirector.h:
+ * embed/mozilla/MozRegisterComponents.cpp:
+ * embed/mozilla/MozillaPrivate.cpp:
+ * lib/egg/egg-action-group.c:
+ * src/ephy-encoding-menu.c: (build_group), (build_charset):
+
+ Translate menus
+
+ * src/ephy-automation.c: (impl_ephy_automation_loadurl):
+ * src/ephy-shell.c: (ephy_shell_new_tab):
+ * src/ephy-window.c:
+
+ Make -f work
+
+2003-03-04 Marco Pesenti Gritti <marco@it.gnome.org>
+
* data/Makefile.am:
* embed/mozilla/Makefile.am:
* embed/mozilla/MozRegisterComponents.cpp:
diff --git a/TODO b/TODO
index fd3595391..780b7cf50 100644
--- a/TODO
+++ b/TODO
@@ -30,3 +30,4 @@ Done:
* history shows empty hosts sometimes !?
* save bookmarks dialog state (current keyword)
* embed dialogs crashes when the window has been closed
+* not translated menus
diff --git a/embed/mozilla/EphyAboutRedirector.cpp b/embed/mozilla/EphyAboutRedirector.cpp
index c655b652c..faab56850 100644
--- a/embed/mozilla/EphyAboutRedirector.cpp
+++ b/embed/mozilla/EphyAboutRedirector.cpp
@@ -58,6 +58,7 @@ struct RedirEntry {
static RedirEntry kRedirMap[] = {
{ "epiphany", "file://" SHARE_DIR "/epiphany.html" },
{ "options", "http://epiphany.mozdev.org/about/options.html" },
+ { "marco", "http://mpgritti.oltrelinux.com" }
};
static const int kRedirTotal = sizeof(kRedirMap)/sizeof(*kRedirMap);
diff --git a/embed/mozilla/EphyAboutRedirector.h b/embed/mozilla/EphyAboutRedirector.h
index e135276c3..52d3dc76a 100644
--- a/embed/mozilla/EphyAboutRedirector.h
+++ b/embed/mozilla/EphyAboutRedirector.h
@@ -67,6 +67,7 @@ protected:
#define EPHY_ABOUT_REDIRECTOR_OPTIONS_CONTRACTID NS_ABOUT_MODULE_CONTRACTID_PREFIX "options"
#define EPHY_ABOUT_REDIRECTOR_EPIPHANY_CONTRACTID NS_ABOUT_MODULE_CONTRACTID_PREFIX "epiphany"
+#define EPHY_ABOUT_REDIRECTOR_MARCO_CONTRACTID NS_ABOUT_MODULE_CONTRACTID_PREFIX "marco"
#define EPHY_ABOUT_REDIRECTOR_CLASSNAME "Epiphany's about redirector"
nsresult NS_NewEphyAboutRedirectorFactory(nsIFactory** aFactory);
diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp
index 8534738ec..11cba69b3 100644
--- a/embed/mozilla/MozRegisterComponents.cpp
+++ b/embed/mozilla/MozRegisterComponents.cpp
@@ -111,6 +111,13 @@ mozilla_register_components (void)
PR_TRUE);
if (NS_FAILED(rv)) ret = FALSE;
+ rv = RegisterFactory (NS_NewEphyAboutRedirectorFactory,
+ kEphyAboutRedirectorCID,
+ EPHY_ABOUT_REDIRECTOR_CLASSNAME,
+ EPHY_ABOUT_REDIRECTOR_MARCO_CONTRACTID,
+ PR_TRUE);
+ if (NS_FAILED(rv)) ret = FALSE;
+
rv = RegisterFactory (NS_NewFtpHandlerFactory, kFtpHandlerCID,
G_FTP_CONTENT_CLASSNAME, G_FTP_CONTENT_CONTRACTID,
PR_TRUE);
diff --git a/embed/mozilla/MozillaPrivate.cpp b/embed/mozilla/MozillaPrivate.cpp
index a7bc50a6c..0847f3473 100644
--- a/embed/mozilla/MozillaPrivate.cpp
+++ b/embed/mozilla/MozillaPrivate.cpp
@@ -56,6 +56,7 @@ NS_METHOD MozillaCollatePrintSettings (const EmbedPrintInfo *info,
switch (info->pages)
{
case 0:
+ options->SetPrintRange (nsIPrintSettings::kRangeAllPages);
break;
case 1:
options->SetPrintRange (nsIPrintSettings::kRangeSpecifiedPageRange);
diff --git a/lib/egg/egg-action-group.c b/lib/egg/egg-action-group.c
index b1aba64a5..43cb7f9d4 100644
--- a/lib/egg/egg-action-group.c
+++ b/lib/egg/egg-action-group.c
@@ -2,9 +2,7 @@
#include "egg-toggle-action.h"
#include "egg-radio-action.h"
-#ifndef _
-# define _(s) (s)
-#endif
+#define _(String) gettext (String)
static void egg_action_group_init (EggActionGroup *self);
static void egg_action_group_class_init (EggActionGroupClass *class);
diff --git a/src/ephy-automation.c b/src/ephy-automation.c
index d7757fe75..75829d444 100644
--- a/src/ephy-automation.c
+++ b/src/ephy-automation.c
@@ -135,6 +135,11 @@ impl_ephy_automation_loadurl (PortableServer_Servant _servant,
flags |= EPHY_NEW_TAB_IN_EXISTING_WINDOW;
}
+ if (fullscreen)
+ {
+ flags |= EPHY_NEW_TAB_FULLSCREEN;
+ }
+
ephy_shell_new_tab (ephy_shell, window, NULL, load_page,
flags);
diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c
index 95b3ed050..b97011bac 100644
--- a/src/ephy-encoding-menu.c
+++ b/src/ephy-encoding-menu.c
@@ -27,6 +27,8 @@
#include "ephy-shell.h"
#include "ephy-debug.h"
+#include <libgnome/gnome-i18n.h>
+
/**
* Private data
*/
@@ -188,7 +190,7 @@ build_group (EggActionGroup *action_group, GString *xml_string, const char *grou
action = g_object_new (EGG_TYPE_ACTION,
"name", verb,
- "label", group,
+ "label", _(group),
NULL);
egg_action_group_add_action (action_group, action);
g_object_unref (action);
@@ -214,7 +216,7 @@ build_charset (EggActionGroup *action_group,
verb = g_strdup_printf ("Charset%d", index);
action = g_object_new (EGG_TYPE_ACTION,
"name", verb,
- "label", info->title,
+ "label", _(info->title),
NULL);
g_signal_connect_closure
(action, "activate",
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 6f5ca6445..69af9e562 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -523,6 +523,12 @@ ephy_shell_new_tab (EphyShell *shell,
ephy_embed_load_url (embed, url);
}
+ if (flags & EPHY_NEW_TAB_FULLSCREEN)
+ {
+ ephy_window_set_chrome (window, EMBED_CHROME_OPENASFULLSCREEN |
+ EMBED_CHROME_DEFAULT);
+ }
+
return tab;
}
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 6d313b298..37a1ead9f 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -36,7 +36,6 @@
#include "statusbar.h"
#include "toolbar.h"
#include "popup-commands.h"
-#include "egg-toggle-action.h"
#include "ephy-encoding-menu.h"
#include "ephy-stock-icons.h"
@@ -51,6 +50,7 @@
#include <gdk/gdkkeysyms.h>
#include "egg-action-group.h"
#include "egg-menu-merge.h"
+#include "egg-toggle-action.h"
static EggActionGroupEntry ephy_menu_entries [] = {
View Lorry Controller Status