designer recent files fix

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-05-07 23:05:06 +00:00
parent fad79f29d9
commit a6c8fa2471
4 changed files with 3 additions and 66 deletions

View file

@ -74,8 +74,6 @@ public:
QDesignerFormWindowInterface* formWindow() const;
void updatePixmap();
virtual QSize minimumSizeHint() const
{ return QWidget::minimumSizeHint().expandedTo(QSize(16, 16)); }

View file

@ -96,7 +96,7 @@ NewForm::NewForm(QDesignerWorkbench *workbench, QWidget *parentWidget, const QSt
m_buttonBox = createButtonBox();
vBoxLayout->addWidget(m_buttonBox);
setLayout(vBoxLayout);
resize(500, 400);
slotCurrentTemplateChanged(m_newFormWidget->hasCurrentTemplate());
}

View file

@ -481,18 +481,16 @@ QString QDesignerActions::uiExtension() const
QAction *QDesignerActions::createRecentFilesMenu()
{
QMenu *menu = new QMenu;
QAction *act;
// Need to insert this into the QAction.
for (int i = 0; i < MaxRecentFiles; ++i) {
act = new QAction(this);
act->setVisible(false);
QAction *act = new QAction(this);
connect(act, SIGNAL(triggered()), this, SLOT(openRecentForm()));
m_recentFilesActions->addAction(act);
menu->addAction(act);
}
updateRecentFileActions();
menu->addSeparator();
act = new QAction(QIcon::fromTheme(QLatin1String("edit-clear")), tr("Clear &Menu"), this);
QAction *act = new QAction(QIcon::fromTheme(QLatin1String("edit-clear")), tr("Clear &Menu"), this);
act->setObjectName(QLatin1String("__qt_action_clear_menu_"));
connect(act, SIGNAL(triggered()), this, SLOT(clearRecentFiles()));
m_recentFilesActions->addAction(act);

View file

@ -1,59 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the Qt Designer of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** As a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#if defined __cplusplus
#include <QtCore/QObject>
#include <QtCore/QPointer>
#include <QtCore/QSettings>
#include <QtCore/qdebug.h>
#include <QtGui/qevent.h>
#include <QtGui/QHeaderView>
#include <QtGui/QMessageBox>
#include <QtGui/QVBoxLayout>
#include <QtDesigner/abstractformeditor.h>
#include <QtDesigner/abstractformwindow.h>
#include "qdesigner.h"
#include "qdesigner_formwindow.h"
#include "qdesigner_settings.h"
#include "qdesigner_toolwindow.h"
#include "qdesigner_workbench.h"
#endif