Merge lp://qastaging/~nikwen/logviewer/update into lp://qastaging/logviewer

Proposed by Niklas Wenzel
Status: Merged
Merged at revision: 7
Proposed branch: lp://qastaging/~nikwen/logviewer/update
Merge into: lp://qastaging/logviewer
Diff against target: 5352 lines (+980/-3978)
53 files modified
CMakeLists.txt (+56/-0)
Logviewer.json (+10/-0)
Logviewer.pro.user (+0/-256)
Makefile (+0/-207)
app/CMakeLists.txt (+15/-0)
app/Logviewer.desktop.in (+11/-0)
app/Makefile (+0/-16)
app/libs/CMakeLists.txt (+7/-0)
app/libs/logviewer.js (+2/-0)
app/logviewer.desktop (+0/-8)
app/logviewer.qml (+74/-36)
app/ui/AboutPage.qml (+78/-0)
app/ui/CMakeLists.txt (+7/-0)
app/ui/LogPage.qml (+127/-130)
app/ui/PerfPage.qml (+0/-112)
app/ui/PrefPage.qml (+158/-0)
backend/CMakeLists.txt (+30/-0)
backend/Makefile (+0/-207)
backend/backend.pro (+0/-10)
backend/modules/Logviewer/backend.cpp (+17/-0)
backend/modules/Logviewer/backend.h (+18/-0)
backend/modules/Logviewer/logreaderservice.cpp (+95/-0)
backend/modules/Logviewer/logreaderservice.h (+54/-0)
backend/modules/Logviewer/logviewer.cpp (+67/-0)
backend/modules/Logviewer/logviewer.h (+68/-0)
backend/modules/Logviewer/qmldir (+3/-0)
backend/modules/logviewer/Makefile (+0/-1101)
backend/modules/logviewer/backend.cpp (+0/-17)
backend/modules/logviewer/backend.h (+0/-18)
backend/modules/logviewer/logreaderservice.cpp (+0/-94)
backend/modules/logviewer/logreaderservice.h (+0/-54)
backend/modules/logviewer/logviewer.cpp (+0/-62)
backend/modules/logviewer/logviewer.h (+0/-68)
backend/modules/logviewer/logviewer.pro (+0/-38)
backend/modules/logviewer/moc_backend.cpp (+0/-155)
backend/modules/logviewer/moc_logreaderservice.cpp (+0/-174)
backend/modules/logviewer/moc_logviewer.cpp (+0/-324)
backend/modules/logviewer/qmldir (+0/-2)
backend/tests/unit/tst_mytype.qml (+50/-0)
click/libs/logviewer.js (+0/-14)
click/libs/pastebin.js (+0/-68)
click/logviewer.desktop (+0/-8)
click/logviewer.json (+0/-10)
click/logviewer.qml (+0/-187)
click/manifest.json (+0/-15)
click/plugin/logviewer/qmldir (+0/-2)
click/ubuntudualboot.json (+0/-8)
click/ui/LogPage.qml (+0/-198)
click/ui/PerfPage.qml (+0/-112)
cmake/Click.cmake (+18/-0)
logviewer.pro (+0/-11)
logviewer.pro.user (+0/-256)
manifest.json (+15/-0)
To merge this branch: bzr merge lp://qastaging/~nikwen/logviewer/update
Reviewer Review Type Date Requested Status
Victor Tuson Palau Approve
Review via email: mp+232063@code.qastaging.launchpad.net

Description of the change

Changelog:

 * Use cmake for building the app (which enables running it from Qt Creator)
 * Use the latest framework and UI Toolkit versions
 * Use the new header
 * Fixed frequent crash: Pointer not initialized
 * PasteBin Upload:
   * Push the whole log if no text is selected
   * Make the link in the dialog clickable
 * Overhaul the settings UI
 * Store the font size value in the settings
 * Use Qt.labs.settings for saving the settings (requires https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/organizationDomain to be merged into trunk)
 * Add a message if no logs could be found for the set filter
 * Added an about page

To post a comment you must log in.
Revision history for this message
Victor Tuson Palau (vtuson) wrote :

All good. It is hard to review the c++ changes as with the move the diff is the whole file.. anyhow, I have build it and test it and check the qml changes. Lots of good work! thanks Nikwen.

I will submit 0.8 to the store today

review: Approve
Revision history for this message
Niklas Wenzel (nikwen) wrote :

Yeah, sorry for breaking the diff. I created a new project in Qt Creator and replaced all files with the ones from the logviewer app. That made writing the cmake build scripts much easier.
If you still want a diff, you can use "diff originalfile updatedfile" to manually create it. ;)

Thanks a lot for merging the changes and for releasing the app under an open-source license. It's one of my most frequently used apps.

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