feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Mark shortcut conflicts in keyboard settings input box

Browse Source 
Task-number: QTCREATORBUG-6

Change-Id: Ife1f97d24733814e7512dd8bc6584a1d72f66fa8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2014-02-14 19:45:35 +01:00
parent 437e593a87
commit a1034af2e8
7 changed files with 262 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/coreplugin/actionmanager/commandmappings.h
View File

@@ -33,7 +33,6 @@
#include <coreplugin/dialogs/ioptionspage.h>
#include <QObject>
#include <QPointer>
QT_BEGIN_NAMESPACE
class QLineEdit;
@@ -41,9 +40,11 @@ class QTreeWidget;
class QTreeWidgetItem;
QT_END_NAMESPACE
namespace Utils { class FancyLineEdit; }
namespace Core {
namespace Internal { namespace Ui { class CommandMappings; } }
namespace Internal { class CommandMappingsPrivate; }
class CORE_EXPORT CommandMappings : public Core::IOptionsPage
{
@@ -51,6 +52,8 @@ class CORE_EXPORT CommandMappings : public Core::IOptionsPage
public:
CommandMappings(QObject *parent = 0);
~CommandMappings();
virtual bool hasConflicts() const;
protected slots:
void commandChanged(QTreeWidgetItem *current);
@@ -78,11 +81,10 @@ protected:
void setTargetEditTitle(const QString &s);
void setTargetHeader(const QString &s);
void setModified(QTreeWidgetItem *item, bool modified);
virtual void markPossibleCollisions(QTreeWidgetItem *) {}
virtual void resetCollisionMarkers() {}
private:
QPointer<QWidget> m_widget;
Internal::Ui::CommandMappings *m_page;
friend class Internal::CommandMappingsPrivate;
Internal::CommandMappingsPrivate *d;
};
} // namespace Core