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.

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

merged 42 commits into from Jan 22, 2016

Conversation

@annejan
Copy link
Member

@annejan annejan commented Jan 22, 2016

This is mostly a mergein of #124 by @jounathaen and assets by @jsimplicio

Also trying out if this is a good strategy of opening a pull-request early.

jounathaen and others added 30 commits Dec 17, 2015
…uttons are hidden

Added delete and enter Key functionality
…king for PGP key before password creation, but this doesn't work so far
Message when creating a Folder shows absolute path
annejan added 4 commits Jan 22, 2016
@annejan
Copy link
Member Author

@annejan annejan commented Jan 22, 2016

screen shot 2016-01-22 at 16 18 26
Some fallback icons as PoC
screen shot 2016-01-22 at 17 51 58
Almost as sexy as the native ones 😄

@annejan
Copy link
Member Author

@annejan annejan commented Jan 22, 2016

KDE screenshot_20160122_004108
Gnome
screen shot 2016-01-22 at 18 09 39

@jsimplicio
Copy link

@jsimplicio jsimplicio commented Jan 22, 2016

Here are the icons without that button background. I think they'll look best now without that background in actually all interfaces. Let me know what you think. I also changed the update icon because an arrow down doesn't really make much sense for update?

qtpass-icons-nobg.zip

@annejan
Copy link
Member Author

@annejan annejan commented Jan 22, 2016

Technically it's git push and git pull the update is still from the first (read only) version.

Thanks, will have some time to play with then after diner I hope 😄

@jsimplicio
Copy link

@jsimplicio jsimplicio commented Jan 22, 2016

@annejan Oh man so it's pull and push I had no idea. I see. Let me fix it and turn it back to a down arrow then, it makes more sense.

Here is the final set with that pull fixed.

qtpass-icons-final.zip

annejan added 2 commits Jan 22, 2016
annejan added a commit that referenced this pull request Jan 22, 2016
1.1 is now in master
@annejan annejan merged commit 0f0f183 into master Jan 22, 2016
5 checks passed
5 checks passed
continuous-integration/appveyor/branch AppVeyor build succeeded
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/codeship Build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@jsimplicio
Copy link

@jsimplicio jsimplicio commented Jan 22, 2016

Just want to recommend using https://github.com/svg/svgo in the future for the icons I've made. If you read this tools description it removes useless and redundant excess info that is exported on the svg when you export it from a program. I used Sketch and it added a lot of fluff to the files.

@annejan
Copy link
Member Author

@annejan annejan commented Jan 22, 2016

Done 😁

@jsimplicio
Copy link

@jsimplicio jsimplicio commented Jan 22, 2016

👍

@jounathaen
Copy link
Member

@jounathaen jounathaen commented Jan 22, 2016

Thanks for merging! Also nice Icons!

@annejan
Copy link
Member Author

@annejan annejan commented Jan 22, 2016

Thank you for the awesome effort!
And finding out how the (standard) theme icons work.

I really love how it looks on KDE Plasma.
On Gnome it looks gnomey and fun.
Still want to check out how it looks on other themes and WMs.

And the fallback icons work well on Win and Mac indeed 😄

@jounathaen
Copy link
Member

@jounathaen jounathaen commented Jan 22, 2016

I did a clean pull, but for some reason, the Icons don't work for me. Instead the folder Icons in the treeview have changed to some non system Theme (I use cinnamon). I'll check if this is a problem of my setup...
Now:
screenshot from 2016-01-22 23 26 23

Before:
screenshot from 2016-01-22 23 30 07

(Maybe this is all a problem of my Linux Installation)
BTW: When I do a make uninstall, it tries to remove my /usr/bin/ which I really want to keep :-D

@annejan
Copy link
Member Author

@annejan annejan commented Jan 22, 2016

Wow!!

I'll have a quick look on some more systems when I get home!!
Only tested on Gnome and Plasma on Fedora today.

Those folder icons look like the KDE4 default theme.
It should show your system icons where possible.
There is definately something wrong with the theme handling it seems.

Should currently:

  • Take the freedesktop standard theme.
  • Fallback to "our" icons.
@jounathaen
Copy link
Member

@jounathaen jounathaen commented Jan 22, 2016

Curiously, in the Qt form designer, the Icons get shown correcty...

@annejan
Copy link
Member Author

@annejan annejan commented Jan 22, 2016

I did read something about setting theme from environment a while back.

Interesting development 😉

@jounathaen
Copy link
Member

@jounathaen jounathaen commented Jan 22, 2016

Maybe it is a solution to set the Icons in the mainwindow.cpp and not in the mainwindow.ui ...

@annejan
Copy link
Member Author

@annejan annejan commented Jan 23, 2016

Works on everything for me . .
Arch, Fedora, Ubuntu . .
145351170081
Even nice dark themes 🌘 on both Gnome and KDE

@jounathaen
Copy link
Member

@jounathaen jounathaen commented Jan 23, 2016

Ok, this seems to be a cinnamon specific Problem, I'll open an Issue

@annejan
Copy link
Member Author

@annejan annejan commented Jan 24, 2016

Related issue #146

annejan added a commit that referenced this pull request Jun 1, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants