diff options
| author | Ken Moore <moorekou@gmail.com> | 2015-07-10 11:32:46 -0400 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2015-07-10 11:32:46 -0400 |
| commit | 10992a69d50af9c1ec249099fddf110f4d8546ad (patch) | |
| tree | 40898f15a74d6caad8262434a74a12642082361f /lumina-desktop | |
| parent | Merge branch 'master' of github.com:pcbsd/lumina (diff) | |
| download | lumina-10992a69d50af9c1ec249099fddf110f4d8546ad.tar.gz lumina-10992a69d50af9c1ec249099fddf110f4d8546ad.tar.bz2 lumina-10992a69d50af9c1ec249099fddf110f4d8546ad.zip | |
Final cleanup of debugging messages and temporary changes prior to release. Aslo update the default key bindings a bit:
1) Add a shortcut to lock the screen (Pause key)
2) Adjust the tiling shortcuts to Alt+[left/right] instead of Ctrl-[left/right]. The Ctrl shortcuts were already in use by Fluxbox.
Diffstat (limited to 'lumina-desktop')
| -rw-r--r-- | lumina-desktop/LDesktop.cpp | 2 | ||||
| -rw-r--r-- | lumina-desktop/LSession.cpp | 2 | ||||
| -rw-r--r-- | lumina-desktop/fluxboxconf/fluxbox-keys | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/lumina-desktop/LDesktop.cpp b/lumina-desktop/LDesktop.cpp index ec56b7b0..7f7105f3 100644 --- a/lumina-desktop/LDesktop.cpp +++ b/lumina-desktop/LDesktop.cpp @@ -361,8 +361,6 @@ void LDesktop::UpdateMenu(bool fast){ if(!desktoplocked){ deskMenu->addAction(LXDG::findIcon("document-encrypt",""),tr("Lock Desktop"), this, SLOT(ToggleDesktopLock()) ); deskMenu->addAction(LXDG::findIcon("snap-orthogonal",""),tr("Snap Plugins to Grid"), this, SLOT(AlignDesktopPlugins()) ); - deskMenu->addAction(LXDG::findIcon("shapes",""), tr("Tile Plugins"), bgDesktop, SLOT(tileSubWindows()) ); - deskMenu->addAction(LXDG::findIcon("window-duplicate",""), tr("Cascade Plugins"), bgDesktop, SLOT(cascadeSubWindows()) ); }else{ deskMenu->addAction(LXDG::findIcon("document-decrypt",""),tr("Unlock Desktop"), this, SLOT(ToggleDesktopLock()) ); } deskMenu->addSeparator(); deskMenu->addAction(LXDG::findIcon("system-log-out",""), tr("Log Out"), this, SLOT(SystemLogout()) ); diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp index 58062fb4..815920e5 100644 --- a/lumina-desktop/LSession.cpp +++ b/lumina-desktop/LSession.cpp @@ -25,7 +25,7 @@ #include <X11/extensions/Xdamage.h> #ifndef DEBUG -#define DEBUG 1 +#define DEBUG 0 #endif XCBEventFilter *evFilter = 0; diff --git a/lumina-desktop/fluxboxconf/fluxbox-keys b/lumina-desktop/fluxboxconf/fluxbox-keys index f0ec3519..7e50b568 100644 --- a/lumina-desktop/fluxboxconf/fluxbox-keys +++ b/lumina-desktop/fluxboxconf/fluxbox-keys @@ -59,8 +59,8 @@ Mod4 Tab :NextTab Mod4 Shift Tab :PrevTab # Arrange/Tile Current windows -Mod4 Left :ArrangeWindowsStackRight (Layer=Normal) -Mod4 Right :ArrangeWindowsStackLeft (Layer=Normal) +Mod1 Left :ArrangeWindowsStackRight (Layer=Normal) +Mod1 Right :ArrangeWindowsStackLeft (Layer=Normal) # go to a specific tab in the current window Mod4 1 :Tab 1 @@ -141,5 +141,5 @@ Control Mod4 F11 :TakeToWorkspace 11 Control Mod4 F12 :TakeToWorkspace 12 Print :Exec lumina-screenshot - +Pause :Exec xscreensaver-command -lock |