SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

refactoring qad widgets part 1

Browse Source 
c++ cast, nullptr, forward declaration, agregate ui, connect to member functions, order and clear includes
This commit is contained in:
Бычков Андрей
2022-12-11 16:27:04 +03:00
parent 5d9381dd37
commit 728c132f2b
22 changed files with 561 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
libs/widgets/shortcuts.h
View File

@@ -20,20 +20,13 @@
#ifndef SHORTCUTS_H
#define SHORTCUTS_H
#include <QTreeWidget>
#include <QMainWindow>
#include <QShortcut>
#include <QHeaderView>
#include <QAction>
#include <QLineEdit>
#include <QDebug>
#include <QKeyEvent>
#include <QMenu>
#include <QToolBar>
#include <QScrollBar>
#include <QWidgetAction>
#include "clineedit.h"
#include "qad_widgets_export.h"
#include "clineedit.h"
#include <QTreeWidget>
class QMainWindow;
class ShortcutEdit;
class QAD_WIDGETS_EXPORT ShortcutEdit: public CLineEdit
@@ -41,63 +34,55 @@ class QAD_WIDGETS_EXPORT ShortcutEdit: public CLineEdit
Q_OBJECT
friend class Shortcuts;
public:
explicit ShortcutEdit(QWidget * parent = 0): CLineEdit(parent) {ti = 0; ca = 0; connect(this, SIGNAL(textChanged(QString)), this, SLOT(textChanged_(QString)));}
explicit ShortcutEdit(QWidget *parent = nullptr);
void assignAction(QAction * a) {clear(); ca = a; reset();}
QAction * action() const {return ca;}
bool isEmpty() const {return text().isEmpty();}
void commit() {if (ca == 0) return; ca->setShortcut(QKeySequence(text()));}
void reset() {if (ca == 0) return; setText(ca->shortcut().toString());}
void assignAction(QAction *a);
QAction *action() const;
bool isEmpty() const;
void commit();
void reset();
private slots:
void textChanged_(QString t) {if (ti != 0) ti->setText(1, t);}
void textChangedSlot(QString t);
private:
void keyPressEvent(QKeyEvent * e);
void keyPressEvent(QKeyEvent * e) override;
QAction * ca;
QTreeWidgetItem * ti;
};
class QAD_WIDGETS_EXPORT Shortcuts: public QTreeWidget
{
Q_OBJECT
public:
explicit Shortcuts(QWidget * parent = 0, bool on = true);
~Shortcuts();
explicit Shortcuts(QWidget * parent = nullptr, bool on = true);
~Shortcuts() override;
void assignWindow(QWidget * w);
void setActive(bool on) {active = on;}
QList<QPair<QString, QKeySequence> > shortcuts();
QStringList actionTree(QAction * a);
static bool checkAction(QAction * a);
QList<QPair<QString, QKeySequence> > shortcuts();
public slots:
void clear();
void updateShortcuts();
void commit();
void reset();
void resetShortcuts();
void filter(const QString & what);
private:
virtual void updateEditorGeometries() {foreach (ShortcutEdit * i, edits) i->setGeometry(visualRect(indexFromItem(i->ti, 1)));}
virtual void changeEvent(QEvent * );
bool filterTree(QTreeWidgetItem * ti, QString f);
virtual void updateEditorGeometries() override;
virtual void changeEvent(QEvent *) override;
bool filterTree(QTreeWidgetItem *ti, QString f);
QMainWindow * aw;
QVector<ShortcutEdit * > edits;
QVector<ShortcutEdit *> edits;
QIcon empty_icon;
QFont bfont;
bool active;
private slots:
signals:
void shortcutChanged(QAction * , QShortcut & );
};
#endif // SPINSLIDER_H