aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/e-shell-view.c22
-rw-r--r--shell/e-shell-window.c25
-rw-r--r--shell/e-shell.c57
-rw-r--r--shell/e-shell.h1
4 files changed, 1 insertions, 104 deletions
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 9b3aa4a0f1..77597d0595 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -679,28 +679,6 @@ shell_view_construct_searchbar (EShellView *shell_view)
gtk_toolbar_insert (GTK_TOOLBAR (main_toolbar), item, -1);
- if (e_shell_get_small_screen_mode (shell)) {
- GtkWidget *image;
- GtkWidget *container;
- GtkAction *action;
- GtkToolItem *item;
-
- action = e_shell_window_get_action (
- shell_window, "close-window");
- image = gtk_image_new_from_icon_name (
- "window-close-hover", GTK_ICON_SIZE_DIALOG);
- item = gtk_tool_button_new (
- image, gtk_action_get_label (action));
- gtk_widget_set_name (GTK_WIDGET (item), "MeeGoCloseButton");
- gtk_activatable_set_related_action (
- GTK_ACTIVATABLE (item), action);
- container = e_shell_window_get_menu_bar_box (shell_window);
- gtk_box_pack_start (
- GTK_BOX (container),
- GTK_WIDGET (item), FALSE, FALSE, 0);
- gtk_widget_show_all (GTK_WIDGET (item));
- }
-
return widget;
}
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index e3f383ed11..f2cfdc7fc9 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -399,10 +399,6 @@ shell_window_constructed (GObject *object)
e_extensible_load_extensions (E_EXTENSIBLE (object));
- if (e_shell_get_meego_mode (shell_window->priv->shell) &&
- e_shell_get_small_screen_mode (shell_window->priv->shell))
- gtk_window_set_decorated (GTK_WINDOW (object), FALSE);
-
/* Chain up to parent's constructed() method. */
G_OBJECT_CLASS (e_shell_window_parent_class)->constructed (object);
}
@@ -416,27 +412,6 @@ shell_window_construct_menubar (EShellWindow *shell_window)
shell_window, "/main-menu");
gtk_widget_show (main_menu);
- if (e_shell_get_small_screen_mode (shell_window->priv->shell)) {
- GtkWidget *parent, *child;
-
- parent = gtk_widget_get_parent (main_menu);
- g_object_ref (parent);
- gtk_container_remove ((GtkContainer *) parent, main_menu);
- child = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start ((GtkBox *) child, main_menu, TRUE, TRUE, 0);
- gtk_widget_show (child);
- gtk_container_add ((GtkContainer *) parent, child);
- shell_window->priv->menubar_box = child;
-
- g_object_bind_property (
- main_menu, "visible",
- child, "visible",
- G_BINDING_BIDIRECTIONAL |
- G_BINDING_SYNC_CREATE);
-
- main_menu = child;
- }
-
g_signal_connect (
shell_window, "notify::active-view",
G_CALLBACK (shell_window_menubar_update_new_menu), NULL);
diff --git a/shell/e-shell.c b/shell/e-shell.c
index efb3348843..2e32929dcd 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -77,7 +77,6 @@ struct _EShellPrivate {
guint online : 1;
guint quit_cancelled : 1;
guint safe_mode : 1;
- guint small_screen_mode : 1;
};
enum {
@@ -85,7 +84,6 @@ enum {
PROP_CLIENT_CACHE,
PROP_EXPRESS_MODE,
PROP_MEEGO_MODE,
- PROP_SMALL_SCREEN_MODE,
PROP_GEOMETRY,
PROP_MODULE_DIRECTORY,
PROP_NETWORK_AVAILABLE,
@@ -531,13 +529,6 @@ shell_set_meego_mode (EShell *shell,
}
static void
-shell_set_small_screen_mode (EShell *shell,
- gboolean small_screen)
-{
- shell->priv->small_screen_mode = small_screen;
-}
-
-static void
shell_set_geometry (EShell *shell,
const gchar *geometry)
{
@@ -574,12 +565,6 @@ shell_set_property (GObject *object,
g_value_get_boolean (value));
return;
- case PROP_SMALL_SCREEN_MODE:
- shell_set_small_screen_mode (
- E_SHELL (object),
- g_value_get_boolean (value));
- return;
-
case PROP_GEOMETRY:
shell_set_geometry (
E_SHELL (object),
@@ -633,12 +618,6 @@ shell_get_property (GObject *object,
E_SHELL (object)));
return;
- case PROP_SMALL_SCREEN_MODE:
- g_value_set_boolean (
- value, e_shell_get_small_screen_mode (
- E_SHELL (object)));
- return;
-
case PROP_MODULE_DIRECTORY:
g_value_set_string (
value, e_shell_get_module_directory (
@@ -937,23 +916,6 @@ e_shell_class_init (EShellClass *class)
G_PARAM_CONSTRUCT_ONLY));
/**
- * EShell:small-screen
- *
- * Are we running with a small (1024x600) screen - if so, start
- * throwing the babies overboard to fit onto that screen size.
- **/
- g_object_class_install_property (
- object_class,
- PROP_SMALL_SCREEN_MODE,
- g_param_spec_boolean (
- "small-screen-mode",
- "Small Screen Mode",
- "Whether we run on a rather small screen",
- FALSE,
- G_PARAM_READWRITE |
- G_PARAM_CONSTRUCT_ONLY));
-
- /**
* EShell:geometry
*
* User-specified initial window geometry string to apply
@@ -1635,22 +1597,6 @@ e_shell_get_meego_mode (EShell *shell)
}
/**
- * e_shell_get_small_screen_mode:
- * @shell: an #EShell
- *
- * Returns %TRUE if Evolution is in small (netbook) screen mode.
- *
- * Returns: %TRUE if Evolution is in small screen mode
- **/
-gboolean
-e_shell_get_small_screen_mode (EShell *shell)
-{
- g_return_val_if_fail (E_IS_SHELL (shell), FALSE);
-
- return shell->priv->small_screen_mode;
-}
-
-/**
* e_shell_get_module_directory:
* @shell: an #EShell
*
@@ -1911,8 +1857,7 @@ e_shell_adapt_window_size (EShell *shell,
GdkWindow *gdk_window;
gint monitor;
- if (!e_shell_get_meego_mode (shell) ||
- !e_shell_get_small_screen_mode (shell))
+ if (!e_shell_get_meego_mode (shell) || TRUE)
return;
screen = gdk_screen_get_default ();
diff --git a/shell/e-shell.h b/shell/e-shell.h
index 94ed735c69..7829b8cf69 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -128,7 +128,6 @@ void e_shell_submit_alert (EShell *shell,
GtkWindow * e_shell_get_active_window (EShell *shell);
gboolean e_shell_get_meego_mode (EShell *shell);
gboolean e_shell_get_express_mode (EShell *shell);
-gboolean e_shell_get_small_screen_mode (EShell *shell);
const gchar * e_shell_get_module_directory (EShell *shell);
gboolean e_shell_get_network_available (EShell *shell);
void e_shell_set_network_available (EShell *shell,
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 02:13:27 +0800