Changeset 173

Timestamp:

06/28/07 12:55:42 (1 year ago)

Author:

namespace

Message:

Fixes by Dunk

Files:

• GtkRadiant/trunk/CHANGES (modified) (1 diff)
• GtkRadiant/trunk/SConstruct (modified) (1 diff)
• GtkRadiant/trunk/install.py (modified) (1 diff)
• GtkRadiant/trunk/radiant/brush.h (modified) (1 diff)
• GtkRadiant/trunk/radiant/brushmanip.cpp (modified) (2 diffs)
• GtkRadiant/trunk/radiant/brushmodule.cpp (modified) (3 diffs)
• GtkRadiant/trunk/radiant/findtexturedialog.cpp (modified) (1 diff)
• GtkRadiant/trunk/radiant/mru.cpp (modified) (2 diffs)
• GtkRadiant/trunk/radiant/xywindow.cpp (modified) (2 diffs)

GtkRadiant/trunk/CHANGES

@@ -1 +1 @@
-This is the changelog for developers, != changelog for the end user 
-that we distribute with the binaries. (see changelog)
+
+28/06/2007 (dunkfordyce@gmail.com)
+- fixed mnemonics for MRU list
+- fixed find functionality
+- added option to always use caulk texture for new brushes
+- fixed(?) a small bug in install.py that was trying to copy msvc files on linux
-
-28/06/2007

GtkRadiant/trunk/SConstruct

@@ -37 +37 @@
-BUILD
-        Use debug/release to select build settings
-debug
+release
-"""
-)

GtkRadiant/trunk/install.py

@@ -114 +114 @@
-copyFileIfExists(libmhash, installRoot)
-
-copySvn("../msvc_redist", installRoot)
-
-if sys.platform[:3] == "win" :
-
-
+
+
+
-
-# create version files

GtkRadiant/trunk/radiant/brush.h

@@ -4171 +4171 @@
-}
-
+// d1223m
+template<typename Functor>
+inline const Functor& Scene_ForEachBrush_ForEachFaceInstance(scene::Graph& graph, const Functor& functor)
+{
+  Scene_forEachBrush(graph, BrushForEachFace(FaceInstanceVisitAll<Functor>(functor)));
+  return functor;
+}
+
-template<typename Functor>
-inline const Functor& Scene_ForEachSelectedBrush_ForEachFace(scene::Graph& graph, const Functor& functor)

GtkRadiant/trunk/radiant/brushmanip.cpp

@@ -551 +551 @@
-};
-
+class FaceFindShader
+{
+  const char* m_find;
+  const char* m_replace;
+public:
+  FaceFindShader(const char* find) : m_find(find)
+  {
+  }
+  void operator()(FaceInstance& faceinst) const
+  {
+    if(shader_equal(faceinst.getFace().GetShader(), m_find))
+    {
+      faceinst.setSelected(SelectionSystem::eFace, true);
+    }
+  }
+};
+
+bool DoingSearch(const char *repl)
+{
+    return (repl == NULL || (strcmp("textures/", repl)==0));
+}
+
-void Scene_BrushFindReplaceShader(scene::Graph& graph, const char* find, const char* replace)
-{
-
+
+
+
+
+
+
+
+
-}
-
-void Scene_BrushFindReplaceShader_Selected(scene::Graph& graph, const char* find, const char* replace)
-{
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-void Scene_BrushFindReplaceShader_Component_Selected(scene::Graph& graph, const char* find, const char* replace)
-{
-
+
+
+
+
+
+
+
+
-}
-
@@ -679 +726 @@
-  void operator()(FaceInstance& face) const
-  {
+    printf("checking %s = %s\n", face.getFace().GetShader(), m_name);
-    if(shader_equal(face.getFace().GetShader(), m_name))
-    {

GtkRadiant/trunk/radiant/brushmodule.cpp

@@ -37 +37 @@
-LatchedBool g_useAlternativeTextureProjection(false, "Use alternative texture-projection");
-bool g_showAlternativeTextureProjectionOption = false;
+bool g_brush_always_caulk;
-
-bool getTextureLockEnabled()
@@ -74 +75 @@
-    );
-  }
+  // d1223m
+  page.appendCheckBox("", 
+    "Always use caulk for new brushes",
+    g_brush_always_caulk
+  );
-}
-void Brush_constructPage(PreferenceGroup& group)
@@ -103 +109 @@
-      type = eBrushTypeQuake3BP;
-    }
+    
+    // d1223m
+    GlobalPreferenceSystem().registerPreference(
+      "BrushAlwaysCaulk", 
+      BoolImportStringCaller(g_brush_always_caulk), 
+      BoolExportStringCaller(g_brush_always_caulk));
-  }
-

GtkRadiant/trunk/radiant/findtexturedialog.cpp

@@ -92 +92 @@
-  {
-    StringOutputStream find(256);
+    StringOutputStream replace(256);
+
-    find << "textures/" << g_FindTextureDialog.m_strFind.c_str();
-    StringOutputStream replace(256);
-    replace << "textures/" << g_FindTextureDialog.m_strReplace.c_str();
-    FindReplaceTextures(find.c_str(), replace.c_str(), g_FindTextureDialog.m_bSelectedOnly);

GtkRadiant/trunk/radiant/mru.cpp

@@ -91 +91 @@
-{
-  EscapedMnemonic mnemonic(64);
-  mnemonic.push_back('_');
-  mnemonic << Unsigned(index + 1) << "- " << ConvertLocaleToUTF8(filename);
-  gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(MRU_items[index]))), mnemonic.c_str());
@@ -215 +214 @@
-{
-  {
-Recent Files
+_1
-    gtk_widget_set_sensitive(GTK_WIDGET(item), FALSE);
-    MRU_AddWidget(item, 0);
-  }
-  {
-
+_
-    gtk_widget_hide(GTK_WIDGET(item));
-    MRU_AddWidget(item, 1);
-  }
-  {
-
+_
-    gtk_widget_hide(GTK_WIDGET(item));
-    MRU_AddWidget(item, 2);
-  }
-  {
-
+_
-    gtk_widget_hide(GTK_WIDGET(item));
-    MRU_AddWidget(item, 3);

GtkRadiant/trunk/radiant/xywindow.cpp

@@ -67 +67 @@
-
-
-
+
+
-
-//!\todo Rewrite.
@@ -1110 +1111 @@
-  }
-
-
+
+
+
+
+
-}
-