noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

allowing editing the timestamp freely

Browse source
This commit is contained in:
fourtf 2018-10-31 21:13:01 +01:00
parent 246f999a40
commit 7b06405a1c
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/widgets/settingspages/GeneralPage.cpp
View file

@ -77,10 +77,13 @@ ComboBox *SettingsLayout::addDropdown(const QString &text,
ComboBox *SettingsLayout::addDropdown( ComboBox *SettingsLayout::addDropdown(
const QString &text, const QStringList &items, const QString &text, const QStringList &items,
pajlada::Settings::Setting<QString> &setting) pajlada::Settings::Setting<QString> &setting, bool editable)
{ {
auto combo = this->addDropdown(text, items); auto combo = this->addDropdown(text, items);
if (editable)
combo->setEditable(true);
// update when setting changes // update when setting changes
setting.connect( setting.connect(
[combo](const QString &value, auto) { combo->setCurrentText(value); }, [combo](const QString &value, auto) { combo->setCurrentText(value); },
@ -185,8 +188,8 @@ void GeneralPage::initLayout(SettingsLayout &layout)
layout.addTitle("Messages"); layout.addTitle("Messages");
layout.addCheckbox("Timestamps", s.showTimestamps); layout.addCheckbox("Timestamps", s.showTimestamps);
layout.addDropdown("Timestamp format", layout.addDropdown("Timestamp format",
{"hh:mm", "h:mm", "hh:mm a", "h:mm a"}, {"h:mm", "hh:mm", "h:mm a", "hh:mm a"},
s.timestampFormat); s.timestampFormat, true);
layout.addDropdown<int>( layout.addDropdown<int>(
"Collapse messages", "Collapse messages",
{"Never", "Longer than 2 lines", "Longer than 3 lines", {"Never", "Longer than 2 lines", "Longer than 3 lines",

3
src/widgets/settingspages/GeneralPage.hpp
View file

@ -75,7 +75,8 @@ public:
QCheckBox *addCheckbox(const QString &text, BoolSetting &setting); QCheckBox *addCheckbox(const QString &text, BoolSetting &setting);
ComboBox *addDropdown(const QString &text, const QStringList &items); ComboBox *addDropdown(const QString &text, const QStringList &items);
ComboBox *addDropdown(const QString &text, const QStringList &items, ComboBox *addDropdown(const QString &text, const QStringList &items,
pajlada::Settings::Setting<QString> &setting); pajlada::Settings::Setting<QString> &setting,
bool editable = false);
template <typename T> template <typename T>
ComboBox *addDropdown( ComboBox *addDropdown(