Another bunch of GUI changes

Auto-save database on program exit: apply adjusted patch #1900048 (closes #1792317)

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@159 b624d157-de02-0410-bad0-e51aec6abb33

src/dialogs/AutoTypeDlg.cpp

@@ -25,21 +25,25 @@
 
 AutoTypeDlg::AutoTypeDlg(QList<IEntryHandle*> entries, QList<int> numbers){
 	setupUi(this);
-	createBanner(&BannerPixmap,getPixmap("keepassx_large"),tr("Auto-Type"),width());
+	
 	setAttribute(Qt::WA_DeleteOnClose);
 	setWindowFlags(windowFlags()|Qt::WindowStaysOnTopHint);
 	setGeometry( QRect(QApplication::desktop()->screenGeometry(QCursor::pos()).center() - rect().center(), size()) );
 	setWindowIcon(getIcon("keepassx"));
 	entryList->setAlternatingRowColors(config->alternatingRowColors());
 	
+	bool hideUsernames = config->hideUsernames();
+	if (hideUsernames)
+		entryList->setHeaderLabels(QStringList() << tr("Group") << tr("Title"));
+	else
+		entryList->setHeaderLabels(QStringList() << tr("Group") << tr("Title") << tr("Username"));
+	
 	QList<QTreeWidgetItem*> itemList;
 	AutoTypeEntry autoTypeEntry;
 	for (int i=0; i<entries.size(); i++){
 		QStringList cols;
 		cols << entries[i]->group()->title() << entries[i]->title();
-		if (config->hideUsernames())
-			cols << "****";
-		else
+		if (!hideUsernames)
 			cols << entries[i]->username();
 		
 		QTreeWidgetItem* widgetItem = new QTreeWidgetItem(cols);
@@ -55,7 +59,12 @@ AutoTypeDlg::AutoTypeDlg(QList<IEntryHandle*> entries, QList<int> numbers){
 	
 	entryList->resizeColumnToContents(0);
 	entryList->resizeColumnToContents(1);
-	entryList->resizeColumnToContents(2);
+	if (!hideUsernames)
+		entryList->resizeColumnToContents(2);
+	
+	entryList->setColumnWidth(0, entryList->columnWidth(0)+10);
+	if (!hideUsernames)
+		entryList->setColumnWidth(1, entryList->columnWidth(1)+10);
 	
 	connect(ButtonBox, SIGNAL(rejected()), SLOT(close()));
 	connect(entryList, SIGNAL(itemClicked(QTreeWidgetItem*,int)), SLOT(itemSelected(QTreeWidgetItem*)));
@@ -77,6 +86,10 @@ void AutoTypeDlg::paintEvent(QPaintEvent* event){
 	painter.drawPixmap(QPoint(0,0),BannerPixmap);
 }
 
+void AutoTypeDlg::resizeEvent(QResizeEvent* event){
+	createBanner(&BannerPixmap,getPixmap("keepassx_large"),tr("Auto-Type"),width());
+}
+
 void AutoTypeDlg::itemSelected(QTreeWidgetItem* item){
 	close();
 	QString err;

src/dialogs/AutoTypeDlg.h

@@ -29,6 +29,7 @@ class AutoTypeDlg : public QWidget, private Ui::AutoTypeDlg
 	
 	protected:
 		void paintEvent(QPaintEvent* event);
+		void resizeEvent(QResizeEvent* event);
 	
 	private slots:
 		void itemSelected(QTreeWidgetItem* item);

src/dialogs/ManageBookmarksDlg.cpp

@@ -26,7 +26,6 @@
 ManageBookmarksDlg::ManageBookmarksDlg(QWidget* parent):QDialog(parent)
 {
 	setupUi(this);
-    createBanner(&BannerPixmap,getPixmap("bookmark"),tr("Manage Bookmarks"),width());
 
 	for(int i=0;i<KpxBookmarks::count();i++){
 		QListWidgetItem* item=new QListWidgetItem(ListWidget);
@@ -55,7 +54,10 @@ void ManageBookmarksDlg::paintEvent(QPaintEvent *event){
     painter.drawPixmap(QPoint(0,0),BannerPixmap);
 }
 
-
+void ManageBookmarksDlg::resizeEvent(QResizeEvent* event){
+	createBanner(&BannerPixmap,getPixmap("bookmark"),tr("Manage Bookmarks"),width());
+	QDialog::resizeEvent(event);
+}
 
 void ManageBookmarksDlg::OnButtonAdd(){
     AddBookmarkDlg dlg(this);

src/dialogs/ManageBookmarksDlg.h

@@ -35,6 +35,7 @@ class ManageBookmarksDlg : public QDialog, private Ui::ManageBookmarksDlg
 	private:
         QPixmap BannerPixmap;
         virtual void paintEvent(QPaintEvent*);
+		virtual void resizeEvent(QResizeEvent*);
 		virtual void closeEvent(QCloseEvent* event);
 	private slots:
         void OnButtonAdd();

src/dialogs/SettingsDlg.cpp

@@ -79,6 +79,7 @@ CSettingsDlg::CSettingsDlg(QWidget* parent):QDialog(parent,Qt::Dialog)
 	CheckBox_StartMinimized->setChecked(config->startMinimized());
 	CheckBox_StartLocked->setChecked(config->startLocked());
 	checkBox_SaveFileDlgHistory->setChecked(config->saveFileDlgHistory());
+	CheckBox_AutoSave->setChecked(config->autoSave());
 	checkBox_AskBeforeDelete->setChecked(config->askBeforeDelete());
 
 	switch(config->groupTreeState()){
@@ -211,6 +212,7 @@ void CSettingsDlg::apply(){
 	else config->setGroupTreeState(KpxConfig::DoNothing);
 	config->setOpenLastFile(CheckBox_OpenLast->isChecked());
 	config->setRememberLastKey(CheckBox_RememberLastKey->isChecked());
+	config->setAutoSave(CheckBox_AutoSave->isChecked());
 	config->setAskBeforeDelete(checkBox_AskBeforeDelete->isChecked());
 
 	//Appearence