Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pre 1.1 mixing #145

Merged
merged 42 commits into from
Jan 22, 2016
Merged

Pre 1.1 mixing #145

Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
754f926
When doubleclick on treeview Item open change Dialouge
jounathaen Dec 17, 2015
f7e9151
Added usage of system icons on the buttons and improved spacing betwe…
jounathaen Dec 17, 2015
4108654
Short Fix, remove empty function
jounathaen Dec 17, 2015
f0ec3e3
Searchbar has same size as Button with icon
jounathaen Dec 17, 2015
265fe15
The spacing between the button groups is corrected for when the git b…
jounathaen Dec 17, 2015
cc7a34e
The spacing between the button groups is corrected for when the git b…
jounathaen Dec 17, 2015
9d96f8f
Added functionality for Del and Enter Key
jounathaen Dec 19, 2015
bdd72f3
Changed the Configdialouge UI
jounathaen Dec 20, 2015
7efe751
Updated german Translation
jounathaen Dec 20, 2015
bee49d7
Further Translation into german
jounathaen Dec 20, 2015
9a443bf
Some minor coding style fixes
jounathaen Dec 20, 2015
8d48a12
automatic translation update
jounathaen Dec 20, 2015
867a53f
Shows absolute Path in Password Add Dialouge, as the relative path al…
jounathaen Dec 21, 2015
f9111b3
Small cosmetic change to the last commit. Also added an idea for chec…
jounathaen Dec 21, 2015
787704c
Added a small menu to the add Button, so you can add either a passwor…
jounathaen Dec 22, 2015
3f57865
Small cleanup
jounathaen Dec 22, 2015
0c17b32
forget to add ui file to last commit
jounathaen Dec 22, 2015
e8f4dfe
Deletes Folders Properly
jounathaen Dec 22, 2015
fe5e25b
Doubleclick on Folder in Treeview does nothing
jounathaen Dec 22, 2015
0a16974
Worked on Delete Directory
jounathaen Dec 22, 2015
a6b78b2
Merge conflict Resolved
jounathaen Dec 31, 2015
08646a5
Merge branch 'jounathaen-master' into develop
Jan 12, 2016
3f40b0e
Manual merge of config and de/se translations
Jan 19, 2016
e2dd53c
Merge branch 'jounathaen-master' into develop
Jan 19, 2016
6338177
double items removed
Jan 21, 2016
9fd167e
(re) added missing button
Jan 21, 2016
feb5fc2
Merge branch 'master' into develop
Jan 21, 2016
efe15f5
Tiny cleanup in allignment
Jan 21, 2016
e809085
preferences-desktop-personal ipv stock_new-bcard
Jan 21, 2016
a54da61
updated icons
annejan Jan 21, 2016
f9add57
smaller
annejan Jan 21, 2016
8eface8
Added icons by @jsimplicio
annejan Jan 22, 2016
24e628b
Coding standards ;)
annejan Jan 22, 2016
c7b13e0
1.1 nomer
Jan 22, 2016
9b8c0a9
Works on OSX now
Jan 22, 2016
c534d17
Cleaner OSX build
Jan 22, 2016
39b1fe2
svg only needed for OSX?
Jan 22, 2016
5828d93
W00ps in mainwindow
Jan 22, 2016
18b40af
smaller
Jan 22, 2016
297ad44
Update / cleanup of icons
Jan 22, 2016
e266b4b
New (final) icons by @jsimplicio added
Jan 22, 2016
8e38fc2
Forgot to add the clear button
Jan 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Searchbar has same size as Button with icon
  • Loading branch information
@jounathaen
jounathaen committed Dec 17, 2015
commit f0ec3e30c14a404ce35b4c6939d9341936ffc931
53 changes: 42 additions & 11 deletions mainwindow.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>631</width>
<width>834</width>
<height>363</height>
</rect>
</property>
Expand Down Expand Up @@ -42,7 +42,9 @@
<string>Add</string>
</property>
<property name="icon">
<iconset theme="document-new"/>
<iconset theme="document-new">
<normaloff/>
</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
Expand All @@ -55,7 +57,9 @@
<string>Edit</string>
</property>
<property name="icon">
<iconset theme="document-properties"/>
<iconset theme="document-properties">
<normaloff/>
</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
Expand All @@ -68,7 +72,9 @@
<string>Delete</string>
</property>
<property name="icon">
<iconset theme="edit-delete"/>
<iconset theme="edit-delete">
<normaloff/>
</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
Expand Down Expand Up @@ -97,7 +103,9 @@
<string>Push</string>
</property>
<property name="icon">
<iconset theme="go-top"/>
<iconset theme="go-top">
<normaloff/>
</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
Expand All @@ -110,7 +118,9 @@
<string>Update</string>
</property>
<property name="icon">
<iconset theme="view-refresh"/>
<iconset theme="view-refresh">
<normaloff/>
</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
Expand Down Expand Up @@ -139,7 +149,9 @@
<string>Users</string>
</property>
<property name="icon">
<iconset theme="stock_new-bcard"/>
<iconset theme="stock_new-bcard">
<normaloff/>
</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
Expand All @@ -152,7 +164,9 @@
<string>Config</string>
</property>
<property name="icon">
<iconset theme="document-properties"/>
<iconset theme="document-properties">
<normaloff/>
</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
Expand Down Expand Up @@ -184,7 +198,9 @@
<string>Copy Password</string>
</property>
<property name="icon">
<iconset theme="edit-copy"/>
<iconset theme="edit-copy">
<normaloff/>
</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
Expand Down Expand Up @@ -233,15 +249,30 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="lineEdit"/>
<widget class="QLineEdit" name="lineEdit">
<property name="minimumSize">
<size>
<width>0</width>
<height>40</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="clearButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>40</height>
</size>
</property>
<property name="text">
<string>X</string>
</property>
<property name="icon">
<iconset theme="edit-clear"/>
<iconset theme="edit-clear">
<normaloff/>
</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonIconOnly</enum>
Expand Down