diff options
author | rathnor <rathnor> | 2004-08-29 09:08:29 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2004-08-29 09:08:29 (GMT) |
commit | 4d01d1b748a99f1380a582874ab46e900fc7eca2 (patch) | |
tree | 7e894467ed501428936fd34e5757d7b7e51cca65 | |
parent | 97ef84da598aed61a6cb57a62796f302043181e8 (diff) | |
download | fluxbox-4d01d1b748a99f1380a582874ab46e900fc7eca2.zip fluxbox-4d01d1b748a99f1380a582874ab46e900fc7eca2.tar.bz2 |
add back Workspace<n> keys with deprecated message
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | src/FbCommandFactory.cc | 22 |
2 files changed, 24 insertions, 1 deletions
@@ -1,6 +1,9 @@ | |||
1 | (Format: Year/Month/Day) | 1 | (Format: Year/Month/Day) |
2 | Changes for 0.9.10: | 2 | Changes for 0.9.10: |
3 | *04/08/29: | 3 | *04/08/29: |
4 | * Add back Workspace<n> actions with deprecated message (Simon) | ||
5 | - need transition time, remove when 1.0 has been widely used for a while | ||
6 | FbCommandFactory.cc | ||
4 | * More random render fixes (Simon) | 7 | * More random render fixes (Simon) |
5 | (font alignment in menu, menu optimisation, toolbar font/render) | 8 | (font alignment in menu, menu optimisation, toolbar font/render) |
6 | FbTk/Menu.cc FbTk/MenuItem.cc FbTk/XftFontImp.cc | 9 | FbTk/Menu.cc FbTk/MenuItem.cc FbTk/XftFontImp.cc |
diff --git a/src/FbCommandFactory.cc b/src/FbCommandFactory.cc index db9c4d6..7a2691f 100644 --- a/src/FbCommandFactory.cc +++ b/src/FbCommandFactory.cc | |||
@@ -20,7 +20,7 @@ | |||
20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 | // DEALINGS IN THE SOFTWARE. | 21 | // DEALINGS IN THE SOFTWARE. |
22 | 22 | ||
23 | // $Id: FbCommandFactory.cc,v 1.32 2004/06/07 11:46:04 rathnor Exp $ | 23 | // $Id: FbCommandFactory.cc,v 1.33 2004/08/29 09:08:29 rathnor Exp $ |
24 | 24 | ||
25 | #include "FbCommandFactory.hh" | 25 | #include "FbCommandFactory.hh" |
26 | 26 | ||
@@ -129,6 +129,20 @@ FbCommandFactory::FbCommandFactory() { | |||
129 | "toggledecor", | 129 | "toggledecor", |
130 | "windowmenu", | 130 | "windowmenu", |
131 | "workspace", | 131 | "workspace", |
132 | /* NOTE: The following are DEPRECATED and subject to removal */ | ||
133 | "workspace1", | ||
134 | "workspace2", | ||
135 | "workspace3", | ||
136 | "workspace4", | ||
137 | "workspace5", | ||
138 | "workspace6", | ||
139 | "workspace7", | ||
140 | "workspace8", | ||
141 | "workspace9", | ||
142 | "workspace10", | ||
143 | "workspace11", | ||
144 | "workspace12", | ||
145 | /* end note */ | ||
132 | "workspacemenu", | 146 | "workspacemenu", |
133 | "" | 147 | "" |
134 | }; | 148 | }; |
@@ -278,6 +292,12 @@ FbTk::Command *FbCommandFactory::stringToCommand(const std::string &command, | |||
278 | if (!arguments.empty()) | 292 | if (!arguments.empty()) |
279 | num = atoi(arguments.c_str()); | 293 | num = atoi(arguments.c_str()); |
280 | return new JumpToWorkspaceCmd(num-1); | 294 | return new JumpToWorkspaceCmd(num-1); |
295 | } if (command.substr(0, 9) == "workspace" && command[9] >= '0' && command[9] <= '9') { | ||
296 | cerr<<"*** WARNING: 'Workspace<n>' actions are deprecated! Use 'Workspace <n>' instead"<<endl; | ||
297 | int num = 1; | ||
298 | num = atoi(command.substr(9).c_str()); | ||
299 | return new JumpToWorkspaceCmd(num-1); | ||
300 | |||
281 | } else if (command == "nextwindow") | 301 | } else if (command == "nextwindow") |
282 | return new NextWindowCmd(atoi(arguments.c_str())); | 302 | return new NextWindowCmd(atoi(arguments.c_str())); |
283 | else if (command == "prevwindow") | 303 | else if (command == "prevwindow") |