Changeset 891

Timestamp:

07/30/07 11:20:16 (1 year ago)

Author:

nikhilsharma

Message:

Modified timelineslider.cpp for in/out points selection bug. Also removed HAVE_FLEX_STRING from jah.

Location:

trunk/jahwidgets/src/qt3

Files:

• python/python_vc80.vcproj (modified) (3 diffs)
• themes/themes_vc80.vcproj (modified) (2 diffs)
• widgets/timelineSlider.cpp (modified) (2 diffs)
• widgets/widgets_vc80.vcproj (modified) (2 diffs)
• wrapper/wrapper_vc80.vcproj (modified) (5 diffs)

trunk/jahwidgets/src/qt3/python/python_vc80.vcproj

@@ -42 +42 @@
                                 Optimization="0"
                                 AdditionalIncludeDirectories="$(QTDIR)\include;"C:\Boost\include\boost-1_33_1";C:\Python24\include;$(OPENLIBRARIES_INCLUDE_PATH);"C:\Program Files\NVIDIA Corporation\Cg\include";..\wrapper;.."
-                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;QT_THREAD_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAVE_GL_GLEW_H"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;HAVE_CG_RUNTIME;QT_THREAD_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAVE_GL_GLEW_H"
                                 MinimalRebuild="true"
                                 BasicRuntimeChecks="3"
@@ -127 +127 @@
                                 Name="VCCLCompilerTool"
                                 AdditionalIncludeDirectories="$(QTDIR)\include;"C:\Boost\include\boost-1_33_1";C:\Python24\include;$(OPENLIBRARIES_INCLUDE_PATH);"C:\Program Files\NVIDIA Corporation\Cg\include";..\wrapper;.."
-                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;QT_THREAD_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAVE_GL_GLEW_H"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;HAVE_CG_RUNTIME;QT_THREAD_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAVE_GL_GLEW_H"
                                 RuntimeLibrary="2"
                                 BufferSecurityCheck="false"
@@ -287 +287 @@
                         </File>
                         <File
+                                RelativePath=".\splitter.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\texture.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\thumbnailer.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\timeline.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\splitter.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\texture.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\thumbnailer.cpp"
                                 >
                         </File>

trunk/jahwidgets/src/qt3/themes/themes_vc80.vcproj

@@ -42 +42 @@
                                 Optimization="0"
                                 AdditionalIncludeDirectories="$(QTDIR)\include"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;THEMES_EXPORTS;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;QT_THREAD_SUPPORT;_CRT_SECURE_NO_DEPRECATE"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;THEMES_EXPORTS;HAVE_CG_RUNTIME;QT_THREAD_SUPPORT;_CRT_SECURE_NO_DEPRECATE"
                                 MinimalRebuild="true"
                                 BasicRuntimeChecks="3"
@@ -127 +127 @@
                                 Name="VCCLCompilerTool"
                                 AdditionalIncludeDirectories="$(QTDIR)\include"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;THEMES_EXPORTS;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;QT_THREAD_SUPPORT;_CRT_SECURE_NO_DEPRECATE"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;THEMES_EXPORTS;HAVE_CG_RUNTIME;QT_THREAD_SUPPORT;_CRT_SECURE_NO_DEPRECATE"
                                 RuntimeLibrary="2"
                                 BufferSecurityCheck="false"

trunk/jahwidgets/src/qt3/widgets/timelineSlider.cpp

@@ -1078 +1078 @@
                 m_impl->tracking = PrivateTimeline::VALUE;
         }
-        else if ( m_impl->hitInRect( e->pos() ) )
+        else if ( m_impl->inRect().contains( e->pos() ) )       // hitInRect -> InRect
         {
                 m_impl->mouseDownValue = activeInValue();
@@ -1084 +1084 @@
                 setSelectedPoint( m_impl->activeRange->in );
         }
-        else if ( m_impl->hitOutRect( e->pos() ) )
+        else if ( m_impl->outRect().contains( e->pos() ) )      // hitOutRect -> OutRect
         {
                 m_impl->mouseDownValue = activeOutValue();

trunk/jahwidgets/src/qt3/widgets/widgets_vc80.vcproj

@@ -42 +42 @@
                                 Optimization="0"
                                 AdditionalIncludeDirectories=""$(QTDIR)\include";"C:\Boost\include\boost-1_33_1";C:\Python24\include;"$(OPENLIBRARIES_INCLUDE_PATH)";"C:\Program Files\NVIDIA Corporation\Cg\include";..;.\tmp\moc"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WIDGETS_EXPORTS;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;QT_THREAD_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAVE_GL_GLEW_H"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WIDGETS_EXPORTS;HAVE_CG_RUNTIME;QT_THREAD_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAVE_GL_GLEW_H"
                                 MinimalRebuild="true"
                                 BasicRuntimeChecks="3"
@@ -128 +128 @@
                                 Name="VCCLCompilerTool"
                                 AdditionalIncludeDirectories=""$(QTDIR)\include";"C:\Boost\include\boost-1_33_1";C:\Python24\include;"$(OPENLIBRARIES_INCLUDE_PATH)";"C:\Program Files\NVIDIA Corporation\Cg\include";..;.\tmp\moc"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WIDGETS_EXPORTS;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;QT_THREAD_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAVE_GL_GLEW_H"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WIDGETS_EXPORTS;HAVE_CG_RUNTIME;QT_THREAD_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAVE_GL_GLEW_H"
                                 RuntimeLibrary="2"
                                 BufferSecurityCheck="false"

trunk/jahwidgets/src/qt3/wrapper/wrapper_vc80.vcproj

@@ -42 +42 @@
                                 Optimization="0"
                                 AdditionalIncludeDirectories="$(QTDIR)\include;"C:\Boost\include\boost-1_33_1";C:\Python24\include;$(OPENLIBRARIES_INCLUDE_PATH);"C:\Program Files\NVIDIA Corporation\Cg\include";..;./tmp/moc"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WRAPPER_EXPORTS;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;QT_THREAD_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAVE_GL_GLEW_H"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WRAPPER_EXPORTS;HAVE_CG_RUNTIME;QT_THREAD_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAVE_GL_GLEW_H"
                                 MinimalRebuild="true"
                                 BasicRuntimeChecks="3"
@@ -127 +127 @@
                                 Name="VCCLCompilerTool"
                                 AdditionalIncludeDirectories="$(QTDIR)\include;"C:\Boost\include\boost-1_33_1";C:\Python24\include;$(OPENLIBRARIES_INCLUDE_PATH);"C:\Program Files\NVIDIA Corporation\Cg\include";..;./tmp/moc"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WRAPPER_EXPORTS;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;QT_THREAD_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAVE_GL_GLEW_H"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WRAPPER_EXPORTS;HAVE_CG_RUNTIME;QT_THREAD_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAVE_GL_GLEW_H"
                                 RuntimeLibrary="2"
                                 BufferSecurityCheck="false"
@@ -235 +235 @@
                         </File>
                         <File
+                                RelativePath=".\settings.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\splitter.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\utils\thread_util.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\settings.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\splitter.cpp"
                                 >
                         </File>
@@ -359 +359 @@
                         </File>
                         <File
-                                RelativePath="..\utils\thread_util.hpp"
-                                >
-                        </File>
-                        <File
                                 RelativePath=".\settings.hpp"
                                 >
@@ -398 +394 @@
                         <File
                                 RelativePath="..\utils\string_utils.hpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\utils\thread_util.hpp"
                                 >
                         </File>