some work on AboutDlg,

fixed problem with new databases

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

src/dialogs/AboutDlg.cpp

@@ -32,6 +32,24 @@ CAboutDialog::CAboutDialog(QWidget* parent, const char* name, bool modal, Qt::WF
 setupUi(this);
 createBanner(Banner,Icon_Key32x32,tr("KeePassX %1").arg(KEEPASS_VERSION));
 loadLicFromFile();
+
+QString AboutTr=tr("<b>Current Translation: None</b><br><br>","Please replace 'None' with the language of your translation");
+if(TrActive){
+	AboutTr+=tr("<b>Author:</b> %1<br>").arg(tr("$TRANSALTION_AUTHOR"));
+	QString mail=tr("$TRANSLATION_AUTHOR_EMAIL","Here you can enter your email or homepage if you want.");
+	if(mail!=QString()){
+		AboutTr+=mail+"<br>";
+	}
+	AboutTr+="<br>";
+}
+Edit_Translation->setText(AboutTr+tr("\
+Information on how to translate KeePassX can be found under:\n\
+http://keepass.berlios.de/translation-howto.html"));
+
+QString ThanksTemplate=QString("<div style='margin-left:0px;'><b>%1</b></div><div style='margin-left:10px;'>%2</div><br><br>");
+
+Edit_Thanks->setText(ThanksTemplate.arg(tr("Matthias Miller")).arg(tr("http://www.outofhanwell.com/<br>Mac OS X Support")));
+//Edit_Thanks->setText(Edit_Thanks->text()+ThanksTemplate.arg(tr("  ")).arg(tr("  ")));
 }
 
 CAboutDialog::~CAboutDialog()

src/dialogs/SettingsDlg.cpp

@@ -24,6 +24,8 @@
 #include <qspinbox.h>
 #include <qcolordialog.h>
 #include <qlineedit.h>
+#include <QFileDialog>
+#include <QDir>
 #include "SettingsDlg.h"
 
 
@@ -37,6 +39,7 @@ connect(ButtonColor1, SIGNAL( clicked() ), this, SLOT( OnColor1() ) );
 connect(ButtonColor2, SIGNAL( clicked() ), this, SLOT( OnColor2() ) );
 connect(ButtonTextColor, SIGNAL( clicked() ), this, SLOT( OnTextColor() ) );
 connect(CheckBox_OpenLast,SIGNAL(stateChanged(int)),this,SLOT(OnCeckBoxOpenLastChanged(int)));
+connect(Button_MountDirBrowse,SIGNAL(clicked()),this,SLOT(OnMountDirBrowse()));
 createBanner(Banner,Icon_Settings32x32,tr("Settings"));
 CheckBox_OpenLast->setChecked(config.OpenLast);
 SpinBox_ClipboardTime->setValue(config.ClipboardTimeOut);
@@ -142,9 +145,9 @@ if(state==Qt::Checked){
 }
 }
 
-
-/*$SPECIALIZATION$*/
-
-
-//#include "settingsdlg.moc"
-
+void CSettingsDlg::OnMountDirBrowse(){
+QString dir=QFileDialog::getExistingDirectory(this,tr("Select a directory..."),"/");
+if(dir!=QString()){
+	Edit_MountDir->setText(dir);
+}
+}

src/dialogs/SettingsDlg.h

@@ -38,6 +38,7 @@ public slots:
     virtual void OnColor2();
     virtual void OnColor1();
 	void OnCeckBoxOpenLastChanged(int state);
+	void OnMountDirBrowse();
 
 private:
  QColor color1,color2,textcolor;