From a12b316cb4ba7856d7ed0e3f2c385bfd95ffeff8 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 1 Jan 2013 13:05:27 +0000
Subject: [PATCH] CtrlCore, ide: gtk fixes

git-svn-id: svn://ultimatepp.org/upp/trunk@5693 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlCore/GtkClip.cpp  |  2 +-
 uppsrc/CtrlCore/GtkEvent.cpp |  2 +-
 uppsrc/ide/About.cpp         | 12 ++++++++----
 uppsrc/ide/Browser/Browser.h |  1 +
 uppsrc/ide/ide.cpp           |  2 ++
 uppsrc/ide/ide.h             |  1 +
 uppsrc/ide/idewin.cpp        |  5 +++++
 uppsrc/ide/init              |  1 -
 8 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/uppsrc/CtrlCore/GtkClip.cpp b/uppsrc/CtrlCore/GtkClip.cpp
index 42e53c024..6ca697d0f 100644
--- a/uppsrc/CtrlCore/GtkClip.cpp
+++ b/uppsrc/CtrlCore/GtkClip.cpp
@@ -5,7 +5,7 @@
 
 NAMESPACE_UPP
 
-#define LLOG(x)  DLOG(x)
+#define LLOG(x)  // DLOG(x)
 
 void Ctrl::GtkSelectionDataSet(GtkSelectionData *selection_data, const String& fmt, const String& data)
 {
diff --git a/uppsrc/CtrlCore/GtkEvent.cpp b/uppsrc/CtrlCore/GtkEvent.cpp
index 910293a72..d302eb508 100644
--- a/uppsrc/CtrlCore/GtkEvent.cpp
+++ b/uppsrc/CtrlCore/GtkEvent.cpp
@@ -8,7 +8,7 @@
 
 NAMESPACE_UPP
 
-#define LLOG(x)     LOG(x)
+#define LLOG(x)    // DLOG(x)
 #define LOG_EVENTS
 
 bool  Ctrl::EventMouseValid;
diff --git a/uppsrc/ide/About.cpp b/uppsrc/ide/About.cpp
index f33839b95..bbea3062e 100644
--- a/uppsrc/ide/About.cpp
+++ b/uppsrc/ide/About.cpp
@@ -16,10 +16,14 @@ Size MakeLogo(Ctrl& parent, Array<Ctrl>& ctrl)
 	Label& v1 = ctrl.Create<Label>();
 	l.SetImage(logo);
 	Size sz = Size(isz.cx, isz.cy + 80);
-	v = IDE_VERSION;
-	if(sizeof(void *) == 8) {
-		v = IDE_VERSION " (64 bit)";
-	}
+	String h;
+	h = IDE_VERSION;
+	if(sizeof(void *) == 8)
+		h << " (64 bit)";
+#ifdef GUI_GTK
+	h << " (Gtk)";
+#endif
+	v = h;
 	v.RightPos(10, Ctrl::MINSIZE).TopPos(70, 40);
 	l.Add(v);
 	v.SetFont(Arial(20));
diff --git a/uppsrc/ide/Browser/Browser.h b/uppsrc/ide/Browser/Browser.h
index cbe67a7e5..c3e5b1128 100644
--- a/uppsrc/ide/Browser/Browser.h
+++ b/uppsrc/ide/Browser/Browser.h
@@ -40,6 +40,7 @@ const CppItem *GetCodeRefItem(const String& ref);
 
 int            GetMatchLen(const char *s, const char *t);
 
+
 enum { WITHBODY = 33 };
 
 inline Font BrowserFont()
diff --git a/uppsrc/ide/ide.cpp b/uppsrc/ide/ide.cpp
index 90646ebe0..3ce86bc7f 100644
--- a/uppsrc/ide/ide.cpp
+++ b/uppsrc/ide/ide.cpp
@@ -36,6 +36,8 @@ void Ide::MakeTitle()
 			if(NormalizePath(editfile) == NormalizePath(bookmark[i].file))
 				title << Format(" <%d>", i);
 	title << " { " << GetVarsName() << " }";
+	if(isscanning)
+		title << " (scanning files)";
 	Title(title.ToWString());
 }
 
diff --git a/uppsrc/ide/ide.h b/uppsrc/ide/ide.h
index 06e275e64..e7eae1a1f 100644
--- a/uppsrc/ide/ide.h
+++ b/uppsrc/ide/ide.h
@@ -739,6 +739,7 @@ public:
 	VectorMap<String, String> abbr;
 	
 	int           issaving;
+	int           isscanning;
 
 // ------------------------------------
 
diff --git a/uppsrc/ide/idewin.cpp b/uppsrc/ide/idewin.cpp
index bd203af79..f398314ad 100644
--- a/uppsrc/ide/idewin.cpp
+++ b/uppsrc/ide/idewin.cpp
@@ -525,6 +525,7 @@ Ide::Ide()
 	output_per_assembly = true;
 	
 	issaving = 0;
+	isscanning = 0;
 }
 
 Ide::~Ide()
@@ -904,8 +905,12 @@ void AppMain___()
 		ide.LoadLastMain();
 		if(clset || ide.OpenMainPackage()) {
 			ide.SaveLastMain();
+			ide.isscanning++;
+			ide.MakeTitle();
 			SyncRefs();
 			ide.FileSelected();
+			ide.isscanning--;
+			ide.MakeTitle();
 			if(!IdeExit)
 				ide.Run();
 			ide.SaveConfigOnTime();
diff --git a/uppsrc/ide/init b/uppsrc/ide/init
index dcf6b4d0c..7b9c15caf 100644
--- a/uppsrc/ide/init
+++ b/uppsrc/ide/init
@@ -17,6 +17,5 @@
 #include "TextDiffCtrl/init"
 #include "TabBar/init"
 #include "ide\Img/init"
-#include "Gtk/init"
 #include "ide\SrcUpdater/init"
 #endif