qtubuntu

Merge lp://qastaging/~lukas-kde/qtubuntu/ubuntuIconsFonts into lp://qastaging/qtubuntu

  1. ubuntuIconsFonts
  2. Merge into trunk
Proposed by Lukáš Tinkl
Status: Merged
Approved by: Daniel d'Andrada
Approved revision: 388
Merged at revision: 392
Proposed branch: lp://qastaging/~lukas-kde/qtubuntu/ubuntuIconsFonts
Merge into: lp://qastaging/qtubuntu
Diff against target: 236 lines (+77/-53)
6 files modified
src/shared/ubuntutheme.h (+63/-0)
src/ubuntuappmenu/theme.cpp (+3/-20)
src/ubuntuappmenu/theme.h (+4/-7)
src/ubuntuappmenu/ubuntuappmenu.pro (+2/-1)
src/ubuntumirclient/qmirclientintegration.cpp (+3/-24)
src/ubuntumirclient/ubuntumirclient.pro (+2/-1)
To merge this branch: bzr merge lp://qastaging/~lukas-kde/qtubuntu/ubuntuIconsFonts
Reviewer Review Type Date Requested Status
Daniel d'Andrada (community) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+321178@code.qastaging.launchpad.net

Commit message

Use the correct font (Ubuntu family) and icon theme (suru)

Description of the change

Use the correct font (Ubuntu family) and icon theme (suru)

Together with the logicalDPI branch (https://code.launchpad.net/~dandrader/qtubuntu/logicalDpi/+merge/320940) looks like this: https://imgur.com/vTmO85M

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:385
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/216/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4733
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4761
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4584
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4584/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4584
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4584/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4584
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4584/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4584
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4584/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4584
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4584/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4584
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4584/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/216/rebuild

review: Approve (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Please update the copyright header of the modified files.

Revision history for this message
Daniel d'Andrada (dandrader) wrote :

"""
private:
    QFont systemFont, fixedFont;
"""

Should follow the project's naming convention for member variables. Eg:
s/systemFont/mSystemFont

review: Needs Fixing
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Other than that it looks good and works as expected.

lp://qastaging/~lukas-kde/qtubuntu/ubuntuIconsFonts updated
386. By Lukáš Tinkl

update (c), prefix private member with "m"

Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

> Please update the copyright header of the modified files.

Done

Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

> """
> private:
> QFont systemFont, fixedFont;
> """
>
> Should follow the project's naming convention for member variables. Eg:
> s/systemFont/mSystemFont

Fixed

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:386
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/217/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4760
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4788
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4611
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4611/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4611
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4611/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4611
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4611/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4611
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4611/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4611
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4611/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4611
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4611/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/217/rebuild

review: Approve (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Looking at the diff again, don't know why I missed that before:
Would it be possible for ubuntuappmenu and ubuntumirclient to share the very same theme class? Better than copy-pasting code around.

review: Needs Information
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

> Looking at the diff again, don't know why I missed that before:
> Would it be possible for ubuntuappmenu and ubuntumirclient to share the very
> same theme class? Better than copy-pasting code around.

Yeah, was wondering the same, I can give it a try

lp://qastaging/~lukas-kde/qtubuntu/ubuntuIconsFonts updated
387. By Lukáš Tinkl

factor out the common QPlatformTheme bits into a shared header file

Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

> Looking at the diff again, don't know why I missed that before:
> Would it be possible for ubuntuappmenu and ubuntumirclient to share the very
> same theme class? Better than copy-pasting code around.

Alright, the QPlatformTheme code is now shared between the two plugins (the common stuff)

Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Much better. Last bit:
s/UbuntuIconTheme/UbuntuTheme

review: Needs Fixing
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:387
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/220/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4770
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4798
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4621
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4621/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4621
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4621/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4621
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4621/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4621
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4621/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4621
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4621/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4621
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4621/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/220/rebuild

review: Approve (continuous-integration)
lp://qastaging/~lukas-kde/qtubuntu/ubuntuIconsFonts updated
388. By Lukáš Tinkl

s/UbuntuIconTheme/UbuntuTheme

Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

> Much better. Last bit:
> s/UbuntuIconTheme/UbuntuTheme

Done

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:388
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/221/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4771
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4799
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4622
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4622/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4622
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4622/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4622
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4622/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4622
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4622/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4622
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4622/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4622
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4622/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/221/rebuild

review: Approve (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches