Replace Expo with WindowOverview

This commit is contained in:
Tom Beckmann 2012-08-25 01:28:11 +02:00
parent 7dae5e002e
commit 1fd76ba141
4 changed files with 11 additions and 11 deletions

View File

@ -48,7 +48,7 @@ ensure_vala_version("0.16.0" MINIMUM)
include(ValaPrecompile)
vala_precompile(VALA_C
src/DBus.vala
src/Expo.vala
src/WindowOverview.vala
src/Main.vala
src/Plugin.vala
src/Settings.vala

View File

@ -7,7 +7,7 @@
<value nick="minimize-current" value="3" />
<value nick="open-launcher" value="4" />
<value nick="custom-command" value="5" />
<value nick="expose" value="6" />
<value nick="window-overview" value="6" />
</enum>
<enum id="GalaWindowOverviewType">
<value nick='grid' value='0'/>

View File

@ -27,7 +27,7 @@ namespace Gala
MINIMIZE_CURRENT,
OPEN_LAUNCHER,
CUSTOM_COMMAND,
EXPOSE
WINDOW_OVERVIEW
}
public enum InputArea {
@ -40,7 +40,7 @@ namespace Gala
{
WindowSwitcher winswitcher;
WorkspaceView workspace_view;
Expo expo;
WindowOverview window_overview;
Window? moving; //place for the window that is being moved over
@ -79,16 +79,16 @@ namespace Gala
winswitcher = new WindowSwitcher (this);
expo = new Expo (this);
window_overview = new WindowOverview (this);
stage.add_child (workspace_view);
stage.add_child (winswitcher);
stage.add_child (expo);
stage.add_child (window_overview);
/*keybindings*/
screen.get_display ().add_keybinding ("expose-windows", BehaviorSettings.get_default ().schema, 0, () => {
expo.open (true);
window_overview.open (true);
});
screen.get_display ().add_keybinding ("move-to-workspace-first", BehaviorSettings.get_default ().schema, 0, () => {
screen.get_workspace_by_index (0).activate (screen.get_display ().get_current_time ());
@ -288,8 +288,8 @@ namespace Gala
warning (e.message);
}
break;
case ActionType.EXPOSE:
expo.open (true);
case ActionType.WINDOW_OVERVIEW:
window_overview.open (true);
break;
default:
warning ("Trying to run unknown action");

View File

@ -27,7 +27,7 @@ namespace Gala
NATURAL
}
public class Expo : Actor
public class WindowOverview : Actor
{
Plugin plugin;
Screen screen;
@ -36,7 +36,7 @@ namespace Gala
static const int PADDING = 50;
public Expo (Plugin _plugin)
public WindowOverview (Plugin _plugin)
{
plugin = _plugin;
screen = plugin.get_screen ();