Merge lp:~stefano-karapetsas/qbzr/qbzr-eee into lp:~qbzr-dev/qbzr/trunk

Proposed by Alexander Belchenko
Status: Rejected
Rejected by: Jonathan Riddell
Proposed branch: lp:~stefano-karapetsas/qbzr/qbzr-eee
Merge into: lp:~qbzr-dev/qbzr/trunk
Diff against target: 50 lines (+34/-1)
2 files modified
NETBOOK_MODE.txt (+27/-0)
lib/commit.py (+7/-1)
To merge this branch: bzr merge lp:~stefano-karapetsas/qbzr/qbzr-eee
Reviewer Review Type Date Requested Status
Alexander Belchenko Needs Fixing
Review via email: mp+10485@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexander Belchenko (bialix) wrote :

Registered as merge proposal to get it chance reviewed and decided what we can do about this problem.

Revision history for this message
Alexander Belchenko (bialix) wrote :

Stefano, sorry for the delay with your patch.

I'd really like to give your patch a chance to be merged into the core. Can you update your branch with latest trunk and we can start review and working on it?

Thanks.

review: Needs Fixing
lp:~stefano-karapetsas/qbzr/qbzr-eee updated
554. By Stefano Karapetsas

Merge with trunk

Revision history for this message
Stefano Karapetsas (stefano-karapetsas) wrote :

Thanks Alexander,
I merged with trunk and I re-started to working on qbzr-eee branch.

lp:~stefano-karapetsas/qbzr/qbzr-eee updated
555. By Stefano Karapetsas

Reverted qgetnew

556. By Stefano Karapetsas

Added netbook_mode option to qbzr.conf

557. By Stefano Karapetsas

Really reverted lib/ui_new_tree.py

558. By Stefano Karapetsas

Checked other commands

Revision history for this message
Jonathan Riddell (jr) wrote :

Rejecting because this no longer has a useful diff compared to trunk, please update it and resubmit a new merge proposal

Unmerged revisions

558. By Stefano Karapetsas

Checked other commands

557. By Stefano Karapetsas

Really reverted lib/ui_new_tree.py

556. By Stefano Karapetsas

Added netbook_mode option to qbzr.conf

555. By Stefano Karapetsas

Reverted qgetnew

554. By Stefano Karapetsas

Merge with trunk

553. By Stefano Karapetsas

merge from trunk

552. By Stefano Karapetsas

Fixed mistake with spaces and indentations

551. By Stefano Karapetsas

merge from trunk

550. By Stefano Karapetsas

qcommit and qgetnew updated

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'NETBOOK_MODE.txt'
2--- NETBOOK_MODE.txt 1970-01-01 00:00:00 +0000
3+++ NETBOOK_MODE.txt 2009-11-16 23:51:09 +0000
4@@ -0,0 +1,27 @@
5+Temporary file for qbzr-eee experimental branch.
6+There is the list of q[commands] checked for netbooks.
7+Tested on eeepc with 800x480 resolution.
8+
9+qadd - Ok
10+qannotate - Ok
11+qbind - Ok
12+qbranch - Ok
13+qbrowse - Ok
14+qcat/qviewer - Ok
15+qcommit - Ok, changed
16+qconfig - Ok
17+qexport - Not ok
18+qgetnew - ?
19+qgetupdates - ?
20+qinfo - Ok
21+qinit - Not ok
22+qdiff - Ok
23+qlog - Ok
24+qplugins - Ok
25+qpush - Ok
26+qrevert - Ok
27+qrun - Not ok
28+qsend - Not ok
29+quncommit - Ok
30+qupdate - Ok
31+qversion - Ok
32
33=== modified file 'lib/commit.py'
34--- lib/commit.py 2009-11-10 14:44:47 +0000
35+++ lib/commit.py 2009-11-16 23:51:09 +0000
36@@ -270,7 +270,13 @@
37 self.local_checkbox.setChecked(True)
38 self.update_branch_groupbox()
39
40- splitter = QtGui.QSplitter(QtCore.Qt.Vertical, self)
41+ import util
42+ config = util.QBzrGlobalConfig()
43+ netbook_mode = config.get_user_option("netbook_mode")
44+ if netbook_mode:
45+ splitter = QtGui.QSplitter(QtCore.Qt.Horizontal, self)
46+ else:
47+ splitter = QtGui.QSplitter(QtCore.Qt.Vertical, self)
48
49 message_groupbox = QtGui.QGroupBox(gettext("Message"), splitter)
50 splitter.addWidget(message_groupbox)

Subscribers

People subscribed via source and target branches

to status/vote changes: