diff options
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/shortcuttab.h | 47 | ||||
| -rw-r--r-- | src/gui/windows/shortcutwindow.cpp | 19 |
4 files changed, 51 insertions, 17 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d717231a1..eda02c2d7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -257,6 +257,7 @@ SET(SRCS gui/widgets/slider.h gui/widgets/sliderlist.cpp gui/widgets/sliderlist.h + gui/widgets/tabs/shortcuttab.h gui/widgets/tabs/tab.cpp gui/widgets/tabs/tab.h gui/widgets/tabbedarea.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 7cfff346e..c6fa137a4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -355,6 +355,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/slider.h \ gui/widgets/sliderlist.cpp \ gui/widgets/sliderlist.h \ + gui/widgets/tabs/shortcuttab.h \ gui/widgets/tabs/tab.cpp \ gui/widgets/tabs/tab.h \ gui/widgets/tabbedarea.cpp \ diff --git a/src/gui/widgets/tabs/shortcuttab.h b/src/gui/widgets/tabs/shortcuttab.h new file mode 100644 index 000000000..b4b837573 --- /dev/null +++ b/src/gui/widgets/tabs/shortcuttab.h @@ -0,0 +1,47 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef GUI_WIDGETS_TABS_SHORTCUTTAB_H +#define GUI_WIDGETS_TABS_SHORTCUTTAB_H + +#include "gui/widgets/tabs/tab.h" + +#include "localconsts.h" + +class ShortcutContainer; + +class ShortcutTab final : public Tab +{ + public: + ShortcutTab(const Widget2 *const widget, + std::string name, + ShortcutContainer *const content) : + Tab(widget), + mContent(content) + { + setCaption(name); + } + + A_DELETE_COPY(ShortcutTab) + + ShortcutContainer* mContent; +}; + +#endif // GUI_WIDGETS_TABS_SHORTCUTTAB_H diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp index 8b0e51472..34c3d8f90 100644 --- a/src/gui/windows/shortcutwindow.cpp +++ b/src/gui/windows/shortcutwindow.cpp @@ -29,6 +29,8 @@ #include "gui/widgets/layouttype.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/shortcutcontainer.h" + +#include "gui/widgets/tabs/shortcuttab.h" #include "gui/widgets/tabs/tab.h" #include "utils/delete2.h" @@ -39,23 +41,6 @@ static const int SCROLL_PADDING = 0; int ShortcutWindow::mBoxesWidth = 0; -class ShortcutTab final : public Tab -{ - public: - ShortcutTab(const Widget2 *const widget, - std::string name, - ShortcutContainer *const content) : - Tab(widget), - mContent(content) - { - setCaption(name); - } - - A_DELETE_COPY(ShortcutTab) - - ShortcutContainer* mContent; -}; - ShortcutWindow::ShortcutWindow(const std::string &restrict title, ShortcutContainer *restrict const content, const std::string &restrict skinFile, |