{"thread":{"id":"2957","subject":"[PATCH] qgit: increase the space between the lanes.","startedAt":"2006-01-03T11:15:18Z","lastAt":"2006-01-04T08:24:43Z","messageCount":6,"participants":["Martin Atukunda","Marco Costalba"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"14133","messageId":"200601031415.19309.matlads@dsmagic.com","threadId":"2957","inReplyTo":null,"subject":"[PATCH] qgit: increase the space between the lanes.","fromName":"Martin Atukunda","fromEmail":"matlads@dsmagic.com","sentAt":"2006-01-03T11:15:18Z","receivedAt":"2006-01-03T11:15:18Z","isPatch":true,"sender":{"key":"matlads@dsmagic.com","avatar":null},"body":"There are probably better ways of doing this.\n\nSigned-off-by: Martin Atukunda <matlads@dsmagic.com>\n\n---\n\n src/mainimpl.cpp |    8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n\n28ddfe1297a5e1e212fc35c3419cf8364415847e\ndiff --git a/src/mainimpl.cpp b/src/mainimpl.cpp\nindex d7c4e39..1b1f0f0 100644\n--- a/src/mainimpl.cpp\n+++ b/src/mainimpl.cpp\n@@ -1409,7 +1409,7 @@ void MainImpl::setupPixmaps() {\n \t// little hack to read items height\n \tnew QListViewItem(listViewLog);\n \tph = listViewLog->firstChild()->height();\n-\tpw = ph / 2;\n+\tpw = ph / 2 + 4;\n \tlistViewLog->clear(); // remove and deletes items\n \tQPixmap cm(pw, ph);\n \tcm.fill();\n@@ -1443,17 +1443,17 @@ void MainImpl::setupPixmaps() {\n \t\tcase MERGE_FORK:\n \t\t\tp.drawLine(P_90, P_270);\n \t\t\tp.drawLine(P_180, P_0);\n-\t\t\tp.drawRect(pw/4, ph/4, pw/2, ph/2);\n+\t\t\tp.drawRect(pw/4+1, ph/4, pw/2, ph/2);\n \t\t\tbreak;\n \t\tcase MERGE_FORK_R:\n \t\t\tp.drawLine(P_90, P_270);\n \t\t\tp.drawLine(P_180, P_OR);\n-\t\t\tp.drawRect(pw/4, ph/4, pw/2, ph/2);\n+\t\t\tp.drawRect(pw/4+1, ph/4, pw/2, ph/2);\n \t\t\tbreak;\n \t\tcase MERGE_FORK_L:\n \t\t\tp.drawLine(P_90, P_270);\n \t\t\tp.drawLine(P_OR, P_0);\n-\t\t\tp.drawRect(pw/4, ph/4, pw/2, ph/2);\n+\t\t\tp.drawRect(pw/4+1, ph/4, pw/2, ph/2);\n \t\t\tbreak;\n \t\tcase JOIN:\n \t\t\tp.drawLine(P_90, P_270);\n-- \n1.0.GIT\n"},{"id":"14138","messageId":"43BA9CFA.8050208@yahoo.it","threadId":"2957","inReplyTo":"200601031415.19309.matlads@dsmagic.com","subject":"Re: [PATCH] qgit: increase the space between the lanes.","fromName":"Marco Costalba","fromEmail":"mcostalba@yahoo.it","sentAt":"2006-01-03T15:49:14Z","receivedAt":"2006-01-03T15:49:14Z","isPatch":true,"sender":{"key":"mcostalba@gmail.com","avatar":null},"body":"Martin Atukunda wrote:\n> There are probably better ways of doing this.\n> \n> Signed-off-by: Martin Atukunda <matlads@dsmagic.com>\n> \n> ---\n> \nThanks for the patch. Almost applied ;-)\n\nThe incresed lines spacing is good. But unluckly the merge/fork symbols\ndon't appear as good, at least in my box:\n\nhttp://digilander.libero.it/mcostalba/qgitOriginal.png\n\nhttp://digilander.libero.it/mcostalba/qgitModified.png\n\nIf it _could_ be possible to fill with color the merge symbols it would be great.\n\nDo you mind to do it yourself? if not I will do that.\n\nThanks\nMarco\n\n\t\n\n\t\n\t\t\n___________________________________ \nYahoo! Mail: gratis 1GB per i messaggi e allegati da 10MB \nhttp://mail.yahoo.it\n"},{"id":"14139","messageId":"200601031949.59822.matlads@dsmagic.com","threadId":"2957","inReplyTo":"43BA9CFA.8050208@yahoo.it","subject":"Re: [PATCH] qgit: increase the space between the lanes.","fromName":"Martin Atukunda","fromEmail":"matlads@dsmagic.com","sentAt":"2006-01-03T16:49:58Z","receivedAt":"2006-01-03T16:49:58Z","isPatch":true,"sender":{"key":"matlads@dsmagic.com","avatar":null},"body":"On Tuesday 03 January 2006 18:49, Marco Costalba wrote:\n>\n> If it _could_ be possible to fill with color the merge symbols it would be\n> great.\n>\n> Do you mind to do it yourself? if not I will do that.\n\nSomething like this?\n---\n\n[PATCH] qgit: increase the space between the lanes.\n\nThis commit increases the space between the lanes. It also cators/adjusts for\nthe look of the merge/fork symbols.\n\nSigned-off-by: Martin Atukunda <matlads@dsmagic.com>\n\n---\n\n src/mainimpl.cpp |    8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n\neb82c3b5bda7970bf743a3b1fa9df8a943f3b9ed\ndiff --git a/src/mainimpl.cpp b/src/mainimpl.cpp\nindex d7c4e39..9430e1b 100644\n--- a/src/mainimpl.cpp\n+++ b/src/mainimpl.cpp\n@@ -1409,7 +1409,7 @@ void MainImpl::setupPixmaps() {\n \t// little hack to read items height\n \tnew QListViewItem(listViewLog);\n \tph = listViewLog->firstChild()->height();\n-\tpw = ph / 2;\n+\tpw = ph / 2 + 4;\n \tlistViewLog->clear(); // remove and deletes items\n \tQPixmap cm(pw, ph);\n \tcm.fill();\n@@ -1443,17 +1443,17 @@ void MainImpl::setupPixmaps() {\n \t\tcase MERGE_FORK:\n \t\t\tp.drawLine(P_90, P_270);\n \t\t\tp.drawLine(P_180, P_0);\n-\t\t\tp.drawRect(pw/4, ph/4, pw/2, ph/2);\n+\t\t\tp.drawRect(pw/4+1, ph/4, pw/2-1, ph/2);\n \t\t\tbreak;\n \t\tcase MERGE_FORK_R:\n \t\t\tp.drawLine(P_90, P_270);\n \t\t\tp.drawLine(P_180, P_OR);\n-\t\t\tp.drawRect(pw/4, ph/4, pw/2, ph/2);\n+\t\t\tp.drawRect(pw/4+1, ph/4, pw/2-1, ph/2);\n \t\t\tbreak;\n \t\tcase MERGE_FORK_L:\n \t\t\tp.drawLine(P_90, P_270);\n \t\t\tp.drawLine(P_OR, P_0);\n-\t\t\tp.drawRect(pw/4, ph/4, pw/2, ph/2);\n+\t\t\tp.drawRect(pw/4+1, ph/4, pw/2-1, ph/2);\n \t\t\tbreak;\n \t\tcase JOIN:\n \t\t\tp.drawLine(P_90, P_270);\n-- \n1.0.6-g58e3\n"},{"id":"14140","messageId":"200601032007.09081.matlads@dsmagic.com","threadId":"2957","inReplyTo":"200601031949.59822.matlads@dsmagic.com","subject":"Re: [PATCH] qgit: increase the space between the lanes.","fromName":"Martin Atukunda","fromEmail":"matlads@dsmagic.com","sentAt":"2006-01-03T17:07:08Z","receivedAt":"2006-01-03T17:07:08Z","isPatch":true,"sender":{"key":"matlads@dsmagic.com","avatar":null},"body":"On Tuesday 03 January 2006 19:49, Martin Atukunda wrote:\n> On Tuesday 03 January 2006 18:49, Marco Costalba wrote:\n> > If it _could_ be possible to fill with color the merge symbols it would\n> > be great.\n> >\n> > Do you mind to do it yourself? if not I will do that.\n>\n> Something like this?\n\nSorry, but it appears that the patches i've been sending out work only for \ncertain font sizes! Hmmm.\n\nsee these 3 screenshots (with the previous patch):\n\nhttp://mail.ds.co.ug/~matlads/qgit/\n\nHmm, I need to re-think how to do this properly. Any ideas?\n\n- Martin -\n"},{"id":"14148","messageId":"43BAF7F2.6060906@yahoo.it","threadId":"2957","inReplyTo":"200601032007.09081.matlads@dsmagic.com","subject":"Re: [PATCH] qgit: increase the space between the lanes.","fromName":"Marco Costalba","fromEmail":"mcostalba@yahoo.it","sentAt":"2006-01-03T22:17:22Z","receivedAt":"2006-01-03T22:17:22Z","isPatch":true,"sender":{"key":"mcostalba@gmail.com","avatar":null},"body":"Martin Atukunda wrote:\n> \n> Hmm, I need to re-think how to do this properly. Any ideas?\n> \n\nHi Martin,\n\n\nWhat about this?\n\nIf it is Ok for you I will push the change.\n\n\n\nMarco\n\n\ndiff --git a/src/mainimpl.cpp b/src/mainimpl.cpp\nindex 2f26b01..40a22e8 100644\n--- a/src/mainimpl.cpp\n+++ b/src/mainimpl.cpp\n@@ -1451,7 +1451,7 @@ void MainImpl::setupPixmaps() {\n  \t// little hack to read items height\n  \tnew QListViewItem(listViewLog);\n  \tph = listViewLog->firstChild()->height();\n-\tpw = ph / 2;\n+\tpw = 3 * ph / 4;\n  \tlistViewLog->clear(); // remove and deletes items\n  \tQPixmap cm(pw, ph);\n  \tcm.fill();\n@@ -1470,12 +1470,13 @@ void MainImpl::setupPixmaps() {\n  \t\tp.begin(pm);\n  \t\tp.setPen(QPen(colors[i % COLORS_NUM], 2));\n  \t\tint type = (i / COLORS_NUM) + 1;\n+\t\tQBrush myBrush(QBrush(colors[i % COLORS_NUM], Qt::SolidPattern));\n  \t\tswitch(type) {\n  \t\tcase ACTIVE:\n  \t\t\tp.drawLine(P_90, P_270);\n  \t\t\tp.save();\n  \t\t\tp.setPen(QPen(colors[i % COLORS_NUM], 1));\n-\t\t\tp.setBrush(QBrush(colors[i % COLORS_NUM], Qt::SolidPattern));\n+\t\t\tp.setBrush(myBrush);\n  \t\t\tp.drawEllipse(pw/8, ph/8, 6*pw/8, 3*ph/8);\n  \t\t\tp.restore();\n  \t\t\tbreak;\n@@ -1485,17 +1486,20 @@ void MainImpl::setupPixmaps() {\n  \t\tcase MERGE_FORK:\n  \t\t\tp.drawLine(P_90, P_270);\n  \t\t\tp.drawLine(P_180, P_0);\n-\t\t\tp.drawRect(pw/4, ph/4, pw/2, ph/2);\n+\t\t\tp.fillRect (pw/4, ph/4, pw/2, ph/2, myBrush);\n+\t\t\tp.drawRoundRect(pw/4, ph/4, pw/2, ph/2, 25, 25);\n  \t\t\tbreak;\n  \t\tcase MERGE_FORK_R:\n  \t\t\tp.drawLine(P_90, P_270);\n  \t\t\tp.drawLine(P_180, P_OR);\n-\t\t\tp.drawRect(pw/4, ph/4, pw/2, ph/2);\n+\t\t\tp.fillRect (pw/4, ph/4, pw/2, ph/2, myBrush);\n+\t\t\tp.drawRoundRect(pw/4, ph/4, pw/2, ph/2, 25, 25);\n  \t\t\tbreak;\n  \t\tcase MERGE_FORK_L:\n  \t\t\tp.drawLine(P_90, P_270);\n  \t\t\tp.drawLine(P_OR, P_0);\n-\t\t\tp.drawRect(pw/4, ph/4, pw/2, ph/2);\n+\t\t\tp.fillRect (pw/4, ph/4, pw/2, ph/2, myBrush);\n+\t\t\tp.drawRoundRect(pw/4, ph/4, pw/2, ph/2, 25, 25);\n  \t\t\tbreak;\n  \t\tcase JOIN:\n  \t\t\tp.drawLine(P_90, P_270);\n\n\n\t\n\n\t\n\t\t\n___________________________________ \nYahoo! Mail: gratis 1GB per i messaggi e allegati da 10MB \nhttp://mail.yahoo.it\n"},{"id":"14162","messageId":"200601041124.43749.matlads@dsmagic.com","threadId":"2957","inReplyTo":"43BAF7F2.6060906@yahoo.it","subject":"Re: [PATCH] qgit: increase the space between the lanes.","fromName":"Martin Atukunda","fromEmail":"matlads@dsmagic.com","sentAt":"2006-01-04T08:24:43Z","receivedAt":"2006-01-04T08:24:43Z","isPatch":true,"sender":{"key":"matlads@dsmagic.com","avatar":null},"body":"On Wednesday 04 January 2006 01:17, Marco Costalba wrote:\n> Martin Atukunda wrote:\n> > Hmm, I need to re-think how to do this properly. Any ideas?\n>\n> Hi Martin,\n>\n>\n> What about this?\n>\n> If it is Ok for you I will push the change.\n>\nLooks Good. Please apply.\n\n- Martin -\n\n-- \nDue to a shortage of devoted followers, the production of great leaders has \nbeen discontinued.\n"}]}