aslo

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

2 files changed, 18 insertions, 7 deletions

diff --git a/gpgwin.cpp b/gpgwin.cpp
index 4087050..ecf0c32 100644
--- a/gpgwin.cpp
+++ b/gpgwin.cpp
@@ -54,17 +54,22 @@ GpgWin::GpgWin()
     setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
     setIconSize(QSize(32, 32));
     setCurrentFile("");
+
+    mKeyList->addMenuAction(appendSelectedKeysAct);
    
     // Restore window size & location
     // TODO: is this a good idea for a portable app? screen size & resolution may vary
     QSettings settings;
-    QPoint pos = settings.value("pos", QPoint(100, 100)).toPoint();
-    QSize size = settings.value("size", QSize(800, 450)).toSize();
+    //restoreGeometry(settings.value("window/geometry").toByteArray());
+    QPoint pos = settings.value("window/pos", QPoint(100, 100)).toPoint();
+    QSize size = settings.value("window/size", QSize(800, 450)).toSize();
+
     resize(size);
     move(pos);
 
-    //mKeyList->addMenuAction(deleteSelectedKeysAct);
-    mKeyList->addMenuAction(appendSelectedKeysAct);
+    // state sets pos & size of dock-widgets
+    restoreState(settings.value("window/windowState").toByteArray());
+
 }
 
 void GpgWin::createActions()
@@ -271,8 +276,15 @@ void GpgWin::closeEvent(QCloseEvent *event)
     }
     
      QSettings settings;
-     settings.setValue("pos", pos());
-     settings.setValue("size", size());    
+
+     
+     //settings.setValue("geometry", saveGeometry());
+     settings.setValue("window/windowState", saveState());
+     settings.setValue("window/pos", pos());
+     settings.setValue("window/size", size());
+     //settings.setValue("windows/size", isFullscreen());
+     
+     QMainWindow::closeEvent(event);
 }
 
 void GpgWin::open()
diff --git a/main.cpp b/main.cpp
index 083955b..e9c4ca8 100644
--- a/main.cpp
+++ b/main.cpp
@@ -38,7 +38,6 @@ int main(int argc, char *argv[])
     
     // QSettings uses org-name for automatically setting path... 
     app.setOrganizationName("conf");
-    //app.setOrganizationDomain("gpg4usb.cpunk.de"); // mac uses this?
     // specify default path & format for QSettings
     QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, qApp->applicationDirPath());
     QSettings::setDefaultFormat(QSettings::IniFormat);