summaryrefslogtreecommitdiffstats
path: root/tools/designer
diff options
context:
space:
mode:
Diffstat (limited to 'tools/designer')
-rw-r--r--tools/designer/src/components/formeditor/formwindow.cpp4
-rw-r--r--tools/designer/src/components/formeditor/qtbrushmanager.h4
-rw-r--r--tools/designer/src/lib/shared/qdesigner_command.cpp6
3 files changed, 5 insertions, 9 deletions
diff --git a/tools/designer/src/components/formeditor/formwindow.cpp b/tools/designer/src/components/formeditor/formwindow.cpp
index 11fc06b..8a7bb79 100644
--- a/tools/designer/src/components/formeditor/formwindow.cpp
+++ b/tools/designer/src/components/formeditor/formwindow.cpp
@@ -2238,12 +2238,12 @@ QMenu *FormWindow::createPopupMenu(QWidget *w)
layoutMenu->addAction(manager->actionAdjustSize());
layoutMenu->addAction(manager->actionHorizontalLayout());
layoutMenu->addAction(manager->actionVerticalLayout());
- layoutMenu->addAction(manager->actionGridLayout());
- layoutMenu->addAction(manager->actionFormLayout());
if (!isFormWindow) {
layoutMenu->addAction(manager->actionSplitHorizontal());
layoutMenu->addAction(manager->actionSplitVertical());
}
+ layoutMenu->addAction(manager->actionGridLayout());
+ layoutMenu->addAction(manager->actionFormLayout());
layoutMenu->addAction(manager->actionBreakLayout());
layoutMenu->addAction(manager->actionSimplifyLayout());
diff --git a/tools/designer/src/components/formeditor/qtbrushmanager.h b/tools/designer/src/components/formeditor/qtbrushmanager.h
index 1d966cb..1d1542d 100644
--- a/tools/designer/src/components/formeditor/qtbrushmanager.h
+++ b/tools/designer/src/components/formeditor/qtbrushmanager.h
@@ -71,10 +71,6 @@ public:
void setCurrentBrush(const QString &name);
QPixmap brushPixmap(const QBrush &brush) const;
-signals:
- void brushAdded(const QString &name, const QBrush &brush);
- void brushRemoved(const QString &name);
- void currentBrushChanged(const QString &name, const QBrush &brush);
private:
QScopedPointer<QtBrushManagerPrivate> d_ptr;
diff --git a/tools/designer/src/lib/shared/qdesigner_command.cpp b/tools/designer/src/lib/shared/qdesigner_command.cpp
index 7483c67..3badd30 100644
--- a/tools/designer/src/lib/shared/qdesigner_command.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_command.cpp
@@ -1113,7 +1113,7 @@ void AddToolBoxPageCommand::init(QToolBox *toolBox, InsertionMode mode)
m_widget = new QDesignerWidget(formWindow(), m_toolBox);
m_itemText = QApplication::translate("Command", "Page");
m_itemIcon = QIcon();
- m_widget->setObjectName(QApplication::translate("Command", "page"));
+ m_widget->setObjectName(QLatin1String("page"));
formWindow()->ensureUniqueObjectName(m_widget);
setText(QApplication::translate("Command", "Insert Page"));
@@ -1236,7 +1236,7 @@ void AddTabPageCommand::init(QTabWidget *tabWidget, InsertionMode mode)
m_widget = new QDesignerWidget(formWindow(), m_tabWidget);
m_itemText = QApplication::translate("Command", "Page");
m_itemIcon = QIcon();
- m_widget->setObjectName(QApplication::translate("Command", "tab"));
+ m_widget->setObjectName(QLatin1String("tab"));
formWindow()->ensureUniqueObjectName(m_widget);
setText(QApplication::translate("Command", "Insert Page"));
@@ -1422,7 +1422,7 @@ void AddStackedWidgetPageCommand::init(QStackedWidget *stackedWidget, InsertionM
if (mode == InsertAfter)
m_index++;
m_widget = new QDesignerWidget(formWindow(), m_stackedWidget);
- m_widget->setObjectName(QApplication::translate("Command", "page"));
+ m_widget->setObjectName(QLatin1String("page"));
formWindow()->ensureUniqueObjectName(m_widget);
setText(QApplication::translate("Command", "Insert Page"));