change undo/redo menu-order, show filename on tab when opening file from command line

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@425 34ebc366-c3a9-4b3c-9f84-69acf7962910

3 files changed, 5 insertions, 1 deletions

diff --git a/TODO b/TODO
index b4bdaa7..a8403b7 100644
--- a/TODO
+++ b/TODO
@@ -18,6 +18,7 @@ Release 0.2.6
 	- Timer to remember password for x minutes?
 attachments:
 	- context menu for files left in attachment dir-icon: clean attachments-dir
+	- settings option "check attachment-dir all 10s and warn user"
 	- remind user on closing if files left in attachments-dir
 	- attachments dir as default option for "save"
 	- clean attachments when:
@@ -38,6 +39,7 @@ attachments:
 
 Release 0.3
 - PGP-MIME, find and show inline encrypted files
+	- attachments-widget should be inlined in editor-tabs
 - Change Keytable sorting: private keys should always be on top (partially solving "encrypt to self")
 - check pointer usage (const/references)
 - check class / includes
diff --git a/gpgwin.cpp b/gpgwin.cpp
index 8ba9675..68251de 100644
--- a/gpgwin.cpp
+++ b/gpgwin.cpp
@@ -320,8 +320,8 @@ void GpgWin::createMenus()
     fileMenu->addAction(quitAct);
 
     editMenu = menuBar()->addMenu(tr("&Edit"));
-    editMenu->addAction(redoAct);
     editMenu->addAction(undoAct);
+    editMenu->addAction(redoAct);
     editMenu->addSeparator();
     editMenu->addAction(copyAct);
     editMenu->addAction(cutAct);
diff --git a/textedit.cpp b/textedit.cpp
index 16cbd84..bc1caf8 100644
--- a/textedit.cpp
+++ b/textedit.cpp
@@ -392,6 +392,8 @@ void TextEdit::loadFile(const QString &fileName)
     curTextPage()->setPlainText(in.readAll());
     QApplication::restoreOverrideCursor();
     curPage()->setFilePath(fileName);
+    tabWidget->setTabText(tabWidget->currentIndex(), strippedName(fileName));
+
    // statusBar()->showMessage(tr("File loaded"), 2000);
 }