1 #! /bin/sh /usr/share/dpatch/dpatch-run
2 ## 60_ScrollAreaInDialogs.dpatch by <yma@>
4 ## All lines beginning with `## DP:' are a description of the patch.
8 diff -urNad keepassx~/src/dialogs/EditEntryDlg.cpp keepassx/src/dialogs/EditEntryDlg.cpp
9 --- keepassx~/src/dialogs/EditEntryDlg.cpp 2011-01-23 18:20:41.000000000 +0100
10 +++ keepassx/src/dialogs/EditEntryDlg.cpp 2011-01-23 22:45:14.000000000 +0100
12 ***************************************************************************/
14 #include <QFileDialog>
15 +#include <QScrollArea>
17 #include "SelectIconDlg.h"
18 #include "PasswordGenDlg.h"
19 #include "EditEntryDlg.h"
23 QMenu *ExpirePresetsMenu=new QMenu();
25 + // YMA add scroll area
26 + QWidget* wrapper = new QWidget();
27 + wrapper->setLayout(this->layout());
29 + QScrollArea* scrollArea = new QScrollArea(this);
30 + scrollArea->setWidgetResizable(true);
31 + scrollArea->setWidget(wrapper);
33 + QHBoxLayout* wrapperLayout = new QHBoxLayout();
34 + wrapperLayout->addWidget(scrollArea);
35 + this->setLayout(wrapperLayout);
37 setGeometry( config->dialogGeometry(this) );
39 diff -urNad keepassx~/src/dialogs/PasswordGenDlg.cpp keepassx/src/dialogs/PasswordGenDlg.cpp
40 --- keepassx~/src/dialogs/PasswordGenDlg.cpp 2011-01-23 18:20:41.000000000 +0100
41 +++ keepassx/src/dialogs/PasswordGenDlg.cpp 2011-01-23 22:45:43.000000000 +0100
43 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
44 ***************************************************************************/
46 +#include <QScrollArea>
48 #include "dialogs/PasswordGenDlg.h"
49 #include "dialogs/CollectEntropyDlg.h"
55 + // YMA add scroll area
56 + QWidget* wrapper = new QWidget();
57 + wrapper->setLayout(this->layout());
59 + QScrollArea* scrollArea = new QScrollArea(this);
60 + scrollArea->setWidgetResizable(true);
61 + scrollArea->setWidget(wrapper);
63 + QHBoxLayout* wrapperLayout = new QHBoxLayout();
64 + wrapperLayout->addWidget(scrollArea);
65 + this->setLayout(wrapperLayout);
67 connect(ButtonGenerate, SIGNAL(clicked()), SLOT(OnGeneratePw()));
68 connect(DialogButtons, SIGNAL(rejected()), SLOT(OnCancel()));
69 connect(DialogButtons, SIGNAL(accepted()), SLOT(OnAccept()));
70 diff -urNad keepassx~/src/dialogs/SettingsDlg.cpp keepassx/src/dialogs/SettingsDlg.cpp
71 --- keepassx~/src/dialogs/SettingsDlg.cpp 2011-01-23 18:22:01.000000000 +0100
72 +++ keepassx/src/dialogs/SettingsDlg.cpp 2011-01-23 22:45:22.000000000 +0100
75 #include <QFileDialog>
76 #include <QColorDialog>
77 +#include <QScrollArea>
79 #include "dialogs/SettingsDlg.h"
80 #include "dialogs/CustomizeDetailViewDlg.h"
83 CSettingsDlg::CSettingsDlg(QWidget* parent):QDialog(parent,Qt::Dialog)
87 + // YMA add scroll area
88 + QWidget* wrapper = new QWidget();
89 + wrapper->setLayout(this->layout());
91 + QScrollArea* scrollArea = new QScrollArea(this);
92 + scrollArea->setWidgetResizable(true);
93 + scrollArea->setWidget(wrapper);
95 + QHBoxLayout* wrapperLayout = new QHBoxLayout();
96 + wrapperLayout->addWidget(scrollArea);
97 + this->setLayout(wrapperLayout);
99 connect(listWidget, SIGNAL( currentRowChanged(int) ), stackedWidget, SLOT( setCurrentIndex(int) ) );
101 connect(DialogButtons, SIGNAL( accepted() ), this, SLOT( OnOK() ) );