forked from qt-creator/qt-creator
		
	Fixes: Introduce a cpp settingspage containing file naming conventions (lower case and suffixes). Reorder VCS settings pages.
Task: 241959, 248085 RevBy: Optics/Naming checked by con Details: Give IOptionPage an id() to differentiate from trName(). Make showOptionsDialog return a bool (applied) and give it an optional parent. Change Cpp and form class wizards, give them a Configure... button to change those settings.
This commit is contained in:
		@@ -31,6 +31,9 @@
 | 
			
		||||
#include "gitsettings.h"
 | 
			
		||||
#include "gitplugin.h"
 | 
			
		||||
 | 
			
		||||
#include <vcsbase/vcsbaseconstants.h>
 | 
			
		||||
 | 
			
		||||
#include <QtCore/QCoreApplication>
 | 
			
		||||
#include <QtCore/QDebug>
 | 
			
		||||
#include <QtGui/QMessageBox>
 | 
			
		||||
 | 
			
		||||
@@ -72,21 +75,26 @@ SettingsPage::SettingsPage()
 | 
			
		||||
{
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
QString SettingsPage::name() const
 | 
			
		||||
{
 | 
			
		||||
    return tr("General");
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
QString SettingsPage::category() const
 | 
			
		||||
QString SettingsPage::id() const
 | 
			
		||||
{
 | 
			
		||||
    return QLatin1String("Git");
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
QString SettingsPage::trCategory() const
 | 
			
		||||
QString SettingsPage::trName() const
 | 
			
		||||
{
 | 
			
		||||
    return tr("Git");
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
QString SettingsPage::category() const
 | 
			
		||||
{
 | 
			
		||||
    return QLatin1String(VCSBase::Constants::VCS_SETTINGS_CATEGORY);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
QString SettingsPage::trCategory() const
 | 
			
		||||
{
 | 
			
		||||
    return QCoreApplication::translate("VCSBase", VCSBase::Constants::VCS_SETTINGS_CATEGORY);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
QWidget *SettingsPage::createPage(QWidget *parent)
 | 
			
		||||
{
 | 
			
		||||
    if (!m_widget)
 | 
			
		||||
 
 | 
			
		||||
@@ -68,7 +68,8 @@ class SettingsPage : public Core::IOptionsPage
 | 
			
		||||
public:
 | 
			
		||||
    SettingsPage();
 | 
			
		||||
 | 
			
		||||
    QString name() const;
 | 
			
		||||
    QString id() const;
 | 
			
		||||
    QString trName() const;
 | 
			
		||||
    QString category() const;
 | 
			
		||||
    QString trCategory() const;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user