aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--shell/Makefile.am4
-rw-r--r--shell/e-active-connection-dialog.glade193
-rw-r--r--shell/e-shell-window-actions.c12
-rw-r--r--shell/e-shell.c46
4 files changed, 52 insertions, 203 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am
index b3a8a848bc..13f71d80c4 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -59,13 +59,11 @@ privsolib_LTLIBRARIES = \
eshellincludedir = $(privincludedir)/shell
eshellinclude_HEADERS = \
- Evolution.h \
e-shell-common.h \
e-shell-module.h \
e-shell-view.h \
e-shell-window.h \
e-shell-window-actions.h \
- e-user-creatable-items-handler.h \
es-event.h \
es-menu.h
@@ -76,7 +74,6 @@ libeshell_la_SOURCES = \
e-shell-view.c \
e-shell-window.c \
e-shell-window-actions.c \
- e-user-creatable-items-handler.c \
$(eshellinclude_HEADERS)
libeshell_la_LDFLAGS = $(NO_UNDEFINED)
@@ -123,7 +120,6 @@ errordir = $(privdatadir)/errors
@EVO_PLUGIN_RULE@
glade_DATA = \
- e-active-connection-dialog.glade \
import.glade
# GConf schemas
diff --git a/shell/e-active-connection-dialog.glade b/shell/e-active-connection-dialog.glade
deleted file mode 100644
index 534a7948f7..0000000000
--- a/shell/e-active-connection-dialog.glade
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="active_connection_dialog">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Active Connections</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
- <property name="modal">False</property>
- <property name="default_width">256</property>
- <property name="default_height">192</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="has_separator">False</property>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox2">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area2">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <widget class="GtkButton" id="cancelbutton1">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="response_id">-6</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="okbutton1">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="response_id">-5</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox2">
- <property name="border_width">12</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">12</property>
-
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Active Connections&lt;/b&gt;</property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">12</property>
-
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox3">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">12</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="active_connection_treeview">
- <property name="visible">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="instruction_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Click OK to close these connections and go offline</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-</glade-interface>
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index 13c2d42506..0f959fa668 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -1117,7 +1117,7 @@ e_shell_window_actions_init (EShellWindow *window)
domain = GETTEXT_PACKAGE;
/* Shell Actions */
- action_group = ACTION_GROUP (SHELL);
+ action_group = window->priv->shell_actions;
gtk_action_group_set_translation_domain (action_group, domain);
gtk_action_group_add_actions (
action_group, shell_entries,
@@ -1128,22 +1128,22 @@ e_shell_window_actions_init (EShellWindow *window)
gtk_ui_manager_insert_action_group (manager, action_group, 0);
/* New Item Actions (empty) */
- action_group = ACTION_GROUP (NEW_ITEM);
+ action_group = window->priv->new_item_actions;
gtk_action_group_set_translation_domain (action_group, domain);
gtk_ui_manager_insert_action_group (manager, action_group, 0);
/* New Group Actions (empty) */
- action_group = ACTION_GROUP (NEW_GROUP);
+ action_group = window->priv->new_group_actions;
gtk_action_group_set_translation_domain (action_group, domain);
gtk_ui_manager_insert_action_group (manager, action_group, 0);
/* New Source Actions (empty) */
- action_group = ACTION_GROUP (NEW_SOURCE);
+ action_group = window->priv->new_source_actions;
gtk_action_group_set_translation_domain (action_group, domain);
gtk_ui_manager_insert_action_group (manager, action_group, 0);
/* Shell View Actions (empty) */
- action_group = ACTION_GROUP (SHELL_VIEW);
+ action_group = window->priv->shell_view_actions;
gtk_action_group_set_translation_domain (action_group, domain);
gtk_ui_manager_insert_action_group (manager, action_group, 0);
}
@@ -1160,7 +1160,7 @@ e_shell_window_create_shell_view_actions (EShellWindow *window)
g_return_if_fail (E_IS_SHELL_WINDOW (window));
- action_group = ACTION_GROUP (SHELL_VIEW);
+ action_group = window->priv->shell_view_actions;
types = e_shell_registry_get_view_types (&n_types);
manager = e_shell_window_get_ui_manager (window);
merge_id = gtk_ui_manager_new_merge_id (manager);
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 25572dbcdc..a91c06dbe7 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -159,6 +159,31 @@ e_shell_handle_uri (const gchar *uri)
return e_shell_module_handle_uri (shell_module, uri);
}
+void
+e_shell_send_receive (GtkWindow *parent)
+{
+ /* FIXME */
+}
+
+void
+e_shell_go_offline (void)
+{
+ /* FIXME */
+}
+
+void
+e_shell_go_online (void)
+{
+ /* FIXME */
+}
+
+EShellLineStatus
+e_shell_get_line_status (void)
+{
+ /* FIXME */
+ return E_SHELL_LINE_STATUS_ONLINE;
+}
+
GtkWidget *
e_shell_get_preferences_window (void)
{
@@ -169,3 +194,24 @@ e_shell_get_preferences_window (void)
return preferences_window;
}
+
+gboolean
+e_shell_is_busy (void)
+{
+ /* FIXME */
+ return FALSE;
+}
+
+gboolean
+e_shell_do_quit (void)
+{
+ /* FIXME */
+ return TRUE;
+}
+
+gboolean
+e_shell_quit (void)
+{
+ /* FIXME */
+ return TRUE;
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 06:50:32 +0800