diff --git a/src/forms/CollectEntropyDlg.ui b/src/forms/CollectEntropyDlg.ui
index c3d6c12..a22990b 100644
--- a/src/forms/CollectEntropyDlg.ui
+++ b/src/forms/CollectEntropyDlg.ui
@@ -35,9 +35,9 @@ Please move the mouse and/or press some keys until enought entropy for a reseed
- 90
+ 70
140
- 371
+ 391
23
@@ -67,10 +67,10 @@ Please move the mouse and/or press some keys until enought entropy for a reseed
- 10
- 140
- 61
- 51
+ 420
+ 10
+ 41
+ 41
diff --git a/src/forms/MainWindow.ui b/src/forms/MainWindow.ui
index 870af2e..82c374d 100644
--- a/src/forms/MainWindow.ui
+++ b/src/forms/MainWindow.ui
@@ -1,7 +1,5 @@
Tarek Saidi
-
-
MainWindow
@@ -120,49 +118,6 @@
29
-
-
@@ -236,9 +186,46 @@
+
-
+
@@ -352,14 +339,6 @@
Search in this group...
-
-
- true
-
-
- Show Toolbar
-
-
true
@@ -542,21 +521,16 @@
-
KeepassGroupView
QTreeWidget
../../src/lib/GroupView.h
- 0
-
KeepassEntryView
QTreeWidget
../../src/lib/EntryView.h
- 0
-
diff --git a/src/lib/WaitAnimationWidget.cpp b/src/lib/WaitAnimationWidget.cpp
index fbd78af..0c7e9d5 100644
--- a/src/lib/WaitAnimationWidget.cpp
+++ b/src/lib/WaitAnimationWidget.cpp
@@ -45,7 +45,9 @@ void WaitAnimationWidget::refreshAnimation(){
float diff=CurAngle-i*0.16666667f;
if(diff>0.5f)
diff=1.0f-diff;
- CircSizes[i]=1.0+exp(-10.0f*diff*diff);
+ if(diff<-0.5f)
+ diff=1.0f+diff;
+ CircSizes[i]=1.0+exp(-14.0f*diff*diff);
}
repaint();
}
@@ -53,8 +55,10 @@ void WaitAnimationWidget::refreshAnimation(){
void WaitAnimationWidget::paintEvent(QPaintEvent* event){
QPainter painter(this);
painter.setRenderHints(QPainter::Antialiasing,true);
+ painter.setBrush(QColor(255,255,255));
+ painter.setPen(QColor(255,255,255));
for(int i=0;i<6;i++){
- float d=CircSizes[i]*6;
+ float d=CircSizes[i]*5.0;
QRectF rect(CircPositions[i].x()-d/2,CircPositions[i].y()-d/2,d,d);
painter.drawEllipse(rect);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 680aab6..8f3b03e 100755
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -157,6 +157,7 @@ void KeepassMainWindow::setupToolbar(){
toolBar=new QToolBar(this);
addToolBar(toolBar);
toolBar->setIconSize(QSize(config.ToolbarIconSize,config.ToolbarIconSize));
+ ViewShowToolbarAction=toolBar->toggleViewAction();
toolBar->addAction(FileNewAction);
toolBar->addAction(FileOpenAction);
toolBar->addAction(FileSaveAction);
@@ -223,6 +224,8 @@ void KeepassMainWindow::setupMenus(){
EntryView->ContextMenu->addAction(EditCloneEntryAction);
EntryView->ContextMenu->addAction(EditDeleteEntryAction);
+ ViewShowToolbarAction->setText(tr("Show Toolbar"));
+ ViewMenu->insertAction(ViewShowEntryDetailsAction,ViewShowToolbarAction);
ViewShowToolbarAction->setChecked(config.Toolbar);
ViewShowEntryDetailsAction->setChecked(config.EntryDetails);
ViewHidePasswordsAction->setChecked(config.ListView_HidePasswords);
diff --git a/src/mainwindow.h b/src/mainwindow.h
index c74e00f..229f55a 100755
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -117,6 +117,7 @@ private:
QLabel* StatusBarSelection;
QToolBar* toolBar;
QSystemTrayIcon* SysTray;
+ QAction* ViewShowToolbarAction;
bool ShutingDown;
protected:
void closeEvent(QCloseEvent* event);