KDE/kdevelop

[Andreas Pakulat]

SVN commit 651624 by apaku:

General Options->Project
Remove Project prefix from the options in the new Project section (Manager, ManagementView and Name are currently used)
Sorry for the inconvenience
CCMAIL:kdevelop-devel at kdevelop.org


 M  +3 -4      languages/cpp/app_templates/qmake_qt4guiapp/%{APPNAMELC}.kdev4  
 M  +3 -3      lib/shell/project.cpp  
 M  +1 -1      lib/shell/projectcontroller.cpp  


--- trunk/KDE/kdevelop/languages/cpp/app_templates/qmake_qt4guiapp/%{APPNAMELC}.kdev4 #651623:651624
@@ -1,5 +1,4 @@
-[General Options]
-Project Builder=KDevMakeBuilder
-Project Manager=KDevQMakeManager
+[Project]
+Manager=KDevQMakeManager
 PrimaryLanguage=C++
-ProjectManagementView=KDevProjectManagerView
+ManagementView=KDevProjectManagerView
--- trunk/KDE/kdevelop/lib/shell/project.cpp #651623:651624
@@ -221,11 +221,11 @@
     d->m_cfg = KSharedConfig::openConfig( d->projectTempFile );
     d->m_cfg->setExtraConfigFiles( QStringList() << d->developerTempFile );
 
-    KConfigGroup projectGroup( d->m_cfg, "General Options" );
+    KConfigGroup projectGroup( d->m_cfg, "Project" );
 
-    d->name = projectGroup.readEntry( "Project Name", projectFileUrl.fileName() );
+    d->name = projectGroup.readEntry( "Name", projectFileUrl.fileName() );
     d->folder = projectFileUrl.directory();
-    QString managerSetting = projectGroup.readEntry( "Project Manager", "KDevGenericManager" );
+    QString managerSetting = projectGroup.readEntry( "Manager", "KDevGenericManager" );
 
     //Get our importer
     IPluginController* pluginManager = Core::self()->pluginController();
--- trunk/KDE/kdevelop/lib/shell/projectcontroller.cpp #651623:651624
@@ -313,7 +313,7 @@
         KConfigGroup group = config->group( "General Options" );
 
         QString projectManager =
-                group.readEntry( "ProjectManagementView", "KDevProjectManagerView" );
+                group.readEntry( "ManagementView", "KDevProjectManagerView" );
 
         d->m_projectPart = d->m_core->pluginController()->loadPlugin( projectManager );
         if ( !d->m_projectPart )