aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TODO2
-rw-r--r--gpg4usb.pro2
-rw-r--r--gpgwin.cpp9
-rw-r--r--gpgwin.h6
-rwxr-xr-xkeymgmt.cpp91
-rw-r--r--main.cpp2
-rwxr-xr-xquitdialog.cpp6
-rw-r--r--textedit.cpp13
8 files changed, 34 insertions, 97 deletions
diff --git a/TODO b/TODO
index 2b475ff..6fbb0bd 100644
--- a/TODO
+++ b/TODO
@@ -37,6 +37,8 @@ attachments:
- fix overwrite file bug in file encryption [DONE]
- add drag'n'drop features for keys [DONE]
- add posibility to change password of key
+- check and add missing statusbar messages
+- add editorpage-method setmodified
Release 0.3
- PGP-MIME, find and show inline encrypted files
diff --git a/gpg4usb.pro b/gpg4usb.pro
index 0ab3204..18dc1b3 100644
--- a/gpg4usb.pro
+++ b/gpg4usb.pro
@@ -23,6 +23,7 @@ HEADERS += attachments.h \
fileencryptiondialog.h \
mime.h \
keygenthread.h \
+ keygendialog.h \
keydetailsdialog.h \
settingsdialog.h \
attachmenttablemodel.h \
@@ -38,6 +39,7 @@ SOURCES += attachments.cpp \
fileencryptiondialog.cpp \
mime.cpp \
keygenthread.cpp \
+ keygendialog.cpp \
keydetailsdialog.cpp \
settingsdialog.cpp \
attachmenttablemodel.cpp \
diff --git a/gpgwin.cpp b/gpgwin.cpp
index a7b04b4..cfbdbd9 100644
--- a/gpgwin.cpp
+++ b/gpgwin.cpp
@@ -284,6 +284,10 @@ void GpgWin::createActions()
openTutorialAct->setToolTip(tr("Open Online Tutorial"));
connect(openTutorialAct, SIGNAL(triggered()), this, SLOT(openTutorial()));
+ openTranslateAct = new QAction(tr("Translate gpg4usb"), this);
+ openTranslateAct->setToolTip(tr("Translate gpg4usb yourself"));
+ connect(openTranslateAct, SIGNAL(triggered()), this, SLOT(openTranslate()));
+
/** Popup-Menu-Action for KeyList
*/
appendSelectedKeysAct = new QAction(tr("Append Selected Key(s) To Text"), this);
@@ -351,6 +355,7 @@ void GpgWin::createMenus()
helpMenu = menuBar()->addMenu(tr("&Help"));
helpMenu->addAction(openTutorialAct);
+ helpMenu->addAction(openTranslateAct);
helpMenu->addAction(aboutAct);
}
@@ -457,6 +462,10 @@ void GpgWin::about()
"gpg4usb at conference.jabber.ccc.de</center>"));
}
+void GpgWin::openTranslate() {
+ QDesktopServices::openUrl(QUrl("http://gpg4usb.cpunk.de/docu_translate.html"));
+}
+
void GpgWin::openTutorial() {
QDesktopServices::openUrl(QUrl("http://gpg4usb.cpunk.de/docu.html"));
}
diff --git a/gpgwin.h b/gpgwin.h
index c44093a..a4fb629 100644
--- a/gpgwin.h
+++ b/gpgwin.h
@@ -66,6 +66,8 @@ protected:
public slots:
void encrypt();
void decrypt();
+ void sign();
+ void verify();
void importKeyFromFile();
void importKeyFromEdit();
void importKeyFromClipboard();
@@ -78,8 +80,7 @@ public slots:
void openSettingsDialog();
void openTutorial();
void checkAttachmentFolder();
- void sign();
- void verify();
+ void openTranslate();
// void dropEvent(QDropEvent *event);
private:
@@ -137,6 +138,7 @@ private:
QAction *aboutAct;
QAction *fileEncryptionAct;
QAction *openSettingsAct;
+ QAction *openTranslateAct;
QAction *openTutorialAct;
QLineEdit *nameEdit;
QLineEdit *emailEdit;
diff --git a/keymgmt.cpp b/keymgmt.cpp
index 6cb2a05..4783ece 100755
--- a/keymgmt.cpp
+++ b/keymgmt.cpp
@@ -23,7 +23,7 @@
#include <QtGui>
#include "keymgmt.h"
-
+#include "keygendialog.h"
KeyMgmt::KeyMgmt(GpgME::Context *ctx, QString iconPath)
{
@@ -229,94 +229,7 @@ void KeyMgmt::exportKeyToClipboard()
void KeyMgmt::generateKeyDialog()
{
- QStringList errorMessages;
- genkeyDialog = new QDialog();
- QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-
- genkeyDialog->setWindowTitle(tr("Generate Key"));
- genkeyDialog->setModal(true);
-
- nameLabel = new QLabel(tr("Name:"));
- emailLabel = new QLabel(tr("E-Mailaddress::"));
- commentLabel = new QLabel(tr("Comment:"));
- keySizeLabel = new QLabel(tr("KeySize (in Bit):"));
- dateLabel = new QLabel(tr("Expiration Date:"));
- passwordLabel = new QLabel(tr("Password:"));
- repeatpwLabel = new QLabel(tr("Repeat Password:"));
- expireLabel = new QLabel(tr("Never Expire"));
- pwStrengthLabel = new QLabel(tr("Password: Strength\nWeak -> Strong"));
- errorLabel = new QLabel(tr(""));
- nameEdit = new QLineEdit(genkeyDialog);
- emailEdit = new QLineEdit(genkeyDialog);
- commentEdit = new QLineEdit(genkeyDialog);
-
- keySizeSpinBox = new QSpinBox(genkeyDialog);
- keySizeSpinBox->setRange(768, 8192);
- keySizeSpinBox->setValue(2048);
-
- keySizeSpinBox->setSingleStep(256);
-
- dateEdit = new QDateEdit(QDate::currentDate().addYears(5), genkeyDialog);
- dateEdit->setMinimumDate(QDate::currentDate());
- dateEdit->setDisplayFormat("dd/MM/yyyy");
- dateEdit->setCalendarPopup(true);
- dateEdit->setEnabled(false);
-
- expireCheckBox = new QCheckBox(genkeyDialog);
- expireCheckBox->setCheckState(Qt::Checked);
-
- passwordEdit = new QLineEdit(genkeyDialog);
- repeatpwEdit = new QLineEdit(genkeyDialog);
-
- passwordEdit->setEchoMode(QLineEdit::Password);
- repeatpwEdit->setEchoMode(QLineEdit::Password);
-
- pwStrengthSlider = new QSlider(genkeyDialog);
- pwStrengthSlider->setOrientation(Qt::Horizontal);
- pwStrengthSlider->setMaximum(6);
- pwStrengthSlider->setDisabled(true);
- pwStrengthSlider->setToolTip(tr("Password Strength"));
- pwStrengthSlider->setTickPosition(QSlider::TicksBelow);
-
- QGridLayout *vbox1 = new QGridLayout;
- vbox1->addWidget(nameLabel, 0, 0);
- vbox1->addWidget(nameEdit, 0, 1);
- vbox1->addWidget(emailLabel, 1, 0);
- vbox1->addWidget(emailEdit, 1, 1);
- vbox1->addWidget(commentLabel, 2, 0);
- vbox1->addWidget(commentEdit, 2, 1);
- vbox1->addWidget(dateLabel, 3, 0);
- vbox1->addWidget(dateEdit, 3, 1);
- vbox1->addWidget(expireCheckBox, 3, 2);
- vbox1->addWidget(expireLabel, 3, 3);
- vbox1->addWidget(keySizeLabel, 4, 0);
- vbox1->addWidget(keySizeSpinBox, 4, 1);
- vbox1->addWidget(passwordLabel, 5, 0);
- vbox1->addWidget(passwordEdit, 5, 1);
- vbox1->addWidget(pwStrengthLabel, 5, 3);
- vbox1->addWidget(repeatpwLabel, 6, 0);
- vbox1->addWidget(repeatpwEdit, 6, 1);
- vbox1->addWidget(pwStrengthSlider, 6, 3);
-
- QWidget *nameList = new QWidget(genkeyDialog);
- nameList->setLayout(vbox1);
-
- QVBoxLayout *vbox2 = new QVBoxLayout();
- vbox2->addWidget(nameList);
- vbox2->addWidget(errorLabel);
- vbox2->addWidget(buttonBox);
-
- connect(buttonBox, SIGNAL(accepted()), this, SLOT(keyGenAccept()));
- connect(buttonBox, SIGNAL(rejected()), genkeyDialog, SLOT(reject()));
-
- connect(expireCheckBox, SIGNAL(stateChanged(int)), this, SLOT(expireBoxChanged()));
- connect(passwordEdit, SIGNAL(textChanged(QString)), this, SLOT(passwordEditChanged()));
- genkeyDialog->setLayout(vbox2);
- genkeyDialog->show();
-
- if (genkeyDialog->exec() == QDialog::Accepted) {
-
- }
+ KeyGenDialog *dialog = new KeyGenDialog(mCtx);
}
diff --git a/main.cpp b/main.cpp
index d42d85f..10b79e3 100644
--- a/main.cpp
+++ b/main.cpp
@@ -33,7 +33,7 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
- app.setApplicationVersion("0.2.5");
+ app.setApplicationVersion("0.3.0");
app.setApplicationName("gpg4usb");
// QSettings uses org-name for automatically setting path...
diff --git a/quitdialog.cpp b/quitdialog.cpp
index baf352a..57574e8 100755
--- a/quitdialog.cpp
+++ b/quitdialog.cpp
@@ -73,7 +73,7 @@ QuitDialog::QuitDialog(QWidget *parent, QHash<int, QString> unsavedDocs, QString
QPixmap *pixmap = new QPixmap(iconPath + "error.png");
QLabel *warnicon = new QLabel();
warnicon->setPixmap(*pixmap);
- QLabel *warnlabel = new QLabel(tr("%1 files contain unsaved information.").arg(row)+"\n"+tr("Save the changes before closing?"));
+ QLabel *warnlabel = new QLabel(tr("<h3>%1 files contain unsaved information.<br/>Save the changes before closing?</h3>").arg(row));
QHBoxLayout *warnBoxLayout = new QHBoxLayout();
warnBoxLayout->addWidget(warnicon);
warnBoxLayout->addWidget(warnlabel);
@@ -84,8 +84,8 @@ QuitDialog::QuitDialog(QWidget *parent, QHash<int, QString> unsavedDocs, QString
/*
* Two labels on top and under the filelist
*/
- QLabel *checkLabel = new QLabel(tr("Check the files you want to save"));
- QLabel *notelabel = new QLabel(tr("NOTE: If you don't save these files, all changes are lost.")+"\n");
+ QLabel *checkLabel = new QLabel(tr("Check the files you want to save:"));
+ QLabel *notelabel = new QLabel(tr("<b>Note:</b> If you don't save these files, all changes are lost.<br/>"));
/*
* Buttonbox
diff --git a/textedit.cpp b/textedit.cpp
index 8595c4b..a92757e 100644
--- a/textedit.cpp
+++ b/textedit.cpp
@@ -141,8 +141,16 @@ bool TextEdit::saveFile(const QString &fileName)
bool TextEdit::saveAs()
{
+ EditorPage *page = curPage();
+ QString path;
+ if(page->getFilePath() != "") {
+ path = page->getFilePath();
+ } else {
+ path = tabWidget->tabText(tabWidget->currentIndex()).remove(0,2);
+ }
+
QString fileName = QFileDialog::getSaveFileName(this, tr("Save file "),
- QDir::currentPath());
+ path);
return saveFile(fileName);
}
@@ -207,7 +215,8 @@ bool TextEdit::maybeSaveCurrentTab(bool askToSave) {
QString filePath = page->getFilePath();
if (askToSave) {
result = QMessageBox::warning(this, tr("Unsaved document"),
- tr("The document has been modified:")+"\n\n"+docname+"\n\n\n"+tr("Do you want to save your changes?"),
+ tr("<h3>The document \"%1\" has been modified.<br/>Do you want to save your changes?</h3>").arg(docname)+
+ tr("<b>Note:</b> If you don't save these files, all changes are lost.<br/>"),
QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
}
if ((result == QMessageBox::Save) || (!askToSave)) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 18:03:37 +0000