Commit a5977bc8 authored by Leandro Melo's avatar Leandro Melo
Browse files

Revert "Make our options dialog a bit more uniform"

This reverts commit 561f87fc.
parent f4c25ad5
......@@ -58,17 +58,10 @@
<item>
<layout class="QHBoxLayout">
<item>
<widget class="QToolButton" name="defaultButton">
<property name="toolTip">
<string>Reset all to default</string>
</property>
<widget class="QPushButton" name="defaultButton">
<property name="text">
<string>Defaults</string>
</property>
<property name="icon">
<iconset resource="../core.qrc">
<normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
</property>
</widget>
</item>
<item>
......@@ -136,7 +129,7 @@
</size>
</property>
<property name="toolTip">
<string>Reset to default</string>
<string>Reset</string>
</property>
<property name="text">
<string/>
......@@ -168,6 +161,11 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Utils::FancyLineEdit</class>
<extends>QLineEdit</extends>
<header location="global">utils/fancylineedit.h</header>
</customwidget>
<customwidget>
<class>Utils::FilterLineEdit</class>
<extends>QLineEdit</extends>
......
......@@ -65,9 +65,6 @@
<file>images/category_cpp.png</file>
<file>images/category_vcs.png</file>
<file>images/category_qml.png</file>
<file>images/filtericon.png</file>
<file>images/plus-16.png</file>
<file>images/minus-16.png</file>
<file>images/edit.png</file>
<file>images/filtericon.png</file>
</qresource>
</RCC>
......@@ -217,9 +217,8 @@ const char * const G_WINDOW_OTHER = "QtCreator.Group.Window.Other";
const char * const G_HELP_HELP = "QtCreator.Group.Help.Help";
const char * const G_HELP_ABOUT = "QtCreator.Group.Help.About";
const char * const ICON_MINUS = ":/core/images/minus-16.png";
const char * const ICON_PLUS = ":/core/images/plus-16.png";
const char * const ICON_EDIT = ":/core/images/edit.png";
const char * const ICON_MINUS = ":/core/images/minus.png";
const char * const ICON_PLUS = ":/core/images/plus.png";
const char * const ICON_NEWFILE = ":/core/images/filenew.png";
const char * const ICON_OPENFILE = ":/core/images/fileopen.png";
const char * const ICON_SAVEFILE = ":/core/images/filesave.png";
......
......@@ -97,8 +97,10 @@ QWidget *CodePasterSettingsPage::createPage(QWidget *parent)
connect(lineEdit, SIGNAL(textChanged(QString)), this, SLOT(serverChanged(QString)));
formLayout->addRow(tr("Server:"), lineEdit);
outerLayout->addLayout(formLayout);
QLabel *noteLabel = new QLabel(tr("<i>Note: Specify the host name for the CodePaster service "
"without any protocol prepended (e.g. codepaster.mycompany.com).</i>"));
outerLayout->addSpacerItem(new QSpacerItem(0, 30, QSizePolicy::Ignored, QSizePolicy::Fixed));
QLabel *noteLabel = new QLabel(tr("Note: Specify the host name for the CodePaster service "
"without any protocol prepended (e.g. codepaster.mycompany.com)."));
noteLabel->setWordWrap(true);
outerLayout->addWidget(noteLabel);
......
......@@ -2,32 +2,11 @@
<ui version="4.0">
<class>CodePaster::FileShareProtocolSettingsWidget</class>
<widget class="QWidget" name="CodePaster::FileShareProtocolSettingsWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>403</width>
<height>122</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="helpLabel">
<property name="text">
<string>The fileshare-based paster protocol allows for sharing code snippets using simple files on a shared network drive. Files are never deleted.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="0">
<item row="1" column="0">
<widget class="QLabel" name="pathLabel">
<property name="text">
<string>&amp;Path:</string>
......@@ -37,10 +16,10 @@
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="Utils::PathChooser" name="pathChooser" native="true"/>
<item row="1" column="1">
<widget class="Utils::PathChooser" name="pathChooser"/>
</item>
<item row="3" column="0">
<item row="2" column="0">
<widget class="QLabel" name="displayCountLabel">
<property name="text">
<string>&amp;Display:</string>
......@@ -50,7 +29,7 @@
</property>
</widget>
</item>
<item row="3" column="1">
<item row="2" column="1">
<widget class="QSpinBox" name="displayCountSpinBox">
<property name="suffix">
<string>entries</string>
......@@ -66,18 +45,15 @@
</property>
</widget>
</item>
<item row="1" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="helpLabel">
<property name="text">
<string>The fileshare-based paster protocol allows for sharing code snippets using simple files on a shared network drive. Files are never deleted.</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>5</height>
</size>
<property name="wordWrap">
<bool>true</bool>
</property>
</spacer>
</widget>
</item>
</layout>
</widget>
......@@ -86,11 +62,6 @@
<class>Utils::PathChooser</class>
<extends>QWidget</extends>
<header location="global">utils/pathchooser.h</header>
<container>1</container>
<slots>
<signal>editingFinished()</signal>
<signal>browsingFinished()</signal>
</slots>
</customwidget>
</customwidgets>
<resources/>
......
......@@ -15,11 +15,21 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows to send posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</string>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
</widget>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="serverPrefix">
<property name="text">
<string>Server prefix:</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="explanatoryTextSpacer">
......@@ -32,32 +42,17 @@
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>5</height>
<height>30</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="serverPrefix">
<property name="text">
<string>Server prefix:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit"/>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="explanatoryTextLabel">
<property name="text">
<string>&lt;i&gt;Note: The plugin will use this for posting as well as fetching.&lt;/i&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
&lt;p&gt;&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows to send posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.&lt;/p&gt;
&lt;p&gt;Note that the plugin will use this for posting as well as fetching.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
......
......@@ -37,7 +37,6 @@
#include <coreplugin/icore.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/mimedatabase.h>
#include <cppeditor/cppeditorconstants.h>
......@@ -53,7 +52,6 @@
#include <QtCore/QTextCodec>
#include <QtCore/QTextStream>
#include <QtGui/QIcon>
#include <QtGui/QFileDialog>
#include <QtGui/QMessageBox>
......@@ -249,7 +247,6 @@ CppFileSettingsWidget::CppFileSettingsWidget(QWidget *parent) :
m_ui->headerSuffixComboBox->addItem(suffix);
m_ui->licenseTemplatePathChooser->setExpectedKind(Utils::PathChooser::File);
m_ui->licenseTemplatePathChooser->addButton(tr("Edit..."), this, SLOT(slotEdit()));
m_ui->licenseTemplatePathChooser->buttonAtIndex(1)->setIcon(QIcon(Core::Constants::ICON_EDIT));
}
CppFileSettingsWidget::~CppFileSettingsWidget()
......
......@@ -10,15 +10,13 @@
<height>303</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The debugging helper is only used to produce a nice display of objects of certain types like QString or std::map in the &amp;quot;Locals and Watchers&amp;quot; view. It is not strictly necessary for debugging with Qt Creator. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
&lt;p&gt;The debugging helper is only used to produce a nice display of objects of certain types like QString or std::map in the &amp;quot;Locals and Watchers&amp;quot; view.&lt;/p&gt;
&lt;p&gt; It is not strictly necessary for debugging with Qt Creator. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
......@@ -28,22 +26,6 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>5</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QGroupBox" name="debuggingHelperGroupBox">
<property name="title">
......
......@@ -39,25 +39,17 @@
<number>0</number>
</property>
<item>
<widget class="QToolButton" name="addButton">
<widget class="QPushButton" name="addButton">
<property name="text">
<string>Add...</string>
</property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="removeButton">
<widget class="QPushButton" name="removeButton">
<property name="text">
<string>Remove</string>
</property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
</property>
</widget>
</item>
<item>
......@@ -80,8 +72,6 @@
</item>
</layout>
</widget>
<resources>
<include location="../coreplugin/core.qrc"/>
</resources>
<resources/>
<connections/>
</ui>
......@@ -113,25 +113,17 @@ Add, modify, and remove document filters, which determine the documentation set
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QToolButton" name="filterAddButton">
<widget class="QPushButton" name="filterAddButton">
<property name="text">
<string>Add</string>
</property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="filterRemoveButton">
<widget class="QPushButton" name="filterRemoveButton">
<property name="text">
<string>Remove</string>
</property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
</property>
</widget>
</item>
<item>
......@@ -151,8 +143,6 @@ Add, modify, and remove document filters, which determine the documentation set
</item>
</layout>
</widget>
<resources>
<include location="../coreplugin/core.qrc"/>
</resources>
<resources/>
<connections/>
</ui>
......@@ -264,16 +264,9 @@
</widget>
</item>
<item>
<widget class="QToolButton" name="defaultPageButton">
<property name="toolTip">
<string>Reset to default</string>
</property>
<widget class="QPushButton" name="defaultPageButton">
<property name="text">
<string>Reset to Default</string>
</property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
<string>Restore to Default</string>
</property>
</widget>
</item>
......@@ -400,8 +393,6 @@
</item>
</layout>
</widget>
<resources>
<include location="../coreplugin/core.qrc"/>
</resources>
<resources/>
<connections/>
</ui>
......@@ -75,10 +75,6 @@
<property name="text">
<string>+</string>
</property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
</property>
</widget>
</item>
<item>
......@@ -92,10 +88,6 @@
<property name="text">
<string>-</string>
</property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
</property>
</widget>
</item>
<item>
......@@ -127,9 +119,7 @@
</item>
</layout>
</widget>
<resources>
<include location="../coreplugin/core.qrc"/>
</resources>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
......
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>387</width>
<height>285</height>
<width>393</width>
<height>275</height>
</rect>
</property>
<layout class="QGridLayout">
......@@ -23,83 +23,6 @@
<item row="0" column="1" colspan="3">
<widget class="QLineEdit" name="nameEdit"/>
</item>
<item row="1" column="0">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Directories:</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="1" column="1" colspan="2">
<widget class="QListWidget" name="directoryList"/>
</item>
<item row="1" column="3">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QToolButton" name="addButton">
<property name="text">
<string>Add</string>
</property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="editButton">
<property name="text">
<string>Edit</string>
</property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/edit.png</normaloff>:/core/images/edit.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="removeButton">
<property name="text">
<string>Remove</string>
</property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
......@@ -157,6 +80,58 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
</property>
</widget>
</item>
<item row="1" column="3">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QPushButton" name="addButton">
<property name="text">
<string>Add...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="editButton">
<property name="text">
<string>Edit...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="removeButton">
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Directories:</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="1" column="1" colspan="2">
<widget class="QListWidget" name="directoryList"/>
</item>
</layout>
</item>
<item row="1" column="0">
......@@ -181,9 +156,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
</item>
</layout>
</widget>
<resources>
<include location="../coreplugin/core.qrc"/>
</resources>
<resources/>
<connections>
<connection>