elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-11-24 12:23:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Replace Expo with WindowOverview

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

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

2
data/org.pantheon.desktop.gala.gschema.xml
View File

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

14
src/Plugin.vala
View File

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

4
src/Expo.vala → src/WindowOverview.vala
View File

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