diff --git a/data/net.launchpad.plank.gschema.xml.in b/data/net.launchpad.plank.gschema.xml.in
index e122aec..6c2efe4 100644
--- a/data/net.launchpad.plank.gschema.xml.in
+++ b/data/net.launchpad.plank.gschema.xml.in
@@ -128,16 +128,5 @@
<summary>Dock unhide delay</summary>
<description>Length of the delay before unhiding the dock, in milliseconds.</description>
</key>
- <key name="zoom-enabled" type="b">
- <default>false</default>
- <summary>Zoom dock items when hovered</summary>
- <description>If true, zoom dock items when hovered with the cursor.</description>
- </key>
- <key name="zoom-percent" type="i">
- <range min="100" max="200"/>
- <default>150</default>
- <summary>Icon zoom percentage</summary>
- <description>The amount to zoom dock items, in percent.</description>
- </key>
</schema>
</schemalist>
diff --git a/data/ui/preferences.ui b/data/ui/preferences.ui
index 647c90d..a394105 100644
--- a/data/ui/preferences.ui
+++ b/data/ui/preferences.ui
@@ -42,13 +42,6 @@ along with plank. If not, see <http://www.gnu.org/licenses/>.
<property name="upper">2500</property>
<property name="step_increment">50</property>
</object>
- <object class="GtkAdjustment" id="adj_zoom_percent">
- <property name="lower">100</property>
- <property name="upper">200</property>
- <property name="value">150</property>
- <property name="step_increment">5</property>
- <property name="page_increment">10</property>
- </object>
<template class="PlankPreferencesWindow" parent="GtkWindow">
<property name="can_focus">False</property>
<property name="resizable">False</property>
@@ -271,45 +264,6 @@ along with plank. If not, see <http://www.gnu.org/licenses/>.
<property name="width">2</property>
</packing>
</child>
- <child>
- <object class="GtkScale" id="s_zoom_percent">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adj_zoom_percent</property>
- <property name="digits">0</property>
- <property name="value_pos">right</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkSwitch" id="sw_zoom_enabled">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">start</property>
- <property name="valign">center</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="l_iconzoom">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes">Icon Zoom:</property>
- <property name="justify">right</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">6</property>
- <property name="width">2</property>
- </packing>
- </child>
<child>
<object class="GtkSwitch" id="sw_primary_display">
<property name="visible">True</property>
diff --git a/lib/DockPreferences.vala b/lib/DockPreferences.vala
index a6fec4b..07d86b4 100644
--- a/lib/DockPreferences.vala
+++ b/lib/DockPreferences.vala
@@ -82,10 +82,10 @@ namespace Plank
public bool ShowDockItem { get; set; }
[Description(nick = "zoom-enabled", blurb = "Whether the dock will zoom when hovered.")]
- public bool ZoomEnabled { get; set; }
+ public bool ZoomEnabled { get { return false; } }
[Description(nick = "zoom-percent", blurb = "The dock's icon-zoom (in percent).")]
- public uint ZoomPercent { get; set; }
+ public uint ZoomPercent { get { return 100; } }
[Description(nick = "tooltips-enabled", blurb = "Whether to show tooltips when items are hovered.")]
public bool TooltipsEnabled { get; set; }
diff --git a/lib/Widgets/PreferencesWindow.vala b/lib/Widgets/PreferencesWindow.vala
index e9444e1..0c34a97 100644
--- a/lib/Widgets/PreferencesWindow.vala
+++ b/lib/Widgets/PreferencesWindow.vala
@@ -48,8 +48,6 @@ namespace Plank
Gtk.SpinButton sp_unhide_delay;
[GtkChild]
Gtk.Scale s_offset;
- [GtkChild]
- Gtk.Scale s_zoom_percent;
[GtkChild]
Gtk.Adjustment adj_hide_delay;
@@ -59,8 +57,6 @@ namespace Plank
Gtk.Adjustment adj_iconsize;
[GtkChild]
Gtk.Adjustment adj_offset;
- [GtkChild]
- Gtk.Adjustment adj_zoom_percent;
[GtkChild]
Gtk.Switch sw_hide;
@@ -74,8 +70,6 @@ namespace Plank
Gtk.Switch sw_lock_items;
[GtkChild]
Gtk.Switch sw_pressure_reveal;
- [GtkChild]
- Gtk.Switch sw_zoom_enabled;
[GtkChild]
Gtk.IconView view_docklets;
@@ -174,12 +168,6 @@ namespace Plank
case "UnhideDelay":
adj_unhide_delay.value = prefs.UnhideDelay;
break;
- case "ZoomEnabled":
- sw_zoom_enabled.set_active (prefs.ZoomEnabled);
- break;
- case "ZoomPercent":
- adj_zoom_percent.value = prefs.ZoomPercent;
- break;
// Ignored settings
case "DockItems":
break;
@@ -265,17 +253,6 @@ namespace Plank
prefs.PressureReveal = ((Gtk.Switch) widget).get_active ();
}
- void zoom_enabled_toggled (GLib.Object widget, ParamSpec param)
- {
- if (((Gtk.Switch) widget).get_active ()) {
- prefs.ZoomEnabled = true;
- s_zoom_percent.sensitive = true;
- } else {
- prefs.ZoomEnabled = false;
- s_zoom_percent.sensitive = false;
- }
- }
-
void iconsize_changed (Gtk.Adjustment adj)
{
prefs.IconSize = (int) adj.value;
@@ -296,11 +273,6 @@ namespace Plank
prefs.UnhideDelay = (int) adj.value;
}
- void zoom_percent_changed (Gtk.Adjustment adj)
- {
- prefs.ZoomPercent = (int) adj.value;
- }
-
void monitor_changed (Gtk.ComboBox widget)
{
prefs.Monitor = ((Gtk.ComboBoxText) widget).get_active_text ();
@@ -318,14 +290,12 @@ namespace Plank
cb_display_plug.changed.connect (monitor_changed);
adj_iconsize.value_changed.connect (iconsize_changed);
adj_offset.value_changed.connect (offset_changed);
- adj_zoom_percent.value_changed.connect (zoom_percent_changed);
sw_hide.notify["active"].connect (hide_toggled);
sw_primary_display.notify["active"].connect (primary_display_toggled);
sw_workspace_only.notify["active"].connect (workspace_only_toggled);
sw_show_unpinned.notify["active"].connect (show_unpinned_toggled);
sw_lock_items.notify["active"].connect (lock_items_toggled);
sw_pressure_reveal.notify["active"].connect (pressure_reveal_toggled);
- sw_zoom_enabled.notify["active"].connect (zoom_enabled_toggled);
cb_alignment.changed.connect (alignment_changed);
cb_items_alignment.changed.connect (items_alignment_changed);
}
@@ -342,14 +312,12 @@ namespace Plank
cb_display_plug.changed.disconnect (monitor_changed);
adj_iconsize.value_changed.disconnect (iconsize_changed);
adj_offset.value_changed.disconnect (offset_changed);
- adj_zoom_percent.value_changed.disconnect (zoom_percent_changed);
sw_hide.notify["active"].disconnect (hide_toggled);
sw_primary_display.notify["active"].disconnect (primary_display_toggled);
sw_workspace_only.notify["active"].disconnect (workspace_only_toggled);
sw_show_unpinned.notify["active"].disconnect (show_unpinned_toggled);
sw_lock_items.notify["active"].disconnect (lock_items_toggled);
sw_pressure_reveal.notify["active"].disconnect (pressure_reveal_toggled);
- sw_zoom_enabled.notify["active"].disconnect (zoom_enabled_toggled);
cb_alignment.changed.disconnect (alignment_changed);
cb_items_alignment.changed.disconnect (items_alignment_changed);
}
@@ -388,16 +356,13 @@ namespace Plank
adj_iconsize.value = prefs.IconSize;
adj_offset.value = prefs.Offset;
- adj_zoom_percent.value = prefs.ZoomPercent;
s_offset.sensitive = (prefs.Alignment == Gtk.Align.CENTER);
- s_zoom_percent.sensitive = prefs.ZoomEnabled;
sw_hide.set_active (prefs.HideMode != HideType.NONE);
sw_primary_display.set_active (prefs.Monitor == "");
sw_workspace_only.set_active (prefs.CurrentWorkspaceOnly);
sw_show_unpinned.set_active (!prefs.PinnedOnly);
sw_lock_items.set_active (prefs.LockItems);
sw_pressure_reveal.set_active (prefs.PressureReveal);
- sw_zoom_enabled.set_active (prefs.ZoomEnabled);
cb_alignment.active_id = ((int) prefs.Alignment).to_string ();
cb_items_alignment.active_id = ((int) prefs.ItemsAlignment).to_string ();
cb_items_alignment.sensitive = (prefs.Alignment == Gtk.Align.FILL);