fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-04-01 12:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Config Window code redesigned

Browse Source
This commit is contained in:
lupoDharkael
2017-05-19 03:08:13 +02:00
parent 2e41b8c411
commit 4dcf48a60b
6 changed files with 131 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
config/buttonlistview.cpp Normal file
View File

@@ -0,0 +1,61 @@
#include "buttonlistview.h"
#include "capture/button.h"
#include <QListWidgetItem>
#include <QListWidgetItem>
#include <QSettings>
ButtonListView::ButtonListView(QWidget *parent) : QListWidget(parent) {
setMouseTracking(true);
//setFocusPolicy(Qt::NoFocus);
QSettings settings;
m_listButtons = settings.value("buttons").value<QList<int> >();
initButtonList();
connect(this, &QListWidget::itemChanged, this,
&ButtonListView::updateActiveButtons);
connect(this, &QListWidget::itemClicked, this,
&ButtonListView::reverseItemCheck);
}
void ButtonListView::initButtonList() {
for (int i = 0; i != static_cast<int>(Button::Type::last); ++i) {
auto t = static_cast<Button::Type>(i);
QListWidgetItem *buttonItem = new QListWidgetItem(this);
bool iconsAreWhite = false;
QString bgColor = this->palette().color(QWidget::backgroundRole()).name();
// when the background is lighter than gray, it uses the white icons
if (bgColor < QColor(Qt::gray).name()) {
iconsAreWhite = true;
}
buttonItem->setIcon(Button::getIcon(t, iconsAreWhite));
buttonItem->setFlags(Qt::ItemIsUserCheckable);
buttonItem->setText(Button::getTypeName(t));
buttonItem->setToolTip(Button::getTypeTooltip(t));
if (m_listButtons.contains(i)) {
buttonItem->setCheckState(Qt::Checked);
} else {
buttonItem->setCheckState(Qt::Unchecked);
}
}
}
void ButtonListView::updateActiveButtons(QListWidgetItem *item) {
int buttonIndex = static_cast<int>(Button::getTypeByName(item->text()));
if (item->checkState() == Qt::Checked) {
m_listButtons.append(buttonIndex);
} else {
m_listButtons.removeOne(buttonIndex);
}
QSettings().setValue("buttons", QVariant::fromValue(m_listButtons));
}
void ButtonListView::reverseItemCheck(QListWidgetItem *item){
if (item->checkState() == Qt::Checked) {
item->setCheckState(Qt::Unchecked);
} else {
item->setCheckState(Qt::Checked);
}
}

21
config/buttonlistview.h Normal file
View File

@@ -0,0 +1,21 @@
#ifndef BUTTONLISTVIEW_H
#define BUTTONLISTVIEW_H
#include <QListWidget>
class ButtonListView : public QListWidget {
public:
ButtonListView(QWidget *parent= 0);
private slots:
void updateActiveButtons(QListWidgetItem *);
void reverseItemCheck(QListWidgetItem *);
protected:
void initButtonList();
private:
QList<int> m_listButtons;
};
#endif // BUTTONLISTVIEW_H

43
config/configwindow.cpp Normal file
View File

@@ -0,0 +1,43 @@
// Copyright 2017 Alejandro Sirgo Rica
//
// This file is part of Flameshot.
//
// Flameshot 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 3 of the License, or
// (at your option) any later version.
//
// Flameshot 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 Flameshot. If not, see <http://www.gnu.org/licenses/>.
#include "configwindow.h"
#include "capture/button.h"
#include "config/buttonlistview.h"
#include <QIcon>
#include <QVBoxLayout>
#include <QLabel>
#include <QDebug>
// ConfigWindow contains the menus where you can configure the application
ConfigWindow::ConfigWindow(QWidget *parent) : QWidget(parent){
setAttribute(Qt::WA_DeleteOnClose);
setWindowIcon(QIcon(":img/flameshot.svg"));
setWindowTitle(tr("Configuration"));
QVBoxLayout *baseLayout = new QVBoxLayout(this);
QLabel *buttonSelectLabel = new QLabel("Choose the buttons to enable", this);
baseLayout->addWidget(buttonSelectLabel);
ButtonListView *m_buttonListView = new ButtonListView(this);
m_buttonListView->setFlow(QListWidget::TopToBottom);
baseLayout->addWidget(m_buttonListView);
show();
}

6
configwindow.h → config/configwindow.h
View File

@@ -28,14 +28,8 @@ class ConfigWindow : public QWidget {
public:
explicit ConfigWindow(QWidget *parent = 0);
private slots:
void updateActiveButtons(QListWidgetItem *);
private:
void initButtonList();
QList<int> m_listButtons;
QListWidget *m_buttonListView;
};
#endif // CONFIGURATION_H

86
configwindow.cpp
View File

@@ -1,86 +0,0 @@
// Copyright 2017 Alejandro Sirgo Rica
//
// This file is part of Flameshot.
//
// Flameshot 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 3 of the License, or
// (at your option) any later version.
//
// Flameshot 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 Flameshot. If not, see <http://www.gnu.org/licenses/>.
#include "configwindow.h"
#include "capture/button.h"
#include <QSettings>
#include <QIcon>
#include <QListWidget>
#include <QListWidgetItem>
#include <QVBoxLayout>
#include <QLabel>
#include <QDebug>
// ConfigWindow contains the menus where you can configure the application
ConfigWindow::ConfigWindow(QWidget *parent) : QWidget(parent){
setAttribute(Qt::WA_DeleteOnClose);
setWindowIcon(QIcon(":img/flameshot.svg"));
setWindowTitle(tr("Configuration"));
QVBoxLayout *baseLayout = new QVBoxLayout(this);
QLabel *buttonSelectLabel = new QLabel("Choose the buttons to enable", this);
baseLayout->addWidget(buttonSelectLabel);
m_buttonListView = new QListWidget(this);
m_buttonListView->setFlow(QListWidget::TopToBottom);
m_buttonListView->setMouseTracking(true);
QSettings settings;
m_listButtons = settings.value("buttons").value<QList<int> >();
initButtonList();
connect(m_buttonListView, &QListWidget::itemChanged, this,
&ConfigWindow::updateActiveButtons);
baseLayout->addWidget(m_buttonListView);
show();
}
void ConfigWindow::initButtonList() {
for (int i = 0; i != static_cast<int>(Button::Type::last); ++i) {
auto t = static_cast<Button::Type>(i);
QListWidgetItem *buttonItem = new QListWidgetItem(m_buttonListView);
bool iconsAreWhite = false;
QString bgColor = this->palette().color(QWidget::backgroundRole()).name();
// when the background is lighter than gray, it uses the white icons
if (bgColor < QColor(Qt::gray).name()) {
iconsAreWhite = true;
}
buttonItem->setIcon(Button::getIcon(t, iconsAreWhite));
buttonItem->setText(Button::getTypeName(t));
buttonItem->setToolTip(Button::getTypeTooltip(t));
if (m_listButtons.contains(i)) {
buttonItem->setCheckState(Qt::Checked);
} else {
buttonItem->setCheckState(Qt::Unchecked);
}
}
}
void ConfigWindow::updateActiveButtons(QListWidgetItem *item) {
int buttonIndex = static_cast<int>(Button::getTypeByName(item->text()));
if (item->checkState() == Qt::Checked) {
m_listButtons.append(buttonIndex);
} else {
m_listButtons.removeOne(buttonIndex);
}
QSettings().setValue("buttons", QVariant::fromValue(m_listButtons));
}

10
flameshot.pro
View File

@@ -37,11 +37,12 @@ SOURCES += main.cpp\
capture/button.cpp \
capture/buttonhandler.cpp \
infowindow.cpp \
configwindow.cpp \
config/configwindow.cpp \
capture/screenshot.cpp \
capture/capturewidget.cpp \
capture/capturemodification.cpp \
capture/colorpicker.cpp
capture/colorpicker.cpp \
config/buttonlistview.cpp
HEADERS += \
nativeeventfilter.h \
@@ -49,11 +50,12 @@ HEADERS += \
capture/button.h \
capture/buttonhandler.h \
infowindow.h \
configwindow.h \
config/configwindow.h \
capture/screenshot.h \
capture/capturewidget.h \
capture/capturemodification.h \
capture/colorpicker.h
capture/colorpicker.h \
config/buttonlistview.h
RESOURCES += \
graphics.qrc