Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Unified content margins in settings

  • Loading branch information...
commit 1fe273ce49bc25df60a6fe53bf8f81ebf4452ccc 1 parent 37ec1a4
Mezomish authored
2  src/app/qsci/SciDocEngine.cpp
View
@@ -41,7 +41,7 @@ class PrintingPage: public SettingsPage {
vBox->addWidget(keepBgColorChk_);
vBox->addWidget(alwaysWrapChk_);
vBox->addStretch();
- vBox->setMargin(0);
+ vBox->setContentsMargins( 9, 0, 0, 0 );
}
void init() {
items_ << new SettingsCheckItem("printing", "keepColors", keepColorsChk_)
11 src/app/qsci/settings/FileTypesPage.ui
View
@@ -14,7 +14,16 @@
<string/>
</property>
<layout class="QGridLayout" name="gridLayout">
- <property name="margin">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0" rowspan="4">
72 src/app/ui/forms/AutocompleteSettingsPage.ui
View
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>AutocompletePage</class>
- <widget class="QWidget" name="AutocompletePage" >
- <property name="geometry" >
+ <widget class="QWidget" name="AutocompletePage">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,74 +10,89 @@
<height>444</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string/>
</property>
- <layout class="QVBoxLayout" >
- <property name="spacing" >
+ <layout class="QVBoxLayout">
+ <property name="spacing">
<number>2</number>
</property>
- <property name="margin" >
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
<number>0</number>
</property>
+ <property name="bottomMargin">
+ <number>9</number>
+ </property>
<item>
- <widget class="QCheckBox" name="useDocumentChk" >
- <property name="text" >
+ <widget class="QCheckBox" name="useDocumentChk">
+ <property name="text">
<string>Use current document</string>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="useApiChk" >
- <property name="text" >
+ <widget class="QCheckBox" name="useApiChk">
+ <property name="text">
<string>Use API files</string>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="replaceWordChk" >
- <property name="text" >
+ <widget class="QCheckBox" name="replaceWordChk">
+ <property name="text">
<string>Replace word</string>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="matchCaseChk" >
- <property name="text" >
+ <widget class="QCheckBox" name="matchCaseChk">
+ <property name="text">
<string>Case sensitive</string>
</property>
</widget>
</item>
<item>
- <layout class="QHBoxLayout" >
- <property name="spacing" >
+ <layout class="QHBoxLayout">
+ <property name="spacing">
<number>6</number>
</property>
- <property name="margin" >
+ <property name="margin">
<number>0</number>
</property>
<item>
- <widget class="QLabel" name="label" >
- <property name="text" >
+ <widget class="QLabel" name="label">
+ <property name="text">
<string>Threshold</string>
</property>
</widget>
</item>
<item>
- <widget class="QSpinBox" name="thresholdSpin" >
- <property name="specialValueText" >
+ <widget class="QSpinBox" name="thresholdSpin">
+ <property name="maximumSize">
+ <size>
+ <width>150</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="specialValueText">
<string/>
</property>
- <property name="suffix" >
+ <property name="suffix">
<string> symbol(s)</string>
</property>
- <property name="minimum" >
+ <property name="minimum">
<number>2</number>
</property>
- <property name="maximum" >
+ <property name="maximum">
<number>8</number>
</property>
- <property name="value" >
+ <property name="value">
<number>2</number>
</property>
</widget>
@@ -85,10 +101,10 @@
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>181</width>
<height>201</height>
50 src/app/ui/forms/CharsetsSettingsPage.ui
View
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>CharsetsSettingsPage</class>
- <widget class="QWidget" name="CharsetsSettingsPage" >
- <property name="geometry" >
+ <widget class="QWidget" name="CharsetsSettingsPage">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,47 +10,56 @@
<height>300</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string/>
</property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
+ <layout class="QVBoxLayout">
+ <property name="spacing">
+ <number>5</number>
+ </property>
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
<number>0</number>
</property>
- <property name="spacing" >
- <number>5</number>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>9</number>
</property>
<item>
- <widget class="QListWidget" name="charsetsList" />
+ <widget class="QListWidget" name="charsetsList"/>
</item>
<item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
+ <layout class="QHBoxLayout">
+ <property name="spacing">
<number>6</number>
</property>
+ <property name="margin">
+ <number>0</number>
+ </property>
<item>
- <widget class="QPushButton" name="checkAllBtn" >
- <property name="text" >
+ <widget class="QPushButton" name="checkAllBtn">
+ <property name="text">
<string>Check all</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="uncheckAllBtn" >
- <property name="text" >
+ <widget class="QPushButton" name="uncheckAllBtn">
+ <property name="text">
<string>Uncheck all</string>
</property>
</widget>
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
8 src/app/ui/forms/EditorSettingsPage.ui
View
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>582</width>
+ <width>626</width>
<height>597</height>
</rect>
</property>
@@ -14,6 +14,12 @@
<string/>
</property>
<layout class="QGridLayout" name="gridLayout">
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
17 src/app/ui/forms/MainSettingsPage.ui
View
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>319</width>
+ <width>442</width>
<height>493</height>
</rect>
</property>
@@ -20,6 +20,12 @@
<string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
@@ -110,7 +116,14 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
- <widget class="QComboBox" name="languageCmb"/>
+ <widget class="QComboBox" name="languageCmb">
+ <property name="maximumSize">
+ <size>
+ <width>250</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ </widget>
</item>
</layout>
</widget>
13 src/app/ui/forms/ViewSettingsPage.ui
View
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>400</width>
+ <width>533</width>
<height>300</height>
</rect>
</property>
@@ -14,9 +14,18 @@
<string/>
</property>
<layout class="QGridLayout">
- <property name="margin">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
<number>0</number>
</property>
+ <property name="bottomMargin">
+ <number>9</number>
+ </property>
<property name="spacing">
<number>3</number>
</property>
6 src/app/ui/settings/SettingsDlg.cpp
View
@@ -203,6 +203,10 @@ class ColorSettingsPage : public SettingsPage {
vBox->addLayout(grid_);
vBox->addItem(new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding));
setLayout(vBox);
+
+ vBox->setContentsMargins( 9, 0, 0, 9 );
+ grid_->setContentsMargins( 0, 0, 0, 0 );
+ grid_->setVerticalSpacing( 3 );
}
void init() {
@@ -268,7 +272,7 @@ SettingsDlg::SettingsDlg(QWidget* parent) : QDialog(parent) {
// LOGGER;
setWindowTitle(tr("Settings"));
- setMinimumSize(600, 400);
+ setMinimumSize(820, 400);
// create buttons
okBtn_ = new QPushButton(tr("OK"), this);
Please sign in to comment.
Something went wrong with that request. Please try again.