Merge lp:~gcrosswhite/leo-editor/use-qt-gui-on-osx into lp:leo-editor/old-trunk

Proposed by Gregory Crosswhite
Status: Needs review
Proposed branch: lp:~gcrosswhite/leo-editor/use-qt-gui-on-osx
Merge into: lp:leo-editor/old-trunk
Diff against target: 20 lines (+2/-2)
1 file modified
leo/core/runLeo.py (+2/-2)
To merge this branch: bzr merge lp:~gcrosswhite/leo-editor/use-qt-gui-on-osx
Reviewer Review Type Date Requested Status
The Leo editor team Pending
Review via email: mp+64599@code.launchpad.net

Description of the change

Fixed issue with Leo not working by default on OSX by making it disable tabs if the platform is darwin.

To post a comment you must log in.
Revision history for this message
Edward K. Ream (edreamleo) wrote :

On Tue, Jun 14, 2011 at 2:52 PM, Gregory Crosswhite
<email address hidden> wrote:
> Gregory Crosswhite has proposed merging lp:~gcrosswhite/leo-editor/use-qt-gui-on-osx into lp:leo-editor.

I didn't use exactly this patch. The changes are in the trunk ending
with rev 4376.

Edward

Unmerged revisions

4372. By Gregory Crosswhite

Now Leo uses qt instead of qttabs on OSX.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'leo/core/runLeo.py'
--- leo/core/runLeo.py 2011-06-09 21:20:53 +0000
+++ leo/core/runLeo.py 2011-06-14 19:51:44 +0000
@@ -377,7 +377,7 @@
377 if gui:377 if gui:
378 gui = gui.lower()378 gui = gui.lower()
379379
380 if sys.platform == 'darwin' and qui == 'qttabs':380 if sys.platform == 'darwin' and gui == 'qttabs':
381 # 2011/06/9: Convert 'qttabs' to 'qt' on MacOS.381 # 2011/06/9: Convert 'qttabs' to 'qt' on MacOS.
382 g.es('qttabs not supported on MacOS\nusing qt')382 g.es('qttabs not supported on MacOS\nusing qt')
383 gui = 'qt'383 gui = 'qt'
@@ -394,7 +394,7 @@
394 g.app.qt_use_tabs = True394 g.app.qt_use_tabs = True
395 else:395 else:
396 gui = g.app.guiArgName = 'qt'396 gui = g.app.guiArgName = 'qt'
397 g.app.qt_use_tabs = True397 g.app.qt_use_tabs = not (sys.platform == 'darwin')
398398
399 assert gui == g.app.guiArgName399 assert gui == g.app.guiArgName
400400

Subscribers

People subscribed via source and target branches

to status/vote changes: