From c097592c3f05168499603901a19479cb07fc6cc1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 19 Feb 2012 19:36:11 +0300 Subject: Add visual page in settings. Move pickup particle settings to visual tab page. --- src/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3289aed66..982d9b5ca 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -327,6 +327,8 @@ SET(SRCS gui/setup_players.h gui/setup_video.cpp gui/setup_video.h + gui/setup_visual.cpp + gui/setup_visual.h gui/sdlfont.cpp gui/sdlfont.h gui/shopwindow.cpp -- cgit v1.2.3-70-g09d2 From 3884c9d240a6dd7e3821f1ed9cb18a28a228b93e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 25 Feb 2012 04:41:33 +0300 Subject: Add SliderList control. --- src/CMakeLists.txt | 2 + src/Makefile.am | 2 + src/gui/setup_video.cpp | 2 + src/gui/widgets/sliderlist.cpp | 216 +++++++++++++++++++++++++++++++++++++++++ src/gui/widgets/sliderlist.h | 80 +++++++++++++++ 5 files changed, 302 insertions(+) create mode 100644 src/gui/widgets/sliderlist.cpp create mode 100644 src/gui/widgets/sliderlist.h (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 982d9b5ca..90c9240d1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -197,6 +197,8 @@ SET(SRCS gui/widgets/shortcutcontainer.h gui/widgets/slider.cpp gui/widgets/slider.h + gui/widgets/sliderlist.cpp + gui/widgets/sliderlist.h gui/widgets/tab.cpp gui/widgets/tab.h gui/widgets/tabbedarea.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 5b40ac447..55c2700d6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -200,6 +200,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/shortcutcontainer.h \ gui/widgets/slider.cpp \ gui/widgets/slider.h \ + gui/widgets/sliderlist.cpp \ + gui/widgets/sliderlist.h \ gui/widgets/tab.cpp \ gui/widgets/tab.h \ gui/widgets/tabbedarea.cpp \ diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index eff04614d..6690f1452 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -39,6 +39,7 @@ #include "gui/widgets/listbox.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/slider.h" +#include "gui/widgets/sliderlist.h" #include "gui/widgets/textfield.h" #include "gui/widgets/dropdown.h" @@ -299,6 +300,7 @@ Setup_Video::Setup_Video(): place(1, 2, mEnableResizeCheckBox, 2); place(1, 3, mNoFrameCheckBox, 2); + // place(1, 5, mPickupNotifyLabel, 4); // place(1, 6, mPickupChatCheckBox, 1); // place(2, 6, mPickupParticleCheckBox, 2); diff --git a/src/gui/widgets/sliderlist.cpp b/src/gui/widgets/sliderlist.cpp new file mode 100644 index 000000000..bc30bbe38 --- /dev/null +++ b/src/gui/widgets/sliderlist.cpp @@ -0,0 +1,216 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2012 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 . + */ + +#include "gui/widgets/sliderlist.h" + +#include "client.h" +#include "logger.h" + +#include "gui/gui.h" + +#include "gui/widgets/button.h" +#include "gui/widgets/label.h" + +#include "utils/dtor.h" + +#include + +#include "debug.h" + +static const int buttonWidth = 27; +static const int buttonSpace = 30; +static const int sliderHeight = 30; + +SliderList::SliderList(gcn::ListModel *listModel, + gcn::ActionListener* listener, + std::string eventId) : + mListModel(listModel), + mOldWidth(0), + mSelectedIndex(0) +{ + mPrevEventId = eventId + "_prev"; + mNextEventId = eventId + "_next"; + + setHeight(sliderHeight); + + mButtons[0] = new Button("<", mPrevEventId, this); + mButtons[1] = new Button(">", mNextEventId, this); + mLabel = new Label(""); + add(mButtons[0]); + add(mLabel); + add(mButtons[1]); + + if (!eventId.empty()) + setActionEventId(eventId); + + if (listener) + addActionListener(listener); + + updateLabel(); + addMouseListener(this); +} + +SliderList::~SliderList() +{ +} + +void SliderList::updateAlpha() +{ + mButtons[0]->updateAlpha(); + mButtons[1]->updateAlpha(); +} + +void SliderList::mouseWheelMovedUp(gcn::MouseEvent& mouseEvent) +{ + logger->log("SliderList::mouseWheelMovedUp"); + setSelected(mSelectedIndex - 1); + mouseEvent.consume(); +} + +void SliderList::mouseWheelMovedDown(gcn::MouseEvent& mouseEvent) +{ + setSelected(mSelectedIndex + 1); + mouseEvent.consume(); +} + +void SliderList::resize() +{ + const int width = getWidth(); + + mButtons[0]->setWidth(buttonWidth); +// mLabel->setPosition(buttonSpace, 0); + mLabel->setWidth(width - buttonSpace * 2); + mButtons[1]->setPosition(width - buttonSpace + 3, 0); + mButtons[1]->setWidth(buttonWidth); + updateLabel(); +} + +void SliderList::draw(gcn::Graphics *graphics) +{ + if (mOldWidth != getWidth()) + { + resize(); + mOldWidth = getWidth(); + } + Container::draw(graphics); +} + +void SliderList::updateLabel() +{ + if (!mListModel || mSelectedIndex < 0 + || mSelectedIndex >= mListModel->getNumberOfElements()) + { + return; + } + + mLabel->setCaption(mListModel->getElementAt(mSelectedIndex)); + mLabel->adjustSize(); + const int space = getWidth() - buttonSpace * 2; + const int labelWidth = mLabel->getWidth(); + int labelY = (getHeight() - mLabel->getHeight()) / 2; + if (labelY < 0) + labelY = 0; + + if (space < 0 || space < labelWidth) + mLabel->setPosition(buttonSpace, labelY); + else + mLabel->setPosition(buttonSpace + (space - labelWidth) / 2, labelY); +} + +void SliderList::action(const gcn::ActionEvent &event) +{ + if (!mListModel) + return; + + if (event.getId() == mPrevEventId) + { + mSelectedIndex --; + if (mSelectedIndex < 0) + mSelectedIndex = mListModel->getNumberOfElements() - 1; + } + else if (event.getId() == mNextEventId) + { + mSelectedIndex ++; + if (mSelectedIndex >= mListModel->getNumberOfElements()) + mSelectedIndex = 0; + } + updateLabel(); + distributeActionEvent(); +} + +void SliderList::setSelectedString(std::string str) +{ + if (!mListModel) + return; + + for (int f = 0; f < mListModel->getNumberOfElements(); f ++) + { + if (mListModel->getElementAt(f) == str) + { + setSelected(f); + break; + } + } +} + +std::string SliderList::getSelectedString() const +{ + if (!mListModel) + return ""; + + return mListModel->getElementAt(mSelectedIndex); +} + +void SliderList::setSelected(int idx) +{ + if (!mListModel) + return; + + mSelectedIndex = idx; + if (mSelectedIndex >= mListModel->getNumberOfElements()) + mSelectedIndex = 0; + if (mSelectedIndex < 0) + mSelectedIndex = mListModel->getNumberOfElements() - 1; + updateLabel(); +} + +void SliderList::adjustSize() +{ + setWidth(getMaxLabelWidth() + 60); + updateLabel(); +} + +int SliderList::getMaxLabelWidth() +{ + if (!mListModel || !gui) + return 1; + + int maxWidth = 0; + gcn::Font *font = gui->getFont(); + + for (int f = 0; f < mListModel->getNumberOfElements(); f ++) + { + int w = font->getWidth(mListModel->getElementAt(f)); + if (w > maxWidth) + maxWidth = w; + } + + return maxWidth; +} diff --git a/src/gui/widgets/sliderlist.h b/src/gui/widgets/sliderlist.h new file mode 100644 index 000000000..a7b1a564c --- /dev/null +++ b/src/gui/widgets/sliderlist.h @@ -0,0 +1,80 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2012 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 . + */ + +#ifndef GUI_WIDGETS_SLIDERLIST_H +#define GUI_WIDGETS_SLIDERLIST_H + +#include +#include +#include + +#include "gui/widgets/container.h" + +#include "localconsts.h" + +class Button; +class Label; + +class SliderList : public Container, + public gcn::ActionListener, + public gcn::MouseListener +{ + public: + SliderList(gcn::ListModel *listModel = nullptr, + gcn::ActionListener* listener = nullptr, + std::string eventId = ""); + + ~SliderList(); + + void updateAlpha(); + + void mouseWheelMovedUp(gcn::MouseEvent& mouseEvent); + + void mouseWheelMovedDown(gcn::MouseEvent& mouseEvent); + + void resize(); + + void draw(gcn::Graphics *graphics); + + void action(const gcn::ActionEvent &event); + + void setSelectedString(std::string str); + + std::string getSelectedString() const; + + void setSelected(int idx); + + void adjustSize(); + + protected: + void updateLabel(); + + int getMaxLabelWidth(); + + Button *mButtons[2]; + Label *mLabel; + gcn::ListModel *mListModel; + std::string mPrevEventId; + std::string mNextEventId; + int mOldWidth; + int mSelectedIndex; +}; + +#endif // end GUI_WIDGETS_SLIDERLIST_H -- cgit v1.2.3-70-g09d2 From 481bbd254103fc9d6dc98b19a5226f8868c8c5d9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 27 Feb 2012 02:44:23 +0300 Subject: Add sliderlist setup item. --- src/CMakeLists.txt | 2 + src/Makefile.am | 2 + src/defaults.cpp | 2 + src/gui/setup_theme.cpp | 29 +----------- src/gui/theme.cpp | 19 ++++++++ src/gui/theme.h | 2 + src/gui/widgets/namesmodel.cpp | 51 ++++++++++++++++++++ src/gui/widgets/namesmodel.h | 45 ++++++++++++++++++ src/gui/widgets/setupitem.cpp | 103 +++++++++++++++++++++++++++++++++++++++++ src/gui/widgets/setupitem.h | 37 +++++++++++++++ 10 files changed, 265 insertions(+), 27 deletions(-) create mode 100644 src/gui/widgets/namesmodel.cpp create mode 100644 src/gui/widgets/namesmodel.h (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 90c9240d1..7e7d60886 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -167,6 +167,8 @@ SET(SRCS gui/widgets/listbox.cpp gui/widgets/listbox.h gui/widgets/mouseevent.h + gui/widgets/namesmodel.cpp + gui/widgets/namesmodel.h gui/widgets/passwordfield.cpp gui/widgets/passwordfield.h gui/widgets/playerbox.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 55c2700d6..06b457e4b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -170,6 +170,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/listbox.cpp \ gui/widgets/listbox.h \ gui/widgets/mouseevent.h \ + gui/widgets/namesmodel.cpp \ + gui/widgets/namesmodel.h \ gui/widgets/passwordfield.cpp \ gui/widgets/passwordfield.h \ gui/widgets/playerbox.cpp \ diff --git a/src/defaults.cpp b/src/defaults.cpp index df401e119..01907bfe8 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -263,6 +263,8 @@ DefaultsData* getBrandingDefaults() AddDEF(brandingData, "guiThemePath", "themes/"); AddDEF(brandingData, "fontsPath", "fonts/"); + AddDEF(brandingData, "systemsounds", "sfx/system/"); + AddDEF(brandingData, "wallpaperFile", ""); AddDEF(brandingData, "dataPath", ""); return brandingData; diff --git a/src/gui/setup_theme.cpp b/src/gui/setup_theme.cpp index d4a1d5652..d3b9d0e3c 100644 --- a/src/gui/setup_theme.cpp +++ b/src/gui/setup_theme.cpp @@ -29,10 +29,11 @@ #include "gui/widgets/button.h" #include "gui/widgets/checkbox.h" +#include "gui/widgets/dropdown.h" #include "gui/widgets/label.h" #include "gui/widgets/layouthelper.h" +#include "gui/widgets/namesmodel.h" #include "gui/widgets/textfield.h" -#include "gui/widgets/dropdown.h" #include "configuration.h" #include "localplayer.h" @@ -53,32 +54,6 @@ const char* ACTION_HELP_FONT = "help font"; const char* ACTION_SECURE_FONT = "secure font"; const char* ACTION_JAPAN_FONT = "japan font"; -class NamesModel : public gcn::ListModel -{ -public: - NamesModel() - { - } - - virtual ~NamesModel() { } - - virtual int getNumberOfElements() - { - return static_cast(mNames.size()); - } - - virtual std::string getElementAt(int i) - { - if (i >= getNumberOfElements() || i < 0) - return _("???"); - - return mNames[i]; - } - -protected: - std::vector mNames; -}; - class ThemesModel : public NamesModel { public: diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 85fd215ac..3a09810d0 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -569,6 +569,25 @@ void Theme::fillFontsList(std::vector &list) PHYSFS_permitSymbolicLinks(0); } +void Theme::fillSoundsList(std::vector &list) +{ + char **skins = PHYSFS_enumerateFiles( + branding.getStringValue("systemsounds").c_str()); + + for (char **i = skins; *i; i++) + { + if (!PHYSFS_isDirectory(( + branding.getStringValue("systemsounds") + *i).c_str())) + { + std::string str = *i; + if (findCutLast(str, ".ogg")) + list.push_back(str); + } + } + + PHYSFS_freeList(skins); +} + void Theme::selectSkin() { prepareThemePath(); diff --git a/src/gui/theme.h b/src/gui/theme.h index 9cb8f6180..c30044dc7 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -131,6 +131,8 @@ class Theme : public Palette, public ConfigListener static void fillFontsList(std::vector &list); + static void fillSoundsList(std::vector &list); + /** * Returns the patch to the given gui resource relative to the theme * or, if it isn't in the theme, relative to 'graphics/gui'. diff --git a/src/gui/widgets/namesmodel.cpp b/src/gui/widgets/namesmodel.cpp new file mode 100644 index 000000000..abfcd6def --- /dev/null +++ b/src/gui/widgets/namesmodel.cpp @@ -0,0 +1,51 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012 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 . + */ + +#include "gui/widgets/namesmodel.h" + +#include "logger.h" + +#include "utils/gettext.h" + +#include +#include + +#include "debug.h" + +NamesModel::NamesModel() +{ +} + +NamesModel::~NamesModel() +{ +} + +int NamesModel::getNumberOfElements() +{ + return static_cast(mNames.size()); +} + +std::string NamesModel::getElementAt(int i) +{ + if (i >= getNumberOfElements() || i < 0) + return _("???"); + + return mNames[i]; +} diff --git a/src/gui/widgets/namesmodel.h b/src/gui/widgets/namesmodel.h new file mode 100644 index 000000000..3f9f10b52 --- /dev/null +++ b/src/gui/widgets/namesmodel.h @@ -0,0 +1,45 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012 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 . + */ + +#ifndef GUI_WIDGETS_NAMESMODEL_H +#define GUI_WIDGETS_NAMESMODEL_H + +//#include "guichanfwd.h" + +#include + +#include + +class NamesModel : public gcn::ListModel +{ + public: + NamesModel(); + + virtual ~NamesModel(); + + virtual int getNumberOfElements(); + + virtual std::string getElementAt(int i); + + protected: + std::vector mNames; +}; + +#endif diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index 8987719da..581002a58 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -35,6 +35,7 @@ #include "gui/widgets/label.h" #include "gui/widgets/layouthelper.h" #include "gui/widgets/slider.h" +#include "gui/widgets/sliderlist.h" #include "gui/widgets/tabbedarea.h" #include "gui/widgets/textfield.h" #include "gui/widgets/vertcontainer.h" @@ -693,6 +694,7 @@ void SetupItemSlider::apply(std::string eventName) save(); } + SetupItemSlider2::SetupItemSlider2(std::string text, std::string description, std::string keyName, SetupTabScroll *parent, std::string eventName, int min, int max, @@ -851,3 +853,104 @@ void SetupItemSlider2::setInvertValue(int v) mInvertValue = v; toWidget(); } + + +SetupItemSliderList::SetupItemSliderList(std::string text, + std::string description, + std::string keyName, + SetupTabScroll *parent, + std::string eventName, + gcn::ListModel *model, + int width, bool onTheFly, + bool mainConfig) : + SetupItem(text, description, keyName, parent, eventName, mainConfig), + mHorizont(nullptr), + mLabel(nullptr), + mSlider(nullptr), + mModel(model), + mWidth(width), + mOnTheFly(onTheFly) +{ + mValueType = VSTR; + createControls(); +} + +SetupItemSliderList::SetupItemSliderList(std::string text, + std::string description, + std::string keyName, + SetupTabScroll *parent, + std::string eventName, + gcn::ListModel *model, + std::string def, int width, + bool onTheFly, bool mainConfig) : + SetupItem(text, description, keyName, parent, eventName, def, mainConfig), + mHorizont(nullptr), + mLabel(nullptr), + mSlider(nullptr), + mModel(model), + mWidth(width), + mOnTheFly(onTheFly) +{ + mValueType = VSTR; + createControls(); +} + +SetupItemSliderList::~SetupItemSliderList() +{ + mHorizont = nullptr; + mWidget = nullptr; + mSlider = nullptr; + mLabel = nullptr; +} + +void SetupItemSliderList::createControls() +{ + load(); + mHorizont = new HorizontContainer(32, 2); + + mLabel = new Label(mText); + mSlider = new SliderList(mModel, mParent, mEventName); + mSlider->setSelectedString(mValue); + mSlider->adjustSize(); + + mWidget = mSlider; + mHorizont->add(mLabel, 5); + mHorizont->add(mSlider); + + mParent->getContainer()->add2(mHorizont, true, 4); + mParent->addControl(this); + mParent->addActionListener(this); + mWidget->addActionListener(this); +} + +void SetupItemSliderList::fromWidget() +{ + if (!mSlider) + return; + + mValue = mSlider->getSelectedString(); +} + +void SetupItemSliderList::toWidget() +{ + if (!mSlider) + return; + + mSlider->setSelectedString(mValue); +} + +void SetupItemSliderList::action(const gcn::ActionEvent &event A_UNUSED) +{ + fromWidget(); + if (mOnTheFly) + save(); +} + +void SetupItemSliderList::apply(std::string eventName) +{ + if (eventName != mEventName) + return; + + fromWidget(); + save(); +} diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h index b950d1488..f883a5b94 100644 --- a/src/gui/widgets/setupitem.h +++ b/src/gui/widgets/setupitem.h @@ -42,6 +42,7 @@ class HorizontContainer; class IntTextField; class Label; class Slider; +class SliderList; class TextField; class SetupItem : public gcn::ActionListener @@ -353,4 +354,40 @@ class SetupItemSlider2 : public SetupItem bool mOnTheFly; }; +class SetupItemSliderList : public SetupItem +{ + public: + SetupItemSliderList(std::string text, std::string description, + std::string keyName, SetupTabScroll *parent, + std::string eventName, gcn::ListModel *model, + int width = 150, bool onTheFly = false, + bool mainConfig = true); + + SetupItemSliderList(std::string text, std::string description, + std::string keyName, SetupTabScroll *parent, + std::string eventName, gcn::ListModel *model, + std::string def, int width = 150, + bool onTheFly = false, bool mainConfig = true); + + ~SetupItemSliderList(); + + void createControls(); + + void fromWidget(); + + void toWidget(); + + void action(const gcn::ActionEvent &event); + + void apply(std::string eventName); + + protected: + HorizontContainer *mHorizont; + Label *mLabel; + SliderList *mSlider; + gcn::ListModel *mModel; + int mWidth; + bool mOnTheFly; +}; + #endif -- cgit v1.2.3-70-g09d2