icon style settings added and icon settings are also used by key management

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

4 files changed, 49 insertions, 34 deletions

diff --git a/gpgwin.cpp b/gpgwin.cpp
index cf0f116..5aaa4bc 100644
--- a/gpgwin.cpp
+++ b/gpgwin.cpp
@@ -55,7 +55,6 @@ GpgWin::GpgWin()
     createStatusBar();
     createDockWindows();
     setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-//    setIconSize(QSize(24, 24));
     setCurrentFile("");
 
     mKeyList->addMenuAction(appendSelectedKeysAct);
@@ -67,7 +66,7 @@ GpgWin::GpgWin()
     QPoint pos = settings.value("window/pos", QPoint(100, 100)).toPoint();
     QSize size = settings.value("window/size", QSize(800, 450)).toSize();
 	QSize iconSize = settings.value("toolbar/iconsize", QSize(32, 32)).toSize();
-    Qt::ToolButtonStyle buttonStyle = static_cast<Qt::ToolButtonStyle>(settings.value("toolbar/style", Qt::ToolButtonTextUnderIcon).toUInt());
+    Qt::ToolButtonStyle buttonStyle = static_cast<Qt::ToolButtonStyle>(settings.value("toolbar/iconstyle", Qt::ToolButtonTextUnderIcon).toUInt());
     
     resize(size);
     move(pos);
diff --git a/keymgmt.cpp b/keymgmt.cpp
index a5e8eac..371b27d 100755
--- a/keymgmt.cpp
+++ b/keymgmt.cpp
@@ -39,8 +39,12 @@ KeyMgmt::KeyMgmt(GpgME::Context *ctx, QString iconpath)
     createActions();
     createMenus();
     createToolBars();
-    setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-    setIconSize(QSize(32, 32));
+	QSettings settings;
+	QSize iconSize = settings.value("toolbar/iconsize", QSize(32, 32)).toSize();
+    Qt::ToolButtonStyle buttonStyle = static_cast<Qt::ToolButtonStyle>(settings.value("toolbar/iconstyle", Qt::ToolButtonTextUnderIcon).toUInt());
+    
+	setIconSize(iconSize);
+	setToolButtonStyle(buttonStyle);
 
     setWindowTitle(tr("Keymanagement"));
     mKeyList->addMenuAction(deleteSelectedKeysAct);
diff --git a/settingsdialog.cpp b/settingsdialog.cpp
index a435904..7b89a65 100755
--- a/settingsdialog.cpp
+++ b/settingsdialog.cpp
@@ -44,18 +44,10 @@ SettingsDialog::SettingsDialog()
     connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
 
     groupBox1 = new QGroupBox(tr("Options"));
-    groupBox2 = new QGroupBox("Action");
+    groupBox2 = new QGroupBox(tr("Action"));
 
-	QRadioButton *iconTextButton = new QRadioButton(tr("just test"));
-	QRadioButton *iconIconsButton =new QRadioButton(tr("just icons"));
-	QRadioButton *iconAllButton = new QRadioButton(tr("text and icons"));
-	
-	QHBoxLayout *iconStyleBox = new QHBoxLayout();
-	iconStyleBox->addWidget(iconTextButton);
-	iconStyleBox->addWidget(iconIconsButton);
-	iconStyleBox->addWidget(iconAllButton);
-	group1 = new QButtonGroup();
-	
+
+	group1 = new QButtonGroup();	
 	QRadioButton *iconSizeSmall = new QRadioButton(tr("small"));
 	QRadioButton *iconSizeMedium =new QRadioButton(tr("medium"));
 	QRadioButton *iconSizeLarge = new QRadioButton(tr("large"));
@@ -63,38 +55,57 @@ SettingsDialog::SettingsDialog()
 	group1->addButton(iconSizeMedium,2);
 	group1->addButton(iconSizeLarge,3);
 
+	group2 = new QButtonGroup();
+	QRadioButton *iconTextButton = new QRadioButton(tr("just text"));
+	QRadioButton *iconIconsButton =new QRadioButton(tr("just icons"));
+	QRadioButton *iconAllButton = new QRadioButton(tr("text and icons"));
+	group2->addButton(iconTextButton,1);
+	group2->addButton(iconIconsButton,2);
+	group2->addButton(iconAllButton,3);
 
 	QHBoxLayout *iconSizeBox = new QHBoxLayout();
 	iconSizeBox->addWidget(iconSizeSmall);
 	iconSizeBox->addWidget(iconSizeMedium);
 	iconSizeBox->addWidget(iconSizeLarge);
 
-	groupBox1->setLayout(iconStyleBox);
-	groupBox2->setLayout(iconSizeBox);
-	
+	QHBoxLayout *iconStyleBox = new QHBoxLayout();
+	iconStyleBox->addWidget(iconTextButton);
+	iconStyleBox->addWidget(iconIconsButton);
+	iconStyleBox->addWidget(iconAllButton);
+
+	groupBox2->setLayout(iconStyleBox);
+	groupBox1->setLayout(iconSizeBox);
 	
-    QVBoxLayout *vbox2 = new QVBoxLayout();
-    vbox2->addWidget(groupBox1);
-	vbox2->addWidget(groupBox2);
-	vbox2->addWidget(buttonBox);
-    setLayout(vbox2);
+    QVBoxLayout *vbox = new QVBoxLayout();
+    vbox->addWidget(groupBox1);
+	vbox->addWidget(groupBox2);
+	vbox->addWidget(buttonBox);
+    setLayout(vbox);
     exec();
 }
 
 void SettingsDialog::applySettings()
 {
-	     QSettings settings;
+	 QSettings settings;
      //settings.setValue("geometry", saveGeometry());
 
-	qDebug() << group1->checkedId();
 	switch (group1->checkedId()){
-	case 1: 
-     settings.setValue("toolbar/iconsize", QSize(12, 12));
-     break;
-     
-     case 2:settings.setValue("toolbar/iconsize", QSize(24, 24));
-     break;
-     case 3:settings.setValue("toolbar/iconsize", QSize(32, 32));
-     break;
- }
+	case 1: settings.setValue("toolbar/iconsize", QSize(12, 12));
+		break;
+    case 2:settings.setValue("toolbar/iconsize", QSize(24, 24));
+		break;
+    case 3:settings.setValue("toolbar/iconsize", QSize(32, 32));
+		break;
+	}
+
+	switch (group2->checkedId()){
+	case 1: settings.setValue("toolbar/iconstyle", Qt::ToolButtonTextOnly);
+		break;
+    case 2:settings.setValue("toolbar/iconstyle", Qt::ToolButtonIconOnly);
+		break;
+    case 3:settings.setValue("toolbar/iconstyle", Qt::ToolButtonTextUnderIcon);
+		break;
+	}
+	accept();
 }
+
diff --git a/settingsdialog.h b/settingsdialog.h
index 085e161..a75cfca 100755
--- a/settingsdialog.h
+++ b/settingsdialog.h
@@ -39,4 +39,5 @@ private:
 	QGroupBox *groupBox1;
 	QGroupBox *groupBox2;
 	QButtonGroup *group1;
+	QButtonGroup *group2;
 };