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

Merge branch '1.2' of git@scm.dev.nokia.troll.no:creator/mainline

Browse Source
This commit is contained in:
Roberto Raggi
2009-06-11 17:03:53 +02:00
parent 93ab95bc99 f17a81c9c9
commit 7d1bf1fe57
15 changed files with 107 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/plugins/cpptools/cppfilesettingspage.ui
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0" >
<ui version="4.0">
<class>CppFileSettingsPage</class>
<widget class="QWidget" name="CppFileSettingsPage" >
<property name="geometry" >
<widget class="QWidget" name="CppFileSettingsPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -10,45 +10,45 @@
<height>503</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout" >
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
<widget class="QGroupBox" name="groupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title" >
<string>File naming conventions</string>
<property name="title">
<string>File Naming Conventions</string>
</property>
<layout class="QFormLayout" name="formLayout" >
<property name="fieldGrowthPolicy" >
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="headerSuffixLabel" >
<property name="text" >
<item row="0" column="0">
<widget class="QLabel" name="headerSuffixLabel">
<property name="text">
<string>Header suffix:</string>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QComboBox" name="headerSuffixComboBox" />
<item row="0" column="1">
<widget class="QComboBox" name="headerSuffixComboBox"/>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="sourceSuffixLabel" >
<property name="text" >
<item row="1" column="0">
<widget class="QLabel" name="sourceSuffixLabel">
<property name="text">
<string>Source suffix:</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QComboBox" name="sourceSuffixComboBox" />
<item row="1" column="1">
<widget class="QComboBox" name="sourceSuffixComboBox"/>
</item>
<item row="2" column="1" >
<widget class="QCheckBox" name="lowerCaseFileNamesCheckBox" >
<property name="text" >
<item row="2" column="1">
<widget class="QCheckBox" name="lowerCaseFileNamesCheckBox">
<property name="text">
<string>Lower case file names</string>
</property>
</widget>
@@ -57,11 +57,11 @@
</widget>
</item>
<item>
<spacer name="verticalSpacer" >
<property name="orientation" >
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>430</height>

2
src/plugins/cpptools/cpptoolsconstants.h
View File

@@ -49,7 +49,7 @@ const char * const CPPTOOLS_SETTINGSGROUP = "CppTools";
const char * const LOWERCASE_CPPFILES_KEY = "LowerCaseFiles";
enum { lowerCaseFilesDefault = 1 };
const char * const CPP_SETTINGS_ID = QT_TRANSLATE_NOOP("CppTools", "File naming conventions");
const char * const CPP_SETTINGS_ID = QT_TRANSLATE_NOOP("CppTools", "File Naming Conventions");
const char * const CPP_SETTINGS_CATEGORY = QT_TRANSLATE_NOOP("CppTools", "C++");
} // namespace Constants