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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sorry for last error :) #370

Merged
merged 5 commits into from Apr 26, 2018

Conversation

Projects
None yet
3 participants
@FiloSpaTeam
Contributor

FiloSpaTeam commented Apr 26, 2018

I changed some things.

  • Now there is a real ToolBar more adaptable to GNU/Linux DE and Mac OSx.
  • Update IT translations
  • Some refactor about QtPassSettings Singleton (i missed some instances 馃榿 )
  • Now Git Pull and Git Push Button are always visible - as suggested from GNOME 3 Guidelines, users prefers to have buttons visible and disable than hide/show.

FiloSpaTeam added some commits Apr 25, 2018

@annejan

This comment has been minimized.

Member

annejan commented Apr 26, 2018

No worries, that's why we have automated testing 馃榿

@annejan annejan self-requested a review Apr 26, 2018

@annejan annejan added the refactoring label Apr 26, 2018

@FiloSpaTeam

This comment has been minimized.

Contributor

FiloSpaTeam commented Apr 26, 2018

Oh, if you prefer to have TextBesideIcon change the code. Actually i set to FollowStyle (ToolBar icons)

@coveralls

This comment has been minimized.

coveralls commented Apr 26, 2018

Coverage Status

Coverage increased (+0.06%) to 6.217% when pulling ea60d28 on UnitooTeam:master into fef6236 on IJHack:master.

@annejan

This comment has been minimized.

Member

annejan commented Apr 26, 2018

I think I prefer FollowStyle since it's more coherent.

@FiloSpaTeam

This comment has been minimized.

Contributor

FiloSpaTeam commented Apr 26, 2018

Ok, perfect. Another thing. Why Travis CI build failed? I can't understand 馃槅

@annejan

This comment has been minimized.

Member

annejan commented Apr 26, 2018

Restarted the job, Travis has glitches sometimes . .
Looks like it timed-out installing a prerequisites.

@codecov

This comment has been minimized.

codecov bot commented Apr 26, 2018

Codecov Report

Merging #370 into master will increase coverage by 0.05%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master    #370      +/-   ##
=========================================
+ Coverage     6.2%   6.25%   +0.05%     
=========================================
  Files          39      39              
  Lines        2706    2684      -22     
  Branches      348     347       -1     
=========================================
  Hits          168     168              
+ Misses       2532    2510      -22     
  Partials        6       6
Impacted Files Coverage 螖
src/mainwindow.h 0% <酶> (酶) 猬嗭笍
src/qtpasssettings.h 0% <酶> (酶) 猬嗭笍
src/mainwindow.cpp 0% <0%> (酶) 猬嗭笍
src/passworddialog.cpp 59.18% <0%> (酶) 猬嗭笍
src/qtpasssettings.cpp 0.92% <0%> (+0.01%) 猬嗭笍

Continue to review full report at Codecov.

Legend - Click here to learn more
螖 = absolute <relative> (impact), 酶 = not affected, ? = missing data
Powered by Codecov. Last update fef6236...ea60d28. Read the comment docs.

@FiloSpaTeam

This comment has been minimized.

Contributor

FiloSpaTeam commented Apr 26, 2018

Ok understood! Thanks.
If you want some changes tell me 馃憤

@annejan

Just those commented out lines, the rest looks perfect to me.

//}
// void QtPassSettings::setSplitterRight(const int &splitterRight) {
// getInstance()->setValue(SettingsConstants::splitterRight, splitterRight);
//}

This comment has been minimized.

@annejan

annejan Apr 26, 2018

Member

If you could remove these (instead of commenting out) that would be wonderful.

static int getSplitterRight(const int &defaultValue = QVariant().toInt());
static void setSplitterRight(const int &splitterRight);
// static int getSplitterRight(const int &defaultValue = QVariant().toInt());
// static void setSplitterRight(const int &splitterRight);

This comment has been minimized.

@annejan

annejan Apr 26, 2018

Member

Same with these commented out lines.

@annejan annejan merged commit a9422ba into IJHack:master Apr 26, 2018

5 of 6 checks passed

codecov/patch 0% of diff hit (target 6.2%)
Details
CodeFactor No issues found.
Details
codecov/project 6.25% (+0.05%) compared to fef6236
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
linthub Linthub has cleared the pull request, no code style suggestions found.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment