Merge lp://staging/~stefan-schwarzburg/qreator/fix_bug_1016826 into lp://staging/~dpm/qreator/trunk
Proposed by
Schwarzburg
| Status: | Merged |
|---|---|
| Merged at revision: | 97 |
| Proposed branch: | lp://staging/~stefan-schwarzburg/qreator/fix_bug_1016826 |
| Merge into: | lp://staging/~dpm/qreator/trunk |
| Diff against target: |
93 lines (+34/-12) 3 files modified
qreator.desktop.in (+8/-0) qreator/QreatorWindow.py (+3/-0) qreator/__init__.py (+23/-12) |
| To merge this branch: | bzr merge lp://staging/~stefan-schwarzburg/qreator/fix_bug_1016826 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| David Planella | Approve | ||
|
Review via email:
|
|||
Description of the change
This should fix the bug.
replaced the functions called when started with commandline args
split the switch function into two parts to make this easier
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks Stefan!
Ideally, I'd like to make the code to load QR code types more dynamic, and not have to rely on specifying the qr_id in two places (in __init__.py and on QreatorWindow.py) and keep them in sync. But this is something a bit more longer term.
I'm happy with the current fix, as it addresses an important crasher.
Also ideally, the --software option should be only available if Software Center is installed, so that Qreator can run on other distros which do not use it (e.g. see the recent Fedora-related changes in the code).
I'll leave the latter for now and merge the change, but will address it later.