* [QGit] Can't compile under windows (MSVC2008)
@ 2008-09-23 11:31 Abdelrazak Younes
2008-09-23 11:41 ` Abdelrazak Younes
` (2 more replies)
0 siblings, 3 replies; 21+ messages in thread
From: Abdelrazak Younes @ 2008-09-23 11:31 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 1344 bytes --]
Hello,
I tried to follow README_WIN.txt:
C:\devel\qgit\qgit4>qmake qgit.pro
The Makefile (attached to this mail) seems to be correctly generated in
the same directory (C:\devel\qgit\qgit4).
Then, under MSVC2008 Express, I get this error:
1>------ Début de la génération : Projet : qgit, Configuration : Debug
Win32 ------
1>Actions de projet Makefile en cours
1>Microsoft (R) Program Maintenance Utility Version 9.00.21022.08
1>Copyright (C) Microsoft Corporation. Tous droits rÚservÚs.
1> cd src\ && "C:\Program Files\Microsoft Visual Studio
9.0\VC\bin\nmake.exe" debug
1>Microsoft (R) Program Maintenance Utility Version 9.00.21022.08
1>Copyright (C) Microsoft Corporation. Tous droits rÚservÚs.
1>NMAKE : fatal error U1073: incapable d'obtenir 'src\\Makefile'
1>Stop.
1>NMAKE : fatal error U1077: 'cd'á: code retour '0x2'
1>Stop.
1>Project : error PRJ0019: Un outil a retourné un code d'erreur à partir
de "Actions de projet Makefile en cours"
1>Le journal de génération a été enregistré à l'emplacement
"file://c:\devel\qgit\qgit4\Debug\BuildLog.htm"
1>qgit - 3 erreur(s), 0 avertissement(s)
========== Génération : 0 a réussi, 1 a échoué, 0 mis à jour, 0 a été
ignoré ==========
Idea someone?
Wouldn't it be nice to use CMake instead of qmake so that the MSVC
solution is generated directly?
Abdel.
[-- Attachment #2: Makefile --]
[-- Type: text/plain, Size: 5078 bytes --]
#############################################################################
# Makefile for building: qgit
# Generated by qmake (2.01a) (Qt 4.4.2-snapshot-20080730) on: mar. 23. sept. 13:26:35 2008
# Project: qgit.pro
# Template: subdirs
# Command: c:\devel\qt\4.4\bin\qmake.exe -win32 -o Makefile qgit.pro
#############################################################################
first: make_default
MAKEFILE = Makefile
QMAKE = c:\devel\qt\4.4\bin\qmake.exe
DEL_FILE = del
CHK_DIR_EXISTS= if not exist
MKDIR = mkdir
COPY = copy /y
COPY_FILE = $(COPY)
COPY_DIR = xcopy /s /q /y /i
INSTALL_FILE = $(COPY_FILE)
INSTALL_PROGRAM = $(COPY_FILE)
INSTALL_DIR = $(COPY_DIR)
DEL_FILE = del
SYMLINK =
DEL_DIR = rmdir
MOVE = move
CHK_DIR_EXISTS= if not exist
MKDIR = mkdir
SUBTARGETS = \
sub-src
src\$(MAKEFILE):
@$(CHK_DIR_EXISTS) src\ $(MKDIR) src\
cd src\ && $(QMAKE) src.pro -win32 -o $(MAKEFILE)
sub-src-qmake_all: FORCE
@$(CHK_DIR_EXISTS) src\ $(MKDIR) src\
cd src\ && $(QMAKE) src.pro -win32 -o $(MAKEFILE)
sub-src: src\$(MAKEFILE) FORCE
cd src\ && $(MAKE) -f $(MAKEFILE)
sub-src-make_default: src\$(MAKEFILE) FORCE
cd src\ && $(MAKE) -f $(MAKEFILE)
sub-src-make_first: src\$(MAKEFILE) FORCE
cd src\ && $(MAKE) -f $(MAKEFILE) first
sub-src-all: src\$(MAKEFILE) FORCE
cd src\ && $(MAKE) -f $(MAKEFILE) all
sub-src-clean: src\$(MAKEFILE) FORCE
cd src\ && $(MAKE) -f $(MAKEFILE) clean
sub-src-distclean: src\$(MAKEFILE) FORCE
cd src\ && $(MAKE) -f $(MAKEFILE) distclean
sub-src-install_subtargets: src\$(MAKEFILE) FORCE
cd src\ && $(MAKE) -f $(MAKEFILE) install
sub-src-uninstall_subtargets: src\$(MAKEFILE) FORCE
cd src\ && $(MAKE) -f $(MAKEFILE) uninstall
Makefile: qgit.pro ..\..\qt\4.4\mkspecs\default\qmake.conf ..\..\qt\4.4\mkspecs\qconfig.pri \
..\..\qt\4.4\mkspecs\features\qt_functions.prf \
..\..\qt\4.4\mkspecs\features\qt_config.prf \
..\..\qt\4.4\mkspecs\features\exclusive_builds.prf \
..\..\qt\4.4\mkspecs\features\default_pre.prf \
..\..\qt\4.4\mkspecs\features\win32\default_pre.prf \
..\..\qt\4.4\mkspecs\features\debug.prf \
..\..\qt\4.4\mkspecs\features\debug_and_release.prf \
..\..\qt\4.4\mkspecs\features\default_post.prf \
..\..\qt\4.4\mkspecs\features\win32\rtti.prf \
..\..\qt\4.4\mkspecs\features\win32\exceptions.prf \
..\..\qt\4.4\mkspecs\features\shared.prf \
..\..\qt\4.4\mkspecs\features\win32\embed_manifest_exe.prf \
..\..\qt\4.4\mkspecs\features\win32\embed_manifest_dll.prf \
..\..\qt\4.4\mkspecs\features\warn_on.prf \
..\..\qt\4.4\mkspecs\features\qt.prf \
..\..\qt\4.4\mkspecs\features\win32\thread.prf \
..\..\qt\4.4\mkspecs\features\moc.prf \
..\..\qt\4.4\mkspecs\features\win32\windows.prf \
..\..\qt\4.4\mkspecs\features\win32\stl_off.prf \
..\..\qt\4.4\mkspecs\features\resources.prf \
..\..\qt\4.4\mkspecs\features\uic.prf \
..\..\qt\4.4\mkspecs\features\yacc.prf \
..\..\qt\4.4\mkspecs\features\lex.prf
$(QMAKE) -win32 -o Makefile qgit.pro
..\..\qt\4.4\mkspecs\qconfig.pri:
..\..\qt\4.4\mkspecs\features\qt_functions.prf:
..\..\qt\4.4\mkspecs\features\qt_config.prf:
..\..\qt\4.4\mkspecs\features\exclusive_builds.prf:
..\..\qt\4.4\mkspecs\features\default_pre.prf:
..\..\qt\4.4\mkspecs\features\win32\default_pre.prf:
..\..\qt\4.4\mkspecs\features\debug.prf:
..\..\qt\4.4\mkspecs\features\debug_and_release.prf:
..\..\qt\4.4\mkspecs\features\default_post.prf:
..\..\qt\4.4\mkspecs\features\win32\rtti.prf:
..\..\qt\4.4\mkspecs\features\win32\exceptions.prf:
..\..\qt\4.4\mkspecs\features\shared.prf:
..\..\qt\4.4\mkspecs\features\win32\embed_manifest_exe.prf:
..\..\qt\4.4\mkspecs\features\win32\embed_manifest_dll.prf:
..\..\qt\4.4\mkspecs\features\warn_on.prf:
..\..\qt\4.4\mkspecs\features\qt.prf:
..\..\qt\4.4\mkspecs\features\win32\thread.prf:
..\..\qt\4.4\mkspecs\features\moc.prf:
..\..\qt\4.4\mkspecs\features\win32\windows.prf:
..\..\qt\4.4\mkspecs\features\win32\stl_off.prf:
..\..\qt\4.4\mkspecs\features\resources.prf:
..\..\qt\4.4\mkspecs\features\uic.prf:
..\..\qt\4.4\mkspecs\features\yacc.prf:
..\..\qt\4.4\mkspecs\features\lex.prf:
qmake: qmake_all FORCE
@$(QMAKE) -win32 -o Makefile qgit.pro
qmake_all: sub-src-qmake_all FORCE
make_default: sub-src-make_default FORCE
make_first: sub-src-make_first FORCE
all: sub-src-all FORCE
clean: sub-src-clean FORCE
distclean: sub-src-distclean FORCE
-$(DEL_FILE) Makefile
install_subtargets: sub-src-install_subtargets FORCE
uninstall_subtargets: sub-src-uninstall_subtargets FORCE
sub-src-sub_Debug: src\\$(MAKEFILE)
cd src\ && $(MAKE) debug
debug: sub-src-sub_Debug
sub-src-sub_Release: src\\$(MAKEFILE)
cd src\ && $(MAKE) release
release: sub-src-sub_Release
mocclean: compiler_moc_header_clean compiler_moc_source_clean
mocables: compiler_moc_header_make_all compiler_moc_source_make_all
install: install_subtargets FORCE
uninstall: uninstall_subtargets FORCE
FORCE:
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [QGit] Can't compile under windows (MSVC2008)
2008-09-23 11:31 [QGit] Can't compile under windows (MSVC2008) Abdelrazak Younes
@ 2008-09-23 11:41 ` Abdelrazak Younes
2008-09-25 5:24 ` [QGit] Some suggestion Li Frank-B20596
2008-10-07 11:14 ` [QGit] Can't compile under windows (MSVC2008) Marco Costalba
2 siblings, 0 replies; 21+ messages in thread
From: Abdelrazak Younes @ 2008-09-23 11:41 UTC (permalink / raw)
To: git; +Cc: Marco Costalba, Steffen Prohaska
On 23/09/2008 13:31, Abdelrazak Younes wrote:
> Hello,
>
> I tried to follow README_WIN.txt:
>
> C:\devel\qgit\qgit4>qmake qgit.pro
>
> The Makefile (attached to this mail) seems to be correctly generated in
> the same directory (C:\devel\qgit\qgit4).
>
> Then, under MSVC2008 Express, I get this error:
Just wanted to add that command-line compilation with nmake was
successful and a bin/qgit.exe was generated that seems to work correctly
with latest Git-1.6.0.2-preview20080923 for Windows.
Thanks to all developers involved.
Abdel.
^ permalink raw reply [flat|nested] 21+ messages in thread
* [QGit] Some suggestion
2008-09-23 11:31 [QGit] Can't compile under windows (MSVC2008) Abdelrazak Younes
2008-09-23 11:41 ` Abdelrazak Younes
@ 2008-09-25 5:24 ` Li Frank-B20596
2008-09-25 11:51 ` Marco Costalba
2008-10-07 11:14 ` [QGit] Can't compile under windows (MSVC2008) Marco Costalba
2 siblings, 1 reply; 21+ messages in thread
From: Li Frank-B20596 @ 2008-09-25 5:24 UTC (permalink / raw)
To: git
Can add below function at qgit?
===Difference other version===
1. user choose a commit,
2. right click
Check working dir
View patch
....
[Diff with other commit]
3. change icon +
4. user choose other commit
QGit show list of changed files.
click one files, call extern diff tool show difference.
=== file view ===
Can use different color to high light current commit change.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [QGit] Some suggestion
2008-09-25 5:24 ` [QGit] Some suggestion Li Frank-B20596
@ 2008-09-25 11:51 ` Marco Costalba
2008-09-25 15:20 ` Li Frank-B20596
0 siblings, 1 reply; 21+ messages in thread
From: Marco Costalba @ 2008-09-25 11:51 UTC (permalink / raw)
To: Li Frank-B20596; +Cc: git
On Thu, Sep 25, 2008 at 7:24 AM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:
> Can add below function at qgit?
> ===Difference other version===
> 1. user choose a commit,
> 2. right click
> Check working dir
> View patch
> ....
> [Diff with other commit]
>
> 3. change icon +
> 4. user choose other commit
>
> QGit show list of changed files.
> click one files, call extern diff tool show difference.
>
> === file view ===
> Can use different color to high light current commit change.
>
You can _already_ do this.
1. user choose a commit
2. user choose other commit with CTRL + RIGHT CLICK
One of the problems of qgit is that the features are not immediately
visible. This is a conscious choice to avoid cluttering the GUI.
Currently the _best_ way to have a complete idea of qgit is to read
the handbook (press F1 key): it takes only 5 minutes and you can find
interesting features otherwise very difficult to find by accident.
Marco
^ permalink raw reply [flat|nested] 21+ messages in thread
* RE: [QGit] Some suggestion
2008-09-25 11:51 ` Marco Costalba
@ 2008-09-25 15:20 ` Li Frank-B20596
2008-09-25 16:34 ` Marco Costalba
0 siblings, 1 reply; 21+ messages in thread
From: Li Frank-B20596 @ 2008-09-25 15:20 UTC (permalink / raw)
To: Marco Costalba; +Cc: git
Marco:
Yes, it is really work although it is not nature way.
This way don't work at file view.
Ctrl +/- change font size, but how to change source code view
font size.
12. Marcor Costalba 10 #include <QProcess>
12. Marcor Costalba 10 #include <QRegExp>
Best regards
Frank Li
-----Original Message-----
From: Marco Costalba [mailto:mcostalba@gmail.com]
Sent: Thursday, September 25, 2008 7:52 PM
To: Li Frank-B20596
Cc: git@vger.kernel.org
Subject: Re: [QGit] Some suggestion
On Thu, Sep 25, 2008 at 7:24 AM, Li Frank-B20596
<Frank.Li@freescale.com> wrote:
> Can add below function at qgit?
> ===Difference other version===
> 1. user choose a commit,
> 2. right click
> Check working dir
> View patch
> ....
> [Diff with other commit]
>
> 3. change icon +
> 4. user choose other commit
>
> QGit show list of changed files.
> click one files, call extern diff tool show difference.
>
> === file view ===
> Can use different color to high light current commit change.
>
You can _already_ do this.
1. user choose a commit
2. user choose other commit with CTRL + RIGHT CLICK
One of the problems of qgit is that the features are not immediately
visible. This is a conscious choice to avoid cluttering the GUI.
Currently the _best_ way to have a complete idea of qgit is to read the
handbook (press F1 key): it takes only 5 minutes and you can find
interesting features otherwise very difficult to find by accident.
Marco
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [QGit] Some suggestion
2008-09-25 15:20 ` Li Frank-B20596
@ 2008-09-25 16:34 ` Marco Costalba
2008-09-26 1:55 ` Li Frank-B20596
0 siblings, 1 reply; 21+ messages in thread
From: Marco Costalba @ 2008-09-25 16:34 UTC (permalink / raw)
To: Li Frank-B20596; +Cc: git
On Thu, Sep 25, 2008 at 4:20 PM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:
> Marco:
>
> Ctrl +/- change font size, but how to change source code view
> font size.
>
Edit->Settings->Fixed width font
You can choose size, font family, bolding, etc...
File view and diff view are optimized for source code viewing so use
fixed pitch fonts, not system default one that normally it is not
fixed pitch.
^ permalink raw reply [flat|nested] 21+ messages in thread
* RE: [QGit] Some suggestion
2008-09-25 16:34 ` Marco Costalba
@ 2008-09-26 1:55 ` Li Frank-B20596
2008-09-26 5:15 ` Marco Costalba
0 siblings, 1 reply; 21+ messages in thread
From: Li Frank-B20596 @ 2008-09-26 1:55 UTC (permalink / raw)
To: Marco Costalba; +Cc: git
Thank you for your support!
Can I compare with other version at file view?
I think highlight author at file view is not high light, can use
different color?
-----Original Message-----
From: Marco Costalba [mailto:mcostalba@gmail.com]
Sent: Friday, September 26, 2008 12:34 AM
To: Li Frank-B20596
Cc: git@vger.kernel.org
Subject: Re: [QGit] Some suggestion
On Thu, Sep 25, 2008 at 4:20 PM, Li Frank-B20596
<Frank.Li@freescale.com> wrote:
> Marco:
>
> Ctrl +/- change font size, but how to change source code view
> font size.
>
Edit->Settings->Fixed width font
You can choose size, font family, bolding, etc...
File view and diff view are optimized for source code viewing so use
fixed pitch fonts, not system default one that normally it is not fixed
pitch.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [QGit] Some suggestion
2008-09-26 1:55 ` Li Frank-B20596
@ 2008-09-26 5:15 ` Marco Costalba
2008-09-26 5:43 ` Li Frank-B20596
0 siblings, 1 reply; 21+ messages in thread
From: Marco Costalba @ 2008-09-26 5:15 UTC (permalink / raw)
To: Li Frank-B20596; +Cc: git
On Fri, Sep 26, 2008 at 3:55 AM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:
> Thank you for your support!
> Can I compare with other version at file view?
After selecting with CTRL+RIGHT CLICK as already descrived click on
the file name, you'll be pointed to the part of the diff related to
your file.
Another option is to choose one commit, click on a file name in the
right bottom pane, then press the MAGIC WAND button, then commits will
be reloaded with path limiter and you will see only commits that
modify the selected file. Toggle magic wand button to restore original
view.
> I think highlight author at file view is not high light, can use
> different color?
What is the color you would like ? Possibly in RGB format.
Marco
^ permalink raw reply [flat|nested] 21+ messages in thread
* RE: [QGit] Some suggestion
2008-09-26 5:15 ` Marco Costalba
@ 2008-09-26 5:43 ` Li Frank-B20596
2008-09-26 10:37 ` Marco Costalba
0 siblings, 1 reply; 21+ messages in thread
From: Li Frank-B20596 @ 2008-09-26 5:43 UTC (permalink / raw)
To: Marco Costalba; +Cc: git
I think orange color of "Working dir changes" in Rev List view is good.
"MAGIC WAND" is google feature.
I think the message of "Filter on <lib/blame.tcl>" at title omitted by
user early.
I have some suggestions.
Option 1: Change "Rev List" to "Rev List Filtered", or add
filter icon before "Rev List"
Option 2: Change "Short Log" to "Short Log Filter On
<Lib/blame.tcl>"
Option 3: Add bar between tab and list, show current filter
information
-----Original Message-----
From: Marco Costalba [mailto:mcostalba@gmail.com]
Sent: Friday, September 26, 2008 1:16 PM
To: Li Frank-B20596
Cc: git@vger.kernel.org
Subject: Re: [QGit] Some suggestion
On Fri, Sep 26, 2008 at 3:55 AM, Li Frank-B20596
<Frank.Li@freescale.com> wrote:
> Thank you for your support!
> Can I compare with other version at file view?
After selecting with CTRL+RIGHT CLICK as already descrived click on the
file name, you'll be pointed to the part of the diff related to your
file.
Another option is to choose one commit, click on a file name in the
right bottom pane, then press the MAGIC WAND button, then commits will
be reloaded with path limiter and you will see only commits that modify
the selected file. Toggle magic wand button to restore original view.
> I think highlight author at file view is not high light, can use
> different color?
What is the color you would like ? Possibly in RGB format.
Marco
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [QGit] Some suggestion
2008-09-26 5:43 ` Li Frank-B20596
@ 2008-09-26 10:37 ` Marco Costalba
2008-09-26 14:57 ` Li Frank-B20596
2008-09-27 3:44 ` [QGit] [PATCH] Modify Highlight Color at File Context View Li Frank-B20596
0 siblings, 2 replies; 21+ messages in thread
From: Marco Costalba @ 2008-09-26 10:37 UTC (permalink / raw)
To: Li Frank-B20596; +Cc: git
On Fri, Sep 26, 2008 at 7:43 AM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:
>
> I have some suggestions.
> Option 1: Change "Rev List" to "Rev List Filtered"
This is the more correct but we don't have the space to write on what
files it is filtering
> Option 2: Change "Short Log" to "Short Log Filter On
> <Lib/blame.tcl>"
This is less correct because short log has nothing to do with
filtering, but here there is more space...
> Option 3: Add bar between tab and list, show current filter
> information
>
Too complicated and space wasteful IMO.
Marco
^ permalink raw reply [flat|nested] 21+ messages in thread
* RE: [QGit] Some suggestion
2008-09-26 10:37 ` Marco Costalba
@ 2008-09-26 14:57 ` Li Frank-B20596
2008-09-26 16:15 ` Marco Costalba
2008-09-27 3:44 ` [QGit] [PATCH] Modify Highlight Color at File Context View Li Frank-B20596
1 sibling, 1 reply; 21+ messages in thread
From: Li Frank-B20596 @ 2008-09-26 14:57 UTC (permalink / raw)
To: Marco Costalba; +Cc: git
Option 1:
Telling user just filted is better than nothing. Is it possible
add tool button tip.
When mouse over 'Rev list [Felted]", show what filtering.
Best regards
Frank Li
-----Original Message-----
From: Marco Costalba [mailto:mcostalba@gmail.com]
Sent: Friday, September 26, 2008 6:38 PM
To: Li Frank-B20596
Cc: git@vger.kernel.org
Subject: Re: [QGit] Some suggestion
On Fri, Sep 26, 2008 at 7:43 AM, Li Frank-B20596
<Frank.Li@freescale.com> wrote:
>
> I have some suggestions.
> Option 1: Change "Rev List" to "Rev List Filtered"
This is the more correct but we don't have the space to write on what
files it is filtering
> Option 2: Change "Short Log" to "Short Log Filter On
> <Lib/blame.tcl>"
This is less correct because short log has nothing to do with filtering,
but here there is more space...
> Option 3: Add bar between tab and list, show current filter
> information
>
Too complicated and space wasteful IMO.
Marco
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [QGit] Some suggestion
2008-09-26 14:57 ` Li Frank-B20596
@ 2008-09-26 16:15 ` Marco Costalba
0 siblings, 0 replies; 21+ messages in thread
From: Marco Costalba @ 2008-09-26 16:15 UTC (permalink / raw)
To: Li Frank-B20596; +Cc: git
On Fri, Sep 26, 2008 at 3:57 PM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:
> Option 1:
> Telling user just filted is better than nothing. Is it possible
> add tool button tip.
> When mouse over 'Rev list [Felted]", show what filtering.
>
Ok! I agree.
Thanks
Marco
^ permalink raw reply [flat|nested] 21+ messages in thread
* [QGit] [PATCH] Modify Highlight Color at File Context View.
2008-09-26 10:37 ` Marco Costalba
2008-09-26 14:57 ` Li Frank-B20596
@ 2008-09-27 3:44 ` Li Frank-B20596
2008-09-27 12:47 ` Marco Costalba
1 sibling, 1 reply; 21+ messages in thread
From: Li Frank-B20596 @ 2008-09-27 3:44 UTC (permalink / raw)
To: Marco Costalba; +Cc: git
>From 3507b3f0b13287c5a25a31b238527b5920555c5c Mon Sep 17 00:00:00 2001
From: Frank Li <Frank.li@freescale.com>
Date: Sat, 27 Sep 2008 11:41:03 +0800
Subject: [PATCH] Modify Highlight Color at File Context View.
Author and line number can be easily found when choose special commit.
Signed-off-by: Frank Li <Frank.li@freescale.com>
---
src/filecontent.cpp | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/filecontent.cpp b/src/filecontent.cpp
index 28e0f91..23c2e95 100644
--- a/src/filecontent.cpp
+++ b/src/filecontent.cpp
@@ -576,12 +576,14 @@ void FileContent::setAnnList() {
listWidgetAnn->clear();
listWidgetAnn->addItems(sl);
- QBrush b(Qt::darkGray);
+ QBrush fore(Qt::darkRed);
+ QBrush back(Qt::lightGray);
QFont f(listWidgetAnn->font());
f.setBold(true);
FOREACH (QVector<int>, it, curIdLines) {
QListWidgetItem* item = listWidgetAnn->item(*it);
- item->setForeground(b);
+ item->setForeground(fore);
+ item->setBackground(back);
item->setFont(f);
}
/* When listWidgetAnn get focus for the first time the current
--
1.6.0.2.1172.ga5ed0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [QGit] [PATCH] Modify Highlight Color at File Context View.
2008-09-27 3:44 ` [QGit] [PATCH] Modify Highlight Color at File Context View Li Frank-B20596
@ 2008-09-27 12:47 ` Marco Costalba
[not found] ` <7FD1F85C96D70C4A89DA1DF7667EAE9605EA4E@zch01exm23.fsl.freescale.net>
0 siblings, 1 reply; 21+ messages in thread
From: Marco Costalba @ 2008-09-27 12:47 UTC (permalink / raw)
To: Li Frank-B20596; +Cc: git
On Sat, Sep 27, 2008 at 4:44 AM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:
> From 3507b3f0b13287c5a25a31b238527b5920555c5c Mon Sep 17 00:00:00 2001
> From: Frank Li <Frank.li@freescale.com>
> Date: Sat, 27 Sep 2008 11:41:03 +0800
> Subject: [PATCH] Modify Highlight Color at File Context View.
> Author and line number can be easily found when choose special commit.
>
> Signed-off-by: Frank Li <Frank.li@freescale.com>
> ---
Patch applied.
Thanks
Marco
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [QGit] [PATCH] Modify Highlight Color at File Context View.
[not found] ` <7FD1F85C96D70C4A89DA1DF7667EAE9605EA4E@zch01exm23.fsl.freescale.net>
@ 2008-10-01 6:47 ` Marco Costalba
2008-10-04 6:19 ` Marco Costalba
0 siblings, 1 reply; 21+ messages in thread
From: Marco Costalba @ 2008-10-01 6:47 UTC (permalink / raw)
To: Li Frank-B20596; +Cc: git
On Mon, Sep 29, 2008 at 3:27 AM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:
> Marco:
>
> I don't get my patch by git-pull.
> There are not my patch at
> http://git.kernel.org/?p=qgit/qgit4.git;a=summary.
>
> best regards
> Frank Li
> ________________________________
I have pushed to my local repo, I will be able to push to public repo
only this week end.
Marco
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [QGit] [PATCH] Modify Highlight Color at File Context View.
2008-10-01 6:47 ` Marco Costalba
@ 2008-10-04 6:19 ` Marco Costalba
2008-10-04 14:32 ` Li Frank-B20596
0 siblings, 1 reply; 21+ messages in thread
From: Marco Costalba @ 2008-10-04 6:19 UTC (permalink / raw)
To: Li Frank-B20596; +Cc: git
On Wed, Oct 1, 2008 at 8:47 AM, Marco Costalba <mcostalba@gmail.com> wrote:
> On Mon, Sep 29, 2008 at 3:27 AM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:
>> Marco:
>>
>> I don't get my patch by git-pull.
>> There are not my patch at
>> http://git.kernel.org/?p=qgit/qgit4.git;a=summary.
>>
>> best regards
>> Frank Li
>> ________________________________
>
> I have pushed to my local repo, I will be able to push to public repo
> only this week end.
>
Ok. Now is pushed to public repo.
Frank, are you sure it works? for me it does not seem to make any difference.
Marco
^ permalink raw reply [flat|nested] 21+ messages in thread
* RE: [QGit] [PATCH] Modify Highlight Color at File Context View.
2008-10-04 6:19 ` Marco Costalba
@ 2008-10-04 14:32 ` Li Frank-B20596
2008-10-05 7:34 ` Marco Costalba
0 siblings, 1 reply; 21+ messages in thread
From: Li Frank-B20596 @ 2008-10-04 14:32 UTC (permalink / raw)
To: Marco Costalba; +Cc: git
Marco:
It is difference between my patch and you applied patch.
Git diff HEAD^
- item->setForeground(b);
+ item->setForeground(fore);
+ item->setForeground(back);
item->setFont(f);
In my patch:
- item->setForeground(b);
+ item->setForeground(fore);
+ item->setBackground(back);
It should be setBackground(back), not setForeground(back);
Best regards
Frank Li
-----Original Message-----
From: Marco Costalba [mailto:mcostalba@gmail.com]
Sent: Saturday, October 04, 2008 2:20 PM
To: Li Frank-B20596
Cc: git@vger.kernel.org
Subject: Re: [QGit] [PATCH] Modify Highlight Color at File Context View.
On Wed, Oct 1, 2008 at 8:47 AM, Marco Costalba <mcostalba@gmail.com>
wrote:
> On Mon, Sep 29, 2008 at 3:27 AM, Li Frank-B20596
<Frank.Li@freescale.com> wrote:
>> Marco:
>>
>> I don't get my patch by git-pull.
>> There are not my patch at
>> http://git.kernel.org/?p=qgit/qgit4.git;a=summary.
>>
>> best regards
>> Frank Li
>> ________________________________
>
> I have pushed to my local repo, I will be able to push to public repo
> only this week end.
>
Ok. Now is pushed to public repo.
Frank, are you sure it works? for me it does not seem to make any
difference.
Marco
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [QGit] [PATCH] Modify Highlight Color at File Context View.
2008-10-04 14:32 ` Li Frank-B20596
@ 2008-10-05 7:34 ` Marco Costalba
0 siblings, 0 replies; 21+ messages in thread
From: Marco Costalba @ 2008-10-05 7:34 UTC (permalink / raw)
To: Li Frank-B20596; +Cc: git
On Sat, Oct 4, 2008 at 4:32 PM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:
>
> It should be setBackground(back), not setForeground(back);
>
Ahaaaa! My bad!
Sorry for this. Fix pushed.
Thanks
Marco
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [QGit] Can't compile under windows (MSVC2008)
2008-09-23 11:31 [QGit] Can't compile under windows (MSVC2008) Abdelrazak Younes
2008-09-23 11:41 ` Abdelrazak Younes
2008-09-25 5:24 ` [QGit] Some suggestion Li Frank-B20596
@ 2008-10-07 11:14 ` Marco Costalba
2008-10-07 11:41 ` Abdelrazak Younes
2 siblings, 1 reply; 21+ messages in thread
From: Marco Costalba @ 2008-10-07 11:14 UTC (permalink / raw)
To: Abdelrazak Younes; +Cc: git
2008/9/23 Abdelrazak Younes <younes@lyx.org>:
> Hello,
>
> I tried to follow README_WIN.txt:
>
> C:\devel\qgit\qgit4>qmake qgit.pro
>
> The Makefile (attached to this mail) seems to be correctly generated in the
> same directory (C:\devel\qgit\qgit4).
>
> Then, under MSVC2008 Express, I get this error:
>
> 1>------ Début de la génération : Projet : qgit, Configuration : Debug Win32
> ------
> 1>Actions de projet Makefile en cours
> 1>Microsoft (R) Program Maintenance Utility Version 9.00.21022.08
> 1>Copyright (C) Microsoft Corporation. Tous droits rÚservÚs.
> 1> cd src\ && "C:\Program Files\Microsoft Visual Studio
> 9.0\VC\bin\nmake.exe" debug
> 1>Microsoft (R) Program Maintenance Utility Version 9.00.21022.08
> 1>Copyright (C) Microsoft Corporation. Tous droits rÚservÚs.
> 1>NMAKE : fatal error U1073: incapable d'obtenir 'src\\Makefile'
> 1>Stop.
> 1>NMAKE : fatal error U1077: 'cd'á: code retour '0x2'
> 1>Stop.
> 1>Project : error PRJ0019: Un outil a retourné un code d'erreur à partir de
> "Actions de projet Makefile en cours"
> 1>Le journal de génération a été enregistré à l'emplacement
> "file://c:\devel\qgit\qgit4\Debug\BuildLog.htm"
> 1>qgit - 3 erreur(s), 0 avertissement(s)
> ========== Génération : 0 a réussi, 1 a échoué, 0 mis à jour, 0 a été ignoré
> ==========
>
> Idea someone?
>
have you tried to setup MSVC for custom build ? and pass proper
comamnd line with nmake ?
Marco
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [QGit] Can't compile under windows (MSVC2008)
2008-10-07 11:14 ` [QGit] Can't compile under windows (MSVC2008) Marco Costalba
@ 2008-10-07 11:41 ` Abdelrazak Younes
2008-10-07 11:55 ` Abdelrazak Younes
0 siblings, 1 reply; 21+ messages in thread
From: Abdelrazak Younes @ 2008-10-07 11:41 UTC (permalink / raw)
To: Marco Costalba; +Cc: git
On 07/10/2008 13:14, Marco Costalba wrote:
> 2008/9/23 Abdelrazak Younes<younes@lyx.org>:
>
>> Hello,
>>
>> I tried to follow README_WIN.txt:
>>
>> C:\devel\qgit\qgit4>qmake qgit.pro
>>
>> The Makefile (attached to this mail) seems to be correctly generated in the
>> same directory (C:\devel\qgit\qgit4).
>>
>> Then, under MSVC2008 Express, I get this error:
>>
>> 1>------ Début de la génération : Projet : qgit, Configuration : Debug Win32
>> ------
>> 1>Actions de projet Makefile en cours
>> 1>Microsoft (R) Program Maintenance Utility Version 9.00.21022.08
>> 1>Copyright (C) Microsoft Corporation. Tous droits rÚservÚs.
>> 1> cd src\&& "C:\Program Files\Microsoft Visual Studio
>> 9.0\VC\bin\nmake.exe" debug
>> 1>Microsoft (R) Program Maintenance Utility Version 9.00.21022.08
>> 1>Copyright (C) Microsoft Corporation. Tous droits rÚservÚs.
>> 1>NMAKE : fatal error U1073: incapable d'obtenir 'src\\Makefile'
>> 1>Stop.
>> 1>NMAKE : fatal error U1077: 'cd'á: code retour '0x2'
>> 1>Stop.
>> 1>Project : error PRJ0019: Un outil a retourné un code d'erreur à partir de
>> "Actions de projet Makefile en cours"
>> 1>Le journal de génération a été enregistré à l'emplacement
>> "file://c:\devel\qgit\qgit4\Debug\BuildLog.htm"
>> 1>qgit - 3 erreur(s), 0 avertissement(s)
>> ========== Génération : 0 a réussi, 1 a échoué, 0 mis à jour, 0 a été ignoré
>> ==========
>>
>> Idea someone?
>>
>>
>
> have you tried to setup MSVC for custom build ?
Sorry, I don't follow you.
> and pass proper
> comamnd line with nmake ?
>
In the NMAKE field of the project properties, there is 'nmake /f
Makefile debug', is that what you mean?
Abdel.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [QGit] Can't compile under windows (MSVC2008)
2008-10-07 11:41 ` Abdelrazak Younes
@ 2008-10-07 11:55 ` Abdelrazak Younes
0 siblings, 0 replies; 21+ messages in thread
From: Abdelrazak Younes @ 2008-10-07 11:55 UTC (permalink / raw)
To: Marco Costalba; +Cc: git
On 07/10/2008 13:41, Abdelrazak Younes wrote:
> On 07/10/2008 13:14, Marco Costalba wrote:
>> 2008/9/23 Abdelrazak Younes<younes@lyx.org>:
>>> Hello,
>>>
>>> I tried to follow README_WIN.txt:
>>>
>>> C:\devel\qgit\qgit4>qmake qgit.pro
>>>
>>> The Makefile (attached to this mail) seems to be correctly generated
>>> in the
>>> same directory (C:\devel\qgit\qgit4).
>>>
>>> Then, under MSVC2008 Express, I get this error:
>>>
>>> 1>------ Début de la génération : Projet : qgit, Configuration :
>>> Debug Win32
>>> ------
>>> 1>Actions de projet Makefile en cours
>>> 1>Microsoft (R) Program Maintenance Utility Version 9.00.21022.08
>>> 1>Copyright (C) Microsoft Corporation. Tous droits rÚservÚs.
>>> 1> cd src\&& "C:\Program Files\Microsoft Visual Studio
>>> 9.0\VC\bin\nmake.exe" debug
>>> 1>Microsoft (R) Program Maintenance Utility Version 9.00.21022.08
>>> 1>Copyright (C) Microsoft Corporation. Tous droits rÚservÚs.
>>> 1>NMAKE : fatal error U1073: incapable d'obtenir 'src\\Makefile'
>>> 1>Stop.
>>> 1>NMAKE : fatal error U1077: 'cd'á: code retour '0x2'
>>> 1>Stop.
>>> 1>Project : error PRJ0019: Un outil a retourné un code d'erreur à
>>> partir de
>>> "Actions de projet Makefile en cours"
>>> 1>Le journal de génération a été enregistré à l'emplacement
>>> "file://c:\devel\qgit\qgit4\Debug\BuildLog.htm"
>>> 1>qgit - 3 erreur(s), 0 avertissement(s)
>>> ========== Génération : 0 a réussi, 1 a échoué, 0 mis à jour, 0 a
>>> été ignoré
>>> ==========
>>>
>>> Idea someone?
>>>
>>
>> have you tried to setup MSVC for custom build ?
>
> Sorry, I don't follow you.
>
>> and pass proper
>> comamnd line with nmake ?
>
> In the NMAKE field of the project properties, there is 'nmake /f
> Makefile debug', is that what you mean?
OK, by removing '/f Makefile' I manage to compile qgit from within
Visual Studio. I also managed to launch it in debug mode by selecting
the executable in ../bin/qgit.exe. When launched this way (F5), qgit
opens up with the qgit repository but the user name and email are still
not filled in, I'll try to debug that now.
Abdel.
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2008-10-07 11:58 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-23 11:31 [QGit] Can't compile under windows (MSVC2008) Abdelrazak Younes
2008-09-23 11:41 ` Abdelrazak Younes
2008-09-25 5:24 ` [QGit] Some suggestion Li Frank-B20596
2008-09-25 11:51 ` Marco Costalba
2008-09-25 15:20 ` Li Frank-B20596
2008-09-25 16:34 ` Marco Costalba
2008-09-26 1:55 ` Li Frank-B20596
2008-09-26 5:15 ` Marco Costalba
2008-09-26 5:43 ` Li Frank-B20596
2008-09-26 10:37 ` Marco Costalba
2008-09-26 14:57 ` Li Frank-B20596
2008-09-26 16:15 ` Marco Costalba
2008-09-27 3:44 ` [QGit] [PATCH] Modify Highlight Color at File Context View Li Frank-B20596
2008-09-27 12:47 ` Marco Costalba
[not found] ` <7FD1F85C96D70C4A89DA1DF7667EAE9605EA4E@zch01exm23.fsl.freescale.net>
2008-10-01 6:47 ` Marco Costalba
2008-10-04 6:19 ` Marco Costalba
2008-10-04 14:32 ` Li Frank-B20596
2008-10-05 7:34 ` Marco Costalba
2008-10-07 11:14 ` [QGit] Can't compile under windows (MSVC2008) Marco Costalba
2008-10-07 11:41 ` Abdelrazak Younes
2008-10-07 11:55 ` Abdelrazak Younes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).