merged sniperbeamer's patches

fixed bug #1828965


git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@149 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
tarek_saidi
2008-02-15 11:04:38 +00:00
parent 5a210a8e30
commit 01ac6b3544
87 changed files with 7154 additions and 8429 deletions

View File

@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>419</width>
<height>268</height>
<height>305</height>
</rect>
</property>
<property name="sizePolicy" >
@@ -18,13 +18,13 @@
<property name="minimumSize" >
<size>
<width>419</width>
<height>268</height>
<height>305</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>419</width>
<height>268</height>
<height>309</height>
</size>
</property>
<property name="windowTitle" >
@@ -65,7 +65,7 @@
<item>
<widget class="QTabWidget" name="tabWidget" >
<property name="currentIndex" >
<number>0</number>
<number>3</number>
</property>
<widget class="QWidget" name="tab" >
<attribute name="title" >
@@ -167,9 +167,6 @@
</item>
<item>
<layout class="QVBoxLayout" >
<property name="spacing" >
<number>12</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
@@ -183,7 +180,7 @@
<number>0</number>
</property>
<item>
<widget class="LinkLabel" name="label_2" >
<widget class="LinkLabel" name="label_5" >
<property name="text" >
<string>http://keepassx.sourceforge.net</string>
</property>
@@ -303,6 +300,13 @@ General Public License (GPL) version 2.</string>
</widget>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="ButtonBox" >
<property name="standardButtons" >
<set>QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />

81
src/forms/AutoTypeDlg.ui Normal file
View File

@@ -0,0 +1,81 @@
<ui version="4.0" >
<class>AutoTypeDlg</class>
<widget class="QWidget" name="AutoTypeDlg" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>502</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle" >
<string>KeePassX - Auto-Type</string>
</property>
<layout class="QVBoxLayout" >
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
<width>481</width>
<height>50</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label" >
<property name="text" >
<string>Click on an entry to auto-type it.</string>
</property>
</widget>
</item>
<item>
<widget class="QTreeWidget" name="entryList" >
<property name="cursor" stdset="0" >
<cursorShape>PointingHandCursor</cursorShape>
</property>
<property name="rootIsDecorated" >
<bool>false</bool>
</property>
<property name="itemsExpandable" >
<bool>false</bool>
</property>
<property name="allColumnsShowFocus" >
<bool>true</bool>
</property>
<column>
<property name="text" >
<string>Group</string>
</property>
</column>
<column>
<property name="text" >
<string>Title</string>
</property>
</column>
<column>
<property name="text" >
<string>Username</string>
</property>
</column>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="ButtonBox" >
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

View File

@@ -13,12 +13,21 @@
<string>Dialog</string>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<item>
<widget class="QTabWidget" name="TabWidget" >
<property name="currentIndex" >
@@ -29,20 +38,38 @@
<string>Rich Text Editor</string>
</attribute>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QToolButton" name="BtnBold" >
<property name="toolTip" >
@@ -291,12 +318,21 @@
<string>HTML</string>
</attribute>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<item>
<widget class="QTextEdit" name="HtmlEdit" >
<property name="acceptRichText" >
@@ -309,57 +345,11 @@
</widget>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
<widget class="QDialogButtonBox" name="ButtonBox" >
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok|QDialogButtonBox::RestoreDefaults</set>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QPushButton" name="ButtonRestore" >
<property name="text" >
<string>Restore Default</string>
</property>
<property name="autoDefault" >
<bool>false</bool>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="ButtonSave" >
<property name="text" >
<string>Save</string>
</property>
<property name="autoDefault" >
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="ButtonCancel" >
<property name="text" >
<string>Cancel</string>
</property>
<property name="autoDefault" >
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>

View File

@@ -1,139 +1,113 @@
<ui version="4.0" stdsetdef="1" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>dbsettingdlg_base</class>
<widget class="QDialog" name="DatabaseSettingsDlg" >
<ui version="4.0" >
<class>DatabaseSettingsDlg</class>
<widget class="QDialog" name="DatabaseSettingsDlg" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>440</width>
<height>213</height>
</rect>
</property>
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
<width>440</width>
<height>213</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>440</width>
<height>213</height>
</size>
</property>
<property name="windowTitle" >
<string>Database Settings</string>
</property>
<widget class="QGroupBox" name="groupBox1" >
<property name="geometry" >
<rect>
<x>10</x>
<y>60</y>
<width>420</width>
<height>110</height>
</rect>
</property>
<property name="title" >
<string>Encryption</string>
</property>
<widget class="QLabel" name="textLabel2" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>440</width>
<height>213</height>
</rect>
<rect>
<x>10</x>
<y>30</y>
<width>90</width>
<height>20</height>
</rect>
</property>
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<property name="text" >
<string>Algorithm:</string>
</property>
<property name="minimumSize" >
<size>
<width>440</width>
<height>213</height>
</size>
</widget>
<widget class="QComboBox" name="ComboAlgo" >
<property name="geometry" >
<rect>
<x>109</x>
<y>30</y>
<width>300</width>
<height>21</height>
</rect>
</property>
<property name="maximumSize" >
<size>
<width>440</width>
<height>213</height>
</size>
</widget>
<widget class="QLineEdit" name="EditRounds" >
<property name="geometry" >
<rect>
<x>180</x>
<y>70</y>
<width>230</width>
<height>21</height>
</rect>
</property>
<property name="windowTitle" >
<string>Database Settings</string>
</widget>
<widget class="QLabel" name="textLabel3" >
<property name="geometry" >
<rect>
<x>10</x>
<y>70</y>
<width>150</width>
<height>20</height>
</rect>
</property>
<widget class="QGroupBox" name="groupBox1" >
<property name="geometry" >
<rect>
<x>10</x>
<y>60</y>
<width>420</width>
<height>110</height>
</rect>
</property>
<property name="title" >
<string>Encryption</string>
</property>
<widget class="QLabel" name="textLabel2" >
<property name="geometry" >
<rect>
<x>10</x>
<y>30</y>
<width>90</width>
<height>20</height>
</rect>
</property>
<property name="text" >
<string>Algorithm:</string>
</property>
</widget>
<widget class="QComboBox" name="ComboAlgo" >
<property name="geometry" >
<rect>
<x>109</x>
<y>30</y>
<width>300</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QLineEdit" name="EditRounds" >
<property name="geometry" >
<rect>
<x>180</x>
<y>70</y>
<width>230</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="textLabel3" >
<property name="geometry" >
<rect>
<x>10</x>
<y>70</y>
<width>150</width>
<height>20</height>
</rect>
</property>
<property name="text" >
<string>Encryption Rounds:</string>
</property>
</widget>
</widget>
<widget class="QPushButton" name="ButtonOK" >
<property name="geometry" >
<rect>
<x>210</x>
<y>180</y>
<width>102</width>
<height>23</height>
</rect>
</property>
<property name="text" >
<string>O&amp;K</string>
</property>
<property name="shortcut" >
<string>Ctrl+K</string>
</property>
</widget>
<widget class="QPushButton" name="ButtonCancel" >
<property name="geometry" >
<rect>
<x>320</x>
<y>180</y>
<width>102</width>
<height>23</height>
</rect>
</property>
<property name="text" >
<string>&amp;Cancel</string>
</property>
<property name="shortcut" >
<string>Ctrl+C</string>
</property>
</widget>
<property name="text" >
<string>Encryption Rounds:</string>
</property>
</widget>
</widget>
<layoutdefault spacing="6" margin="11" />
<pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>ComboAlgo</tabstop>
<tabstop>EditRounds</tabstop>
<tabstop>ButtonOK</tabstop>
<tabstop>ButtonCancel</tabstop>
<tabstop>pushButton1</tabstop>
</tabstops>
<widget class="QDialogButtonBox" name="ButtonBox" >
<property name="geometry" >
<rect>
<x>12</x>
<y>180</y>
<width>411</width>
<height>27</height>
</rect>
</property>
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
</property>
</widget>
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
<tabstop>ComboAlgo</tabstop>
<tabstop>EditRounds</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

View File

@@ -1,7 +1,5 @@
<ui version="4.0" >
<author>Tarek Saidi</author>
<comment></comment>
<exportmacro></exportmacro>
<class>EditGroupDialog</class>
<widget class="QDialog" name="EditGroupDialog" >
<property name="geometry" >
@@ -13,9 +11,7 @@
</rect>
</property>
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -36,18 +32,39 @@
<string>Group Properties</string>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<item>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="1" column="0" >
@@ -106,47 +123,11 @@
</widget>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
<widget class="QDialogButtonBox" name="ButtonBox" >
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>121</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="ButtonOK" >
<property name="text" >
<string>O&amp;K</string>
</property>
<property name="shortcut" >
<string>Alt+K</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="ButtonCancel" >
<property name="text" >
<string>&amp;Cancel</string>
</property>
<property name="shortcut" >
<string>Alt+C</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
@@ -155,8 +136,6 @@
<tabstops>
<tabstop>EditTitle</tabstop>
<tabstop>ComboIconPicker</tabstop>
<tabstop>ButtonOK</tabstop>
<tabstop>ButtonCancel</tabstop>
</tabstops>
<resources/>
<connections/>

View File

@@ -34,40 +34,45 @@
<number>9</number>
</property>
<item>
<widget class="QSplitter" name="VSplitter" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
<widget class="QSplitter" name="VSplitter" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<widget class="KeepassGroupView" name="GroupView" >
<property name="enabled" >
<bool>false</bool>
</property>
<widget class="KeepassGroupView" name="GroupView" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>30</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="acceptDrops" >
<bool>true</bool>
</property>
<property name="showDropIndicator" stdset="0" >
<bool>true</bool>
</property>
<property name="dragEnabled" >
<bool>false</bool>
</property>
</widget>
<widget class="QSplitter" name="HSplitter" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>70</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="orientation" >
<enum>Qt::Vertical</enum>
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>30</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="acceptDrops" >
<bool>true</bool>
</property>
<property name="showDropIndicator" stdset="0" >
<bool>true</bool>
</property>
<property name="dragEnabled" >
<bool>false</bool>
</property>
<column>
<property name="text" >
<string>Groups</string>
</property>
</column>
</widget>
<widget class="QSplitter" name="HSplitter" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>70</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<widget class="KeepassEntryView" name="EntryView" >
<property name="enabled" >
<bool>false</bool>
@@ -84,32 +89,35 @@
<property name="rootIsDecorated" >
<bool>false</bool>
</property>
<property name="sortingEnabled" >
<bool>true</bool>
</property>
</widget>
<widget class="QTextBrowser" name="DetailView" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>30</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="readOnly" >
<bool>true</bool>
</property>
<property name="openLinks" >
<bool>false</bool>
</property>
</widget>
<widget class="QTextBrowser" name="DetailView" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>30</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="readOnly" >
<bool>true</bool>
</property>
<property name="openLinks" >
<bool>false</bool>
</property>
</widget>
</widget>
</widget>
</item>
</layout>
</widget>
@@ -144,14 +152,14 @@
<string>&amp;Import from...</string>
</property>
</widget>
<widget class="QMenu" name="menuBookmarks" >
<widget class="QMenu" name="menuBookmarks" >
<property name="title" >
<string>Bookmarks</string>
</property>
</widget>
<addaction name="FileNewAction" />
<addaction name="FileOpenAction" />
<addaction name="menuBookmarks" />
<addaction name="menuBookmarks" />
<addaction name="FileCloseAction" />
<addaction name="separator" />
<addaction name="FileSaveAction" />
@@ -279,9 +287,9 @@
</property>
</action>
<action name="FileUnLockWorkspaceAction" >
<property name="text" >
<string>&amp;Lock Workspace</string>
</property>
<property name="text" >
<string>&amp;Lock Workspace</string>
</property>
</action>
<action name="FileExitAction" >
<property name="text" >
@@ -479,6 +487,9 @@
<property name="text" >
<string>&amp;KeePassX Handbook...</string>
</property>
<property name="visible" >
<bool>false</bool>
</property>
</action>
<action name="HideSearchResultsAction" >
<property name="text" >
@@ -554,6 +565,9 @@
<property name="text" >
<string>Recycle Bin...</string>
</property>
<property name="visible" >
<bool>false</bool>
</property>
</action>
<action name="AddBookmarkAction" >
<property name="text" >

View File

@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>578</width>
<height>275</height>
<height>280</height>
</rect>
</property>
<property name="sizePolicy" >
@@ -18,13 +18,13 @@
<property name="minimumSize" >
<size>
<width>578</width>
<height>275</height>
<height>280</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>578</width>
<height>275</height>
<height>280</height>
</size>
</property>
<property name="windowTitle" >
@@ -306,57 +306,11 @@
</widget>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="spacing" >
<number>6</number>
<widget class="QDialogButtonBox" name="ButtonBox" >
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>351</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="ButtonOK" >
<property name="text" >
<string>OK</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="ButtonCancel" >
<property name="text" >
<string>Cancel</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="ButtonExit" >
<property name="text" >
<string>Exit</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
@@ -367,9 +321,6 @@
<tabstop>Combo_Dirs</tabstop>
<tabstop>ButtonBrowse</tabstop>
<tabstop>CheckBox_Both</tabstop>
<tabstop>ButtonOK</tabstop>
<tabstop>ButtonCancel</tabstop>
<tabstop>ButtonExit</tabstop>
<tabstop>Button_Bookmarks</tabstop>
<tabstop>ButtonChangeEchoMode</tabstop>
</tabstops>

View File

@@ -10,9 +10,7 @@
</rect>
</property>
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -33,12 +31,21 @@
<string>Search...</string>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<item>
<spacer>
<property name="orientation" >
@@ -57,10 +64,22 @@
</item>
<item>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>4</number>
</property>
<property name="verticalSpacing" >
<number>4</number>
</property>
<item row="1" column="0" >
@@ -85,10 +104,22 @@
<string>Include:</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>9</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="1" >
@@ -156,10 +187,19 @@
</item>
<item row="1" column="1" >
<layout class="QVBoxLayout" >
<property name="margin" >
<property name="spacing" >
<number>0</number>
</property>
<property name="spacing" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
@@ -217,52 +257,11 @@
</spacer>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
<widget class="QDialogButtonBox" name="ButtonBox" >
<property name="standardButtons" >
<set>QDialogButtonBox::Close</set>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="Button_Search" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>Search</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="Button_Close" >
<property name="text" >
<string>Clo&amp;se</string>
</property>
<property name="shortcut" >
<string>Alt+S</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
@@ -277,8 +276,6 @@
<tabstop>checkBox_Comment</tabstop>
<tabstop>checkBox_URL</tabstop>
<tabstop>checkBox_Attachment</tabstop>
<tabstop>Button_Search</tabstop>
<tabstop>Button_Close</tabstop>
</tabstops>
<resources/>
<connections/>

View File

@@ -1,7 +1,4 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>SelectIconDlg</class>
<widget class="QDialog" name="SelectIconDlg" >
<property name="geometry" >
@@ -9,13 +6,11 @@
<x>0</x>
<y>0</y>
<width>478</width>
<height>280</height>
<height>284</height>
</rect>
</property>
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>5</vsizetype>
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -23,124 +18,47 @@
<property name="windowTitle" >
<string>Icon Selection</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
<layout class="QVBoxLayout" >
<item>
<widget class="QListWidget" name="List" >
<property name="iconSize" >
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="spacing" >
<number>6</number>
<property name="movement" >
<enum>QListView::Static</enum>
</property>
<item row="1" column="0" >
<widget class="QPushButton" name="Button_AddIcon" >
<property name="text" >
<string>Add Custom Icon...</string>
</property>
</widget>
</item>
<item row="1" column="2" >
<widget class="QPushButton" name="Button_PickIcon" >
<property name="text" >
<string>Pick</string>
</property>
</widget>
</item>
<item row="1" column="3" >
<widget class="QPushButton" name="Button_Cancel" >
<property name="text" >
<string>Cancel</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>131</width>
<height>31</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0" colspan="4" >
<widget class="QListWidget" name="List" >
<property name="iconSize" >
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="movement" >
<enum>QListView::Static</enum>
</property>
<property name="flow" >
<enum>QListView::LeftToRight</enum>
</property>
<property name="isWrapping" stdset="0" >
<bool>true</bool>
</property>
<property name="resizeMode" >
<enum>QListView::Fixed</enum>
</property>
<property name="gridSize" >
<size>
<width>32</width>
<height>44</height>
</size>
</property>
<property name="viewMode" >
<enum>QListView::IconMode</enum>
</property>
</widget>
</item>
</layout>
<property name="flow" >
<enum>QListView::LeftToRight</enum>
</property>
<property name="isWrapping" stdset="0" >
<bool>true</bool>
</property>
<property name="resizeMode" >
<enum>QListView::Fixed</enum>
</property>
<property name="gridSize" >
<size>
<width>32</width>
<height>44</height>
</size>
</property>
<property name="viewMode" >
<enum>QListView::IconMode</enum>
</property>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="ButtonBox" >
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel</set>
</property>
</widget>
</item>
</layout>
</widget>
<pixmapfunction></pixmapfunction>
<resources/>
<connections>
<connection>
<sender>Button_PickIcon</sender>
<signal>clicked()</signal>
<receiver>SelectIconDlg</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>278</x>
<y>253</y>
</hint>
<hint type="destinationlabel" >
<x>96</x>
<y>254</y>
</hint>
</hints>
</connection>
<connection>
<sender>Button_Cancel</sender>
<signal>clicked()</signal>
<receiver>SelectIconDlg</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<x>369</x>
<y>253</y>
</hint>
<hint type="destinationlabel" >
<x>179</x>
<y>282</y>
</hint>
</hints>
</connection>
</connections>
<connections/>
</ui>

View File

@@ -6,19 +6,25 @@
<x>0</x>
<y>0</y>
<width>571</width>
<height>420</height>
<height>440</height>
</rect>
</property>
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
<width>571</width>
<height>420</height>
<height>440</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>571</width>
<height>420</height>
<height>441</height>
</size>
</property>
<property name="windowTitle" >
@@ -60,7 +66,7 @@
</spacer>
</item>
<item>
<widget class="QTabWidget" name="tabWidget4" >
<widget class="QTabWidget" name="tabWidgetSettings" >
<property name="tabPosition" >
<enum>QTabWidget::North</enum>
</property>
@@ -70,7 +76,7 @@
<property name="currentIndex" >
<number>0</number>
</property>
<widget class="QWidget" name="tab" >
<widget class="QWidget" name="TabGeneral" >
<property name="whatsThis" >
<string>The integration plugins provide features like usage of the native file dialogs and message boxes of the particular desktop environments.</string>
</property>
@@ -79,36 +85,74 @@
</attribute>
<layout class="QVBoxLayout" >
<item>
<widget class="QCheckBox" name="checkBox_ShowSysTrayIcon" >
<widget class="QCheckBox" name="CheckBox_ShowSysTrayIcon" >
<property name="text" >
<string>Show system tray icon</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_MinimizeToTray" >
<property name="text" >
<string>Minimize to tray when clicking the main window's close button</string>
</property>
</widget>
<layout class="QHBoxLayout" >
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
<width>25</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="CheckBox_MinimizeTray" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="text" >
<string>Minimize to tray instead of taskbar</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
<width>25</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="CheckBox_CloseToTray" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="text" >
<string>Minimize to tray when clicking the main window's close button</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" >
<item>
<widget class="QCheckBox" name="CheckBox_OpenLast" >
<property name="text" >
@@ -120,40 +164,94 @@
</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>10</width>
<height>20</height>
</size>
</property>
</spacer>
<layout class="QHBoxLayout" >
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
<width>25</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="CheckBox_RememberLastKey" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="text" >
<string>Remember last key type and location</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="CheckBox_RememberLastKey" >
<property name="text" >
<string>Remember last key type and location</string>
</property>
</widget>
<layout class="QHBoxLayout" >
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
<width>25</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="CheckBox_StartMinimized" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="text" >
<string>Start minimized</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
<layout class="QHBoxLayout" >
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
<width>25</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="CheckBox_StartLocked" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="text" >
<string>Start locked</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
@@ -226,88 +324,6 @@
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Group tree at start-up:</string>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QRadioButton" name="Radio_GroupTreeRestore" >
<property name="text" >
<string>Restore last state</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QRadioButton" name="Radio_GroupTreeExpand" >
<property name="text" >
<string>Expand all items</string>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QRadioButton" name="Radio_GroupTreeDoNothing" >
<property name="text" >
<string>Do not expand any item</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer>
<property name="orientation" >
@@ -626,13 +642,6 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox" >
<property name="text" >
<string>Unified Title and Toolbar</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="spacing" >
@@ -672,6 +681,73 @@
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" >
<item>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Group tree at start-up:</string>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QRadioButton" name="Radio_GroupTreeRestore" >
<property name="text" >
<string>Restore last state</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QRadioButton" name="Radio_GroupTreeExpand" >
<property name="text" >
<string>Expand all items</string>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QRadioButton" name="Radio_GroupTreeDoNothing" >
<property name="text" >
<string>Do not expand any item</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer>
<property name="orientation" >
@@ -687,7 +763,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_3" >
<widget class="QWidget" name="tabSecurity" >
<attribute name="title" >
<string>Security</string>
</attribute>
@@ -815,6 +891,13 @@
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="CheckBox_LockMinimize" >
<property name="text" >
<string>Lock workspace when minimizing the main window</string>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
@@ -830,7 +913,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="Seite" >
<widget class="QWidget" name="tabFeatures" >
<attribute name="title" >
<string>Features</string>
</attribute>
@@ -867,7 +950,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2" >
<widget class="QWidget" name="tabIntegration" >
<attribute name="title" >
<string>Desktop Integration</string>
</attribute>
@@ -1015,7 +1098,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="tab" >
<widget class="QWidget" name="TabAdvanced" >
<attribute name="title" >
<string>Advanced</string>
</attribute>
@@ -1036,7 +1119,7 @@
<number>9</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox_3" >
<widget class="QGroupBox" name="Box_AutoType" >
<property name="title" >
<string>Auto-Type Fine Tuning</string>
</property>
@@ -1122,52 +1205,30 @@
</widget>
</item>
<item>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>0</number>
<widget class="QGroupBox" name="Box_BrowserCmd" >
<property name="title" >
<string>Custom Browser Command</string>
</property>
<property name="topMargin" >
<number>0</number>
<property name="checkable" >
<bool>true</bool>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="1" column="2" >
<widget class="QPushButton" name="Button_MountDirBrowse" >
<property name="minimumSize" >
<size>
<width>0</width>
<height>23</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>16777215</width>
<height>23</height>
</size>
</property>
<property name="text" >
<string>Browse...</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QLineEdit" name="Edit_MountDir" >
<property name="whatsThis" >
<string>The directory where storage devices like CDs and memory sticks are normally mounted.</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<layout class="QHBoxLayout" >
<item>
<widget class="QLineEdit" name="Edit_BrowserCmd" />
</item>
<item>
<widget class="QPushButton" name="Button_BrowserCmdBrowse" >
<property name="text" >
<string>Browse</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>Media Root:</string>
@@ -1177,45 +1238,17 @@
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>Browser Command:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<item>
<widget class="QLineEdit" name="Edit_MountDir" >
<property name="whatsThis" >
<string>The directory where storage devices like CDs and memory sticks are normally mounted.</string>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QLineEdit" name="Edit_BrowserCmd" />
</item>
<item row="1" column="3" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Maximum</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="2" colspan="2" >
<widget class="QCheckBox" name="CheckBox_BrowserDefault" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<widget class="QPushButton" name="Button_MountDirBrowse" >
<property name="text" >
<string>System Default</string>
<string>Browse...</string>
</property>
</widget>
</item>
@@ -1231,6 +1264,44 @@
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="Label_GlobalShortcut" >
<property name="text" >
<string>Global Auto-Type Shortcut:</string>
</property>
</widget>
</item>
<item>
<widget class="ShortcutWidget" name="Edit_GlobalShortcut" >
<property name="readOnly" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="CheckBox_EntryTitlesMatch" >
<property name="text" >
<string>Use entry titles to match the window for Global Auto-Type</string>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
@@ -1261,11 +1332,48 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<customwidgets>
<customwidget>
<class>ShortcutWidget</class>
<extends>QLineEdit</extends>
<header>lib/ShortcutWidget.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>tabWidget4</tabstop>
<tabstop>tabWidgetSettings</tabstop>
<tabstop>CheckBox_ShowSysTrayIcon</tabstop>
<tabstop>CheckBox_MinimizeTray</tabstop>
<tabstop>CheckBox_CloseToTray</tabstop>
<tabstop>CheckBox_OpenLast</tabstop>
<tabstop>CheckBox_RememberLastKey</tabstop>
<tabstop>CheckBox_StartMinimized</tabstop>
<tabstop>CheckBox_StartLocked</tabstop>
<tabstop>checkBox_SaveFileDlgHistory</tabstop>
<tabstop>Button_ClearFileDlgHistory</tabstop>
<tabstop>checkBox_AskBeforeDelete</tabstop>
<tabstop>ButtonColor1</tabstop>
<tabstop>ButtonTextColor</tabstop>
<tabstop>ButtonColor2</tabstop>
<tabstop>ButtonTextColor</tabstop>
<tabstop>CheckBox_AlternatingRowColors</tabstop>
<tabstop>Button_CustomizeEntryDetails</tabstop>
<tabstop>Radio_GroupTreeRestore</tabstop>
<tabstop>Radio_GroupTreeExpand</tabstop>
<tabstop>Radio_GroupTreeDoNothing</tabstop>
<tabstop>CheckBox_ShowPasswords</tabstop>
<tabstop>CheckBox_ShowPasswords_PasswordDlg</tabstop>
<tabstop>SpinBox_ClipboardTime</tabstop>
<tabstop>CheckBox_LockMinimize</tabstop>
<tabstop>CheckBox_FeatureBookmarks</tabstop>
<tabstop>Radio_IntPlugin_None</tabstop>
<tabstop>Radio_IntPlugin_Gnome</tabstop>
<tabstop>Radio_IntPlugin_Kde</tabstop>
<tabstop>IntPlugin_Button_Config</tabstop>
<tabstop>SpinBox_AutoTypePreGap</tabstop>
<tabstop>SpinBox_AutoTypeKeyStrokeDelay</tabstop>
<tabstop>CheckBox_SaveRelativePaths</tabstop>
<tabstop>Edit_GlobalShortcut</tabstop>
<tabstop>CheckBox_EntryTitlesMatch</tabstop>
<tabstop>DialogButtons</tabstop>
</tabstops>
<resources/>
<connections/>