lot of changes

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@140 b624d157-de02-0410-bad0-e51aec6abb33

src/forms/EditEntryDlg.ui

@@ -86,6 +86,12 @@
      </item>
      <item row="0" column="1" >
       <widget class="QToolButton" name="ButtonEchoMode" >
+        <property name="iconSize" >
+          <size>
+            <width>16</width>
+            <height>16</height>
+          </size>
+        </property>
        <property name="sizePolicy" >
         <sizepolicy>
          <hsizetype>1</hsizetype>
@@ -106,9 +112,6 @@
          <height>23</height>
         </size>
        </property>
-       <property name="text" >
-        <string>...</string>
-       </property>
       </widget>
      </item>
      <item row="0" column="0" >
@@ -280,7 +283,11 @@
     </widget>
    </item>
    <item row="8" column="1" >
-    <widget class="QTextEdit" name="Edit_Comment" />
+    <widget class="QTextEdit" name="Edit_Comment" >
+     <property name="tabChangesFocus" >
+      <bool>true</bool>
+     </property>
+    </widget>
    </item>
    <item row="12" column="0" colspan="2" >
     <widget class="Line" name="line1" >
@@ -326,6 +333,12 @@
        <property name="icon" >
         <iconset/>
        </property>
+       <property name="iconSize" >
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
       </widget>
      </item>
      <item>
@@ -336,6 +349,12 @@
        <property name="icon" >
         <iconset/>
        </property>
+       <property name="iconSize" >
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
       </widget>
      </item>
      <item>
@@ -346,6 +365,12 @@
        <property name="icon" >
         <iconset/>
        </property>
+       <property name="iconSize" >
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
       </widget>
      </item>
     </layout>
@@ -364,7 +389,13 @@
      <item>
       <widget class="QToolButton" name="ButtonExpirePresets" >
        <property name="text" >
-        <string>...</string>
+        <string/>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
        </property>
        <property name="popupMode" >
         <enum>QToolButton::MenuButtonPopup</enum>
@@ -434,7 +465,32 @@
       <number>6</number>
      </property>
      <item>
-      <widget class="QComboBox" name="Combo_Group" />
+      <widget class="QComboBox" name="Combo_Group" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>3</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>100</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
      </item>
      <item>
       <widget class="QLabel" name="textLabel1" >
@@ -447,12 +503,12 @@
       </widget>
      </item>
      <item>
-      <widget class="QComboBox" name="Combo_IconPicker" />
-     </item>
-     <item>
-      <widget class="QToolButton" name="Button_CustomIcons" >
-       <property name="text" >
-        <string>></string>
+      <widget class="QToolButton" name="Button_Icons" >
+       <property name="iconSize" >
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
        </property>
       </widget>
      </item>
@@ -488,20 +544,24 @@
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <tabstops>
-  <tabstop>Combo_Group</tabstop>
-  <tabstop>Combo_IconPicker</tabstop>
   <tabstop>Edit_Title</tabstop>
   <tabstop>Edit_UserName</tabstop>
   <tabstop>Edit_URL</tabstop>
   <tabstop>Edit_Password</tabstop>
   <tabstop>Edit_Password_w</tabstop>
   <tabstop>Edit_Comment</tabstop>
+  <tabstop>DateTime_Expire</tabstop>
+  <tabstop>ButtonExpirePresets</tabstop>
+  <tabstop>CheckBox_ExpiresNever</tabstop>
   <tabstop>Edit_Attachment</tabstop>
   <tabstop>ButtonOpenAttachment</tabstop>
   <tabstop>ButtonSaveAttachment</tabstop>
   <tabstop>ButtonDeleteAttachment</tabstop>
   <tabstop>ButtonEchoMode</tabstop>
   <tabstop>ButtonGenPw</tabstop>
+  <tabstop>buttonBox</tabstop>
+  <tabstop>Combo_Group</tabstop>
+  <tabstop>Button_Icons</tabstop>
  </tabstops>
  <resources/>
  <connections/>

src/forms/MainWindow.ui

@@ -168,8 +168,8 @@
     <addaction name="EditEditGroupAction" />
     <addaction name="EditDeleteGroupAction" />
     <addaction name="separator" />
-    <addaction name="EditPasswordToClipboardAction" />
     <addaction name="EditUsernameToClipboardAction" />
+    <addaction name="EditPasswordToClipboardAction" />
     <addaction name="EditOpenUrlAction" />
     <addaction name="EditSaveAttachmentAction" />
     <addaction name="separator" />
@@ -225,11 +225,11 @@
     <property name="title" >
      <string>E&amp;xtras</string>
     </property>
-    <addaction name="ExtrasSettingsAction" />
     <addaction name="ExtrasPasswordGenAction" />
-    <addaction name="separator" />
     <addaction name="ExtrasShowExpiredEntriesAction" />
     <addaction name="ExtrasTrashCanAction" />
+    <addaction name="separator" />
+    <addaction name="ExtrasSettingsAction" />
    </widget>
    <addaction name="menuDatei" />
    <addaction name="menuBearbeiten" />
@@ -267,6 +267,11 @@
     <string>Change &amp;Master Key...</string>
    </property>
   </action>
+  <action name="FileUnLockWorkspaceAction" >
+    <property name="text" >
+      <string>&amp;Lock Workspace</string>
+    </property>
+  </action>
   <action name="FileExitAction" >
    <property name="text" >
     <string>E&amp;xit</string>
@@ -329,12 +334,12 @@
   </action>
   <action name="EditSearchAction" >
    <property name="text" >
-    <string>Search In Database...</string>
+    <string>Search in Database...</string>
    </property>
   </action>
   <action name="EditGroupSearchAction" >
    <property name="text" >
-    <string>Search in this group...</string>
+    <string>Search in this Group...</string>
    </property>
   </action>
   <action name="ViewShowEntryDetailsAction" >
@@ -533,23 +538,12 @@
    <property name="text" >
     <string>Show Expired Entries...</string>
    </property>
-   <property name="iconText" >
-    <string>Show Expired Entries...</string>
-   </property>
-   <property name="toolTip" >
-    <string>Show Expired Entries</string>
-   </property>
   </action>
   <action name="ExtrasTrashCanAction" >
    <property name="text" >
     <string>Recycle Bin...</string>
    </property>
   </action>
-  <action name="FileUnLockWorkspaceAction" >
-   <property name="text" >
-    <string>Lock Workspace</string>
-   </property>
-  </action>
  </widget>
  <customwidgets>
   <customwidget>