r7398 - in mugshot-client/trunk: common/firefox/src windows windows/HippoCommon windows/HippoExplorer windows/HippoFirefox windows/HippoIpc windows/HippoUI windows/Sheets windows/WiXInstaller windows/airbag windows/cairo windows/dependencies windows/glib-genmarshal windows/libcroco windows/libddm windows/libglib windows/libgmodule windows/libgobject windows/libgthread windows/libpango windows/libpangocairo windows/libpangowin32 windows/loudmouth
- From: commits mugshot org
- To: online-desktop-list gnome org
- Subject: r7398 - in mugshot-client/trunk: common/firefox/src windows windows/HippoCommon windows/HippoExplorer windows/HippoFirefox windows/HippoIpc windows/HippoUI windows/Sheets windows/WiXInstaller windows/airbag windows/cairo windows/dependencies windows/glib-genmarshal windows/libcroco windows/libddm windows/libglib windows/libgmodule windows/libgobject windows/libgthread windows/libpango windows/libpangocairo windows/libpangowin32 windows/loudmouth
- Date: Wed, 26 Mar 2008 16:34:47 -0500 (CDT)
Author: otaylor
Date: 2008-03-26 16:34:45 -0500 (Wed, 26 Mar 2008)
New Revision: 7398
Added:
mugshot-client/trunk/windows/glib-genmarshal/
mugshot-client/trunk/windows/glib-genmarshal/glib-genmarshal.vcproj
mugshot-client/trunk/windows/libcroco/
Modified:
mugshot-client/trunk/common/firefox/src/hippoControl.cpp
mugshot-client/trunk/common/firefox/src/hippoModule.cpp
mugshot-client/trunk/windows/DumbHippo.sln
mugshot-client/trunk/windows/HippoCommon/HippoCommon.vcproj
mugshot-client/trunk/windows/HippoCommon/HippoCommon.vsprops
mugshot-client/trunk/windows/HippoCommon/genmarshal.bat
mugshot-client/trunk/windows/HippoExplorer/HippoExplorer.vsprops
mugshot-client/trunk/windows/HippoFirefox/HippoFirefox.vsprops
mugshot-client/trunk/windows/HippoIpc/HippoIpc.vsprops
mugshot-client/trunk/windows/HippoUI/HippoCanvas.cpp
mugshot-client/trunk/windows/HippoUI/HippoCanvas.h
mugshot-client/trunk/windows/HippoUI/HippoCanvasControl.cpp
mugshot-client/trunk/windows/HippoUI/HippoCanvasControl.h
mugshot-client/trunk/windows/HippoUI/HippoCanvasWidgets.cpp
mugshot-client/trunk/windows/HippoUI/HippoPlatformImpl.cpp
mugshot-client/trunk/windows/HippoUI/HippoUI.h
mugshot-client/trunk/windows/HippoUI/HippoUI.vsprops
mugshot-client/trunk/windows/HippoUI/HippoWindowWin.cpp
mugshot-client/trunk/windows/HippoUI/HippoWindowWin.h
mugshot-client/trunk/windows/HippoUI/Version.h
mugshot-client/trunk/windows/Sheets/HippoDebug.vsprops
mugshot-client/trunk/windows/WiXInstaller/Components.wxs
mugshot-client/trunk/windows/WiXInstaller/DumbHippo.wxs
mugshot-client/trunk/windows/airbag/airbag.vcproj
mugshot-client/trunk/windows/airbag/airbag.vsprops
mugshot-client/trunk/windows/cairo/cairo.vsprops
mugshot-client/trunk/windows/dependencies/
mugshot-client/trunk/windows/libddm/
mugshot-client/trunk/windows/libddm/genmarshal.bat
mugshot-client/trunk/windows/libddm/libddm.vcproj
mugshot-client/trunk/windows/libddm/libddm.vsprops
mugshot-client/trunk/windows/libglib/libglib.vsprops
mugshot-client/trunk/windows/libgmodule/libgmodule.vsprops
mugshot-client/trunk/windows/libgobject/libgobject.vsprops
mugshot-client/trunk/windows/libgthread/libgthread.vsprops
mugshot-client/trunk/windows/libpango/libpango.vsprops
mugshot-client/trunk/windows/libpangocairo/libpangocairo.vsprops
mugshot-client/trunk/windows/libpangowin32/libpangowin32.vsprops
mugshot-client/trunk/windows/loudmouth/loudmouth.vsprops
Log:
* Get things building again
* Add theme support to the windows canvas infrastructure
* Use stacker.css for the theme for the stacker windows
* Update version to test installer (seems to work fine)
Modified: mugshot-client/trunk/common/firefox/src/hippoControl.cpp
===================================================================
--- mugshot-client/trunk/common/firefox/src/hippoControl.cpp 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/common/firefox/src/hippoControl.cpp 2008-03-26 21:34:45 UTC (rev 7398)
@@ -1,6 +1,8 @@
/* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#ifdef HIPPO_OS_LINUX
#include <glib.h>
@@ -142,6 +144,7 @@
return NS_OK;
}
+#ifdef HIPPO_OS_LINUX
static nsIWidget* GetMainWidget(nsIDOMWindow* aWindow)
{
/* The window ID that we want to pass to the Mugshot client is
@@ -183,6 +186,7 @@
return NULL;
#endif
}
+#endif
/* void setListener (in hippoIControlListener listener); */
NS_IMETHODIMP hippoControl::SetWindow(nsIDOMWindow *window)
Modified: mugshot-client/trunk/common/firefox/src/hippoModule.cpp
===================================================================
--- mugshot-client/trunk/common/firefox/src/hippoModule.cpp 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/common/firefox/src/hippoModule.cpp 2008-03-26 21:34:45 UTC (rev 7398)
@@ -1,6 +1,8 @@
/* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
#include "nspr.h"
#include "nsCOMPtr.h"
Modified: mugshot-client/trunk/windows/DumbHippo.sln
===================================================================
--- mugshot-client/trunk/windows/DumbHippo.sln 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/DumbHippo.sln 2008-03-26 21:34:45 UTC (rev 7398)
@@ -22,6 +22,7 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loudmouth", "loudmouth\loudmouth.vcproj", "{E02F6EA7-65C3-4D2A-919F-D022D6C26DFA}"
ProjectSection(ProjectDependencies) = postProject
{923DC368-46A9-4977-B827-75797CC259E3} = {923DC368-46A9-4977-B827-75797CC259E3}
+ {44873A1B-D052-4875-ABCC-8878555D444F} = {44873A1B-D052-4875-ABCC-8878555D444F}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HippoShellExt", "HippoShellExt\HippoShellExt.vcproj", "{AE309CA4-B4AA-44A8-99D9-CA840CBFF055}"
@@ -45,12 +46,14 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HippoCommon", "HippoCommon\HippoCommon.vcproj", "{2F331475-82BE-44AC-B6DD-D430C758BC7B}"
ProjectSection(ProjectDependencies) = postProject
+ {EA2B7945-E113-405C-8C0D-78CFC11710E6} = {EA2B7945-E113-405C-8C0D-78CFC11710E6}
{923DC368-46A9-4977-B827-75797CC259E3} = {923DC368-46A9-4977-B827-75797CC259E3}
- {808500B7-968D-4493-9461-D32A4F68DBEF} = {808500B7-968D-4493-9461-D32A4F68DBEF}
+ {7D54C7A0-178C-4A5D-B91E-649B7AEED42E} = {7D54C7A0-178C-4A5D-B91E-649B7AEED42E}
+ {4D10CBD8-0B29-44E5-875B-5871FCA11F74} = {4D10CBD8-0B29-44E5-875B-5871FCA11F74}
{A0F265E0-4510-4178-B365-A4581C74EA51} = {A0F265E0-4510-4178-B365-A4581C74EA51}
{57B7A7BF-F5B6-481E-886C-4EF0FA782301} = {57B7A7BF-F5B6-481E-886C-4EF0FA782301}
+ {808500B7-968D-4493-9461-D32A4F68DBEF} = {808500B7-968D-4493-9461-D32A4F68DBEF}
{E02F6EA7-65C3-4D2A-919F-D022D6C26DFA} = {E02F6EA7-65C3-4D2A-919F-D022D6C26DFA}
- {7D54C7A0-178C-4A5D-B91E-649B7AEED42E} = {7D54C7A0-178C-4A5D-B91E-649B7AEED42E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HippoIpc", "HippoIpc\HippoIpc.vcproj", "{90FE4378-3E7D-4C9D-9509-5F551B00515E}"
@@ -117,7 +120,18 @@
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libddm", "libddm\libddm.vcproj", "{808500B7-968D-4493-9461-D32A4F68DBEF}"
+ ProjectSection(ProjectDependencies) = postProject
+ {4D10CBD8-0B29-44E5-875B-5871FCA11F74} = {4D10CBD8-0B29-44E5-875B-5871FCA11F74}
+ {44873A1B-D052-4875-ABCC-8878555D444F} = {44873A1B-D052-4875-ABCC-8878555D444F}
+ EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcroco", "libcroco\libcroco.vcproj", "{EA2B7945-E113-405C-8C0D-78CFC11710E6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-genmarshal", "glib-genmarshal\glib-genmarshal.vcproj", "{4D10CBD8-0B29-44E5-875B-5871FCA11F74}"
+ ProjectSection(ProjectDependencies) = postProject
+ {44873A1B-D052-4875-ABCC-8878555D444F} = {44873A1B-D052-4875-ABCC-8878555D444F}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -215,6 +229,14 @@
{808500B7-968D-4493-9461-D32A4F68DBEF}.Debug|Win32.Build.0 = Debug|Win32
{808500B7-968D-4493-9461-D32A4F68DBEF}.Release|Win32.ActiveCfg = Release|Win32
{808500B7-968D-4493-9461-D32A4F68DBEF}.Release|Win32.Build.0 = Release|Win32
+ {EA2B7945-E113-405C-8C0D-78CFC11710E6}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EA2B7945-E113-405C-8C0D-78CFC11710E6}.Debug|Win32.Build.0 = Debug|Win32
+ {EA2B7945-E113-405C-8C0D-78CFC11710E6}.Release|Win32.ActiveCfg = Release|Win32
+ {EA2B7945-E113-405C-8C0D-78CFC11710E6}.Release|Win32.Build.0 = Release|Win32
+ {4D10CBD8-0B29-44E5-875B-5871FCA11F74}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4D10CBD8-0B29-44E5-875B-5871FCA11F74}.Debug|Win32.Build.0 = Debug|Win32
+ {4D10CBD8-0B29-44E5-875B-5871FCA11F74}.Release|Win32.ActiveCfg = Release|Win32
+ {4D10CBD8-0B29-44E5-875B-5871FCA11F74}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: mugshot-client/trunk/windows/HippoCommon/HippoCommon.vcproj
===================================================================
--- mugshot-client/trunk/windows/HippoCommon/HippoCommon.vcproj 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/HippoCommon/HippoCommon.vcproj 2008-03-26 21:34:45 UTC (rev 7398)
@@ -294,7 +294,7 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="genmarshal.bat
"
+ CommandLine="genmarshal.bat "$(OutDir)"
"
Outputs="hippo-canvas-marshal.c;hippo-canvas-marshal.h"
/>
</FileConfiguration>
@@ -303,7 +303,7 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="genmarshal.bat
"
+ CommandLine="genmarshal.bat "$(OutDir)"
"
Outputs="hippo-canvas-marshal.c;hippo-canvas-marshal.h"
/>
</FileConfiguration>
@@ -337,6 +337,14 @@
>
</File>
<File
+ RelativePath="..\..\canvas\common\hippo\hippo-canvas-theme-engine.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\canvas\common\hippo\hippo-canvas-theme.c"
+ >
+ </File>
+ <File
RelativePath="..\..\common\stacker\hippo-canvas-thumbnail.c"
>
</File>
@@ -408,7 +416,7 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="genmarshal.bat
"
+ CommandLine="genmarshal.bat "$(OutDir)"
"
Outputs="hippo-engine-marshal.c;hippo-engine-marshal.h"
/>
</FileConfiguration>
@@ -417,7 +425,7 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="genmarshal.bat
"
+ CommandLine="genmarshal.bat "$(OutDir)"
"
Outputs="hippo-engine-marshal.c;hippo-engine-marshal.h"
/>
</FileConfiguration>
@@ -486,7 +494,7 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="genmarshal.bat
"
+ CommandLine="genmarshal.bat "$(OutDir)"
"
Outputs="hippo-stacker-marshal.c;hippo-stacker-marshal.h"
/>
</FileConfiguration>
@@ -495,7 +503,7 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="genmarshal.bat
"
+ CommandLine="genmarshal.bat "$(OutDir)"
"
Outputs="hippo-stacker-marshal.c;hippo-stacker-marshal.h"
/>
</FileConfiguration>
@@ -524,6 +532,28 @@
RelativePath="..\..\..\desktop-data-model\engine\hippo-xml-utils.c"
>
</File>
+ <File
+ RelativePath="..\..\common\stacker\stacker.css"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="copy ..\..\common\stacker\stacker.css "$(OutDir)\stacker.css""
+ Outputs="$(OutDir)\stacker.css"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="copy ..\..\common\stacker\stacker.css "$(OutDir)\stacker.css""
+ Outputs="$(OutDir)\stacker.css"
+ />
+ </FileConfiguration>
+ </File>
</Filter>
<Filter
Name="Header Files"
@@ -715,6 +745,18 @@
>
</File>
<File
+ RelativePath="..\..\canvas\common\hippo\hippo-canvas-theme-engine.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\canvas\common\hippo\hippo-canvas-theme-internal.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\canvas\common\hippo\hippo-canvas-theme.h"
+ >
+ </File>
+ <File
RelativePath="..\..\common\stacker\hippo-canvas-thumbnail.h"
>
</File>
Modified: mugshot-client/trunk/windows/HippoCommon/HippoCommon.vsprops
===================================================================
--- mugshot-client/trunk/windows/HippoCommon/HippoCommon.vsprops 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/HippoCommon/HippoCommon.vsprops 2008-03-26 21:34:45 UTC (rev 7398)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../HippoUtil;../cairo;../../../mugshot-dependencies/cairo/src;../../../mugshot-dependencies/glib;../../../mugshot-dependencies/glib/glib;../../../mugshot-dependencies/pango;../libglib;../../mugshot-dependencies/windows-binary/gettext/include;../../mugshot-dependencies/windows-binary/jpeg/include;"../../../desktop-data-model";../../common;../../../mugshot-dependencies/loudmouth;../../canvas/common;../../../mugshot-dependencies/hippo/generated"
+ AdditionalIncludeDirectories=".;../HippoUtil;../cairo;"../../../mugshot-dependencies/cairo/src";"../../../mugshot-dependencies/glib";"../../../mugshot-dependencies/glib/glib";"../../../mugshot-dependencies/pango";"../../../mugshot-dependencies/libcroco/src";../libglib;"../../../mugshot-dependencies/windows-binary/gettext/include";"../../../mugshot-dependencies/windows-binary/jpeg/include";"../../../desktop-data-model";../../common;"../../../mugshot-dependencies/loudmouth";../../canvas/common;"../../../mugshot-dependencies/hippo/generated""
PreprocessorDefinitions="DDM_I_KNOW_THIS_IS_UNSTABLE"
DisableSpecificWarnings="4311;4244;4267"
/>
Modified: mugshot-client/trunk/windows/HippoCommon/genmarshal.bat
===================================================================
--- mugshot-client/trunk/windows/HippoCommon/genmarshal.bat 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/HippoCommon/genmarshal.bat 2008-03-26 21:34:45 UTC (rev 7398)
@@ -1,6 +1,6 @@
@echo off
PATH=%PATH%;..\dependencies
-set genmarshal=..\dependencies\glib\bin\glib-genmarshal
+set genmarshal=%1\glib-genmarshal
set source=..\..\..\desktop-data-model\engine\hippo-engine-marshal.list
Modified: mugshot-client/trunk/windows/HippoExplorer/HippoExplorer.vsprops
===================================================================
--- mugshot-client/trunk/windows/HippoExplorer/HippoExplorer.vsprops 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/HippoExplorer/HippoExplorer.vsprops 2008-03-26 21:34:45 UTC (rev 7398)
@@ -7,7 +7,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../HippoUtil;../../../mugshot-dependencies/hippoipc;../HippoIpc"
+ AdditionalIncludeDirectories="../HippoUtil;../../common/hippoipc;../HippoIpc"
PreprocessorDefinitions="NOMINMAX"
/>
<Tool
Modified: mugshot-client/trunk/windows/HippoFirefox/HippoFirefox.vsprops
===================================================================
--- mugshot-client/trunk/windows/HippoFirefox/HippoFirefox.vsprops 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/HippoFirefox/HippoFirefox.vsprops 2008-03-26 21:34:45 UTC (rev 7398)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""c:\Program Files\gecko-sdk\include";"../../../mugshot-dependencies/firefox/gecko-private/include";../../../mugshot-dependencies/hippoipc;../HippoUtil;../HippoIpc;"$(IntDir)""
+ AdditionalIncludeDirectories=""c:\Program Files\gecko-sdk\include";"../../common/firefox/gecko-private/include";../../common/hippoipc;../HippoUtil;../HippoIpc;"$(IntDir)""
PreprocessorDefinitions="HIPPO_OS_WINDOWS"
/>
<Tool
Modified: mugshot-client/trunk/windows/HippoIpc/HippoIpc.vsprops
===================================================================
--- mugshot-client/trunk/windows/HippoIpc/HippoIpc.vsprops 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/HippoIpc/HippoIpc.vsprops 2008-03-26 21:34:45 UTC (rev 7398)
@@ -7,6 +7,6 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../mugshot-dependencies/hippoipc;../HippoUtil"
+ AdditionalIncludeDirectories="../../common/hippoipc;../HippoUtil"
/>
</VisualStudioPropertySheet>
Modified: mugshot-client/trunk/windows/HippoUI/HippoCanvas.cpp
===================================================================
--- mugshot-client/trunk/windows/HippoUI/HippoCanvas.cpp 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/HippoUI/HippoCanvas.cpp 2008-03-26 21:34:45 UTC (rev 7398)
@@ -18,6 +18,8 @@
#define STRICT
#include <pango/pangocairo.h>
+#include <hippo/hippo-canvas-style.h>
+
typedef struct _HippoCanvasContextWinClass HippoCanvasContextWinClass;
#define HIPPO_TYPE_CANVAS_CONTEXT_WIN (hippo_canvas_context_win_get_type ())
@@ -37,6 +39,7 @@
static bool hippo_canvas_context_win_handle_notification (HippoCanvasContextWin *context_win,
HWND controlWindow,
UINT notification);
+static void hippo_canvas_context_win_clear_style (HippoCanvasContextWin *context_win);
HippoCanvas::HippoCanvas()
: canvasWidthReq_(0), canvasHeightReq_(0), canvasX_(0), canvasY_(0), hscrollNeeded_(false), vscrollNeeded_(false),
@@ -116,15 +119,26 @@
slot(this, &HippoCanvas::onRootPaintNeeded));
rootTooltipChanged_.connect(G_OBJECT(item), "tooltip-changed",
slot(this, &HippoCanvas::onRootTooltipChanged));
- if (isCreated()) {
- g_assert(HIPPO_IS_CANVAS_CONTEXT(context_));
- hippo_canvas_item_set_context(item, HIPPO_CANVAS_CONTEXT(context_));
- }
+ hippo_canvas_item_set_context(item, HIPPO_CANVAS_CONTEXT(context_));
}
markRequestChanged();
}
void
+HippoCanvas::setTheme(HippoCanvasTheme *theme)
+{
+ if (theme_ == theme)
+ return;
+
+ theme_ = theme;
+
+ hippo_canvas_context_win_clear_style(context_);
+ hippo_canvas_context_emit_style_changed(HIPPO_CANVAS_CONTEXT(context_), TRUE);
+
+ markRequestChanged();
+}
+
+void
HippoCanvas::setScrollbarPolicy(HippoOrientation orientation,
HippoScrollbarPolicy policy)
{
@@ -151,13 +165,6 @@
tooltip_->setForWindow(window_);
tooltip_->create();
-
- // this should register any embedded controls, set their parents,
- // which as a side effect should create them all
- if (root_ != (HippoCanvasItem*) NULL) {
- g_assert(HIPPO_IS_CANVAS_CONTEXT(context_));
- hippo_canvas_item_set_context(root_, HIPPO_CANVAS_CONTEXT(context_));
- }
}
void
@@ -1017,6 +1024,9 @@
const char *image_name);
static guint32 hippo_canvas_context_win_get_color (HippoCanvasContext *context,
HippoStockColor color);
+static HippoCanvasStyle *hippo_canvas_context_win_get_style (HippoCanvasContext *context);
+static double hippo_canvas_context_win_get_resolution (HippoCanvasContext *context);
+static PangoFontDescription *hippo_canvas_context_win_get_font (HippoCanvasContext *context);
static void hippo_canvas_context_win_register_widget_item (HippoCanvasContext *context,
HippoCanvasItem *item);
static void hippo_canvas_context_win_unregister_widget_item (HippoCanvasContext *context,
@@ -1033,6 +1043,7 @@
HippoCanvasPointer pointer;
GSList *control_items;
PangoContext *pango;
+ HippoCanvasStyle *style;
};
struct _HippoCanvasContextWinClass {
@@ -1096,6 +1107,9 @@
klass->create_layout = hippo_canvas_context_win_create_layout;
klass->load_image = hippo_canvas_context_win_load_image;
klass->get_color = hippo_canvas_context_win_get_color;
+ klass->get_resolution = hippo_canvas_context_win_get_resolution;
+ klass->get_style = hippo_canvas_context_win_get_style;
+ klass->get_font = hippo_canvas_context_win_get_font;
klass->register_widget_item = hippo_canvas_context_win_register_widget_item;
klass->unregister_widget_item = hippo_canvas_context_win_unregister_widget_item;
klass->translate_to_widget = hippo_canvas_context_win_translate_to_widget;
@@ -1111,6 +1125,8 @@
canvas_win->pango = NULL;
}
+ hippo_canvas_context_win_clear_style(canvas_win);
+
G_OBJECT_CLASS(hippo_canvas_context_win_parent_class)->dispose(object);
}
@@ -1226,6 +1242,32 @@
return 0;
}
+static HippoCanvasStyle *
+hippo_canvas_context_win_get_style(HippoCanvasContext *context)
+{
+ HippoCanvasContextWin *canvas_win = HIPPO_CANVAS_CONTEXT_WIN(context);
+
+ if (canvas_win->style == NULL)
+ canvas_win->style = hippo_canvas_style_new(context, NULL, canvas_win->canvas->getTheme(), G_TYPE_NONE, NULL, NULL);
+
+ return canvas_win->style;
+}
+
+static double
+hippo_canvas_context_win_get_resolution(HippoCanvasContext *context)
+{
+/* HippoCanvasContextWin *canvas_win = HIPPO_CANVAS_CONTEXT_WIN(context); */
+ return 96;
+}
+
+static PangoFontDescription *
+hippo_canvas_context_win_get_font(HippoCanvasContext *context)
+{
+ HippoCanvasContextWin *canvas_win = HIPPO_CANVAS_CONTEXT_WIN(context);
+
+ return pango_context_get_font_description(canvas_win->pango);
+}
+
static void
clear_control(RegisteredControlItem *citem)
{
@@ -1399,6 +1441,15 @@
}
static void
+hippo_canvas_context_win_clear_style(HippoCanvasContextWin *context_win)
+{
+ if (context_win->style) {
+ g_object_unref((void*)context_win->style);
+ context_win->style = NULL;
+ }
+}
+
+static void
hippo_canvas_context_win_create_controls(HippoCanvasContextWin *context_win)
{
RegisteredControlItem *citem;
Modified: mugshot-client/trunk/windows/HippoUI/HippoCanvas.h
===================================================================
--- mugshot-client/trunk/windows/HippoUI/HippoCanvas.h 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/HippoUI/HippoCanvas.h 2008-03-26 21:34:45 UTC (rev 7398)
@@ -21,12 +21,15 @@
HippoCanvas();
void setRoot(HippoCanvasItem *item);
+ void setTheme(HippoCanvasTheme *theme);
void setScrollbarPolicy(HippoOrientation orientation,
HippoScrollbarPolicy policy);
void getCanvasOrigin(int *x_p, int *y_p);
void getViewport(RECT *rect_p);
+ HippoCanvasTheme *getTheme() { return theme_; }
+
protected:
virtual int getWidthRequestImpl();
virtual int getHeightRequestImpl(int forWidth);
@@ -75,6 +78,7 @@
GConnection0<void> rootRequestChanged_;
GConnection0<void> rootTooltipChanged_;
HippoGObjectPtr<HippoCanvasItem> root_;
+ HippoGObjectPtr<HippoCanvasTheme> theme_;
HippoGObjectPtr<HippoCanvasContextWin> context_;
HippoPtr<HippoScrollbar> hscroll_;
HippoPtr<HippoScrollbar> vscroll_;
Modified: mugshot-client/trunk/windows/HippoUI/HippoCanvasControl.cpp
===================================================================
--- mugshot-client/trunk/windows/HippoUI/HippoCanvasControl.cpp 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/HippoUI/HippoCanvasControl.cpp 2008-03-26 21:34:45 UTC (rev 7398)
@@ -209,6 +209,27 @@
control->control->sizeAllocate(control_x + x, control_y + y, w, h);
}
+static void
+on_context_style_changed(HippoCanvasContext *context,
+ gboolean resize_needed,
+ HippoCanvasControl *control)
+{
+ HippoCanvasStyle *style = NULL;
+ HippoCanvasTheme *theme = NULL;
+
+ if (context != NULL)
+ style = hippo_canvas_context_get_style(context);
+ if (style != NULL)
+ theme = hippo_canvas_style_get_theme(style);
+
+ if (theme != control->theme) {
+ control->theme = theme;
+
+ if (HIPPO_CANVAS_CONTROL_GET_CLASS(control)->theme_changed)
+ HIPPO_CANVAS_CONTROL_GET_CLASS(control)->theme_changed(control);
+ }
+}
+
static void
hippo_canvas_control_set_context(HippoCanvasItem *item,
HippoCanvasContext *context)
@@ -218,15 +239,25 @@
if (context == box->context)
return;
- if (box->context)
+ if (box->context) {
hippo_canvas_context_unregister_widget_item(box->context, item);
+ g_signal_handlers_disconnect_by_func(box->context,
+ (gpointer)on_context_style_changed,
+ context);
+ }
+
/* chain up, which invalidates our old context */
item_parent_class->set_context(item, context);
if (box->context) {
hippo_canvas_context_register_widget_item(box->context, item);
+
+ g_signal_connect(box->context, "style-changed",
+ G_CALLBACK(on_context_style_changed), item);
}
+
+ on_context_style_changed(context, TRUE, HIPPO_CANVAS_CONTROL(item));
}
static void
Modified: mugshot-client/trunk/windows/HippoUI/HippoCanvasControl.h
===================================================================
--- mugshot-client/trunk/windows/HippoUI/HippoCanvasControl.h 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/HippoUI/HippoCanvasControl.h 2008-03-26 21:34:45 UTC (rev 7398)
@@ -24,10 +24,13 @@
struct _HippoCanvasControl {
HippoCanvasBox box;
HippoAbstractControl *control;
+ HippoCanvasTheme *theme;
};
struct _HippoCanvasControlClass {
HippoCanvasBoxClass parent_class;
+
+ void (*theme_changed) (HippoCanvasControl *control);
};
GType hippo_canvas_control_get_type (void) G_GNUC_CONST;
Modified: mugshot-client/trunk/windows/HippoUI/HippoCanvasWidgets.cpp
===================================================================
--- mugshot-client/trunk/windows/HippoUI/HippoCanvasWidgets.cpp 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/HippoUI/HippoCanvasWidgets.cpp 2008-03-26 21:34:45 UTC (rev 7398)
@@ -16,10 +16,8 @@
struct _HippoCanvas##Camel { HippoCanvasControl parent; }; \
struct _HippoCanvas##Camel##Class { HippoCanvasControlClass parent; }; \
static void hippo_canvas_##lower##_init(HippoCanvas##Camel *lower) {} \
- static void hippo_canvas_##lower##_class_init(HippoCanvas##Camel##Class *lower) {} \
G_DEFINE_TYPE(HippoCanvas##Camel, hippo_canvas_##lower, HIPPO_TYPE_CANVAS_CONTROL)
-
HIPPO_DEFINE_CONTROL_ITEM(scrollbars, Scrollbars);
/*************************************************************************/
@@ -170,6 +168,22 @@
return (HippoCanvas *)control;
}
+static void
+hippo_canvas_scrollbars_theme_changed(HippoCanvasControl *control_item)
+{
+ HippoCanvas *canvas = scrollbars_get_control(HIPPO_CANVAS_SCROLLBARS(control_item));
+
+ canvas->setTheme(control_item->theme);
+}
+
+static void
+hippo_canvas_scrollbars_class_init(HippoCanvasScrollbarsClass *klass)
+{
+ HippoCanvasControlClass *control_class = HIPPO_CANVAS_CONTROL_CLASS(klass);
+
+ control_class->theme_changed = hippo_canvas_scrollbars_theme_changed;
+}
+
HippoCanvasItem*
hippo_canvas_scrollbars_new(void)
{
@@ -183,6 +197,7 @@
item = HIPPO_CANVAS_ITEM(g_object_new(HIPPO_TYPE_CANVAS_SCROLLBARS,
"control", canvas,
NULL));
+
canvas->Release();
return item;
Modified: mugshot-client/trunk/windows/HippoUI/HippoPlatformImpl.cpp
===================================================================
--- mugshot-client/trunk/windows/HippoUI/HippoPlatformImpl.cpp 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/HippoUI/HippoPlatformImpl.cpp 2008-03-26 21:34:45 UTC (rev 7398)
@@ -10,6 +10,7 @@
#include <ShlObj.h>
#include <Windows.h>
#include <mshtml.h>
+#include <hippo/hippo-canvas-theme.h>
#include <engine/hippo-engine-basics.h>
#include <stacker/hippo-stacker-platform.h>
@@ -76,6 +77,7 @@
HippoPreferences *preferences;
HippoHTTP *http;
HippoUI *ui;
+ HippoCanvasTheme *theme;
};
struct _HippoPlatformImplClass {
@@ -119,7 +121,6 @@
static void
hippo_platform_impl_init(HippoPlatformImpl *impl)
{
-
}
static void
@@ -146,6 +147,9 @@
{
HippoPlatformImpl *impl = HIPPO_PLATFORM_IMPL(object);
+ if (impl->theme)
+ g_object_unref(impl->theme);
+
g_free(impl->jabber_resource);
delete impl->preferences;
@@ -557,7 +561,21 @@
static HippoWindow*
hippo_platform_impl_create_window(HippoStackerPlatform *platform)
{
- return hippo_window_win_new(HIPPO_PLATFORM_IMPL(platform)->ui);
+ HippoPlatformImpl *impl = HIPPO_PLATFORM_IMPL(platform);
+
+ HippoWindow *window = hippo_window_win_new(impl->ui);
+
+ if (impl->theme == NULL) {
+ HippoBSTR stylesheet = impl->ui->getBasePath();
+ stylesheet.Append(L"\\stacker.css");
+ HippoUStr stylesheetU(stylesheet);
+
+ impl->theme = hippo_canvas_theme_new(NULL, NULL, stylesheetU.c_str(), NULL);
+ }
+
+ hippo_window_win_set_theme(HIPPO_WINDOW_WIN(window), impl->theme);
+
+ return window;
}
struct TrayIconInfo {
Modified: mugshot-client/trunk/windows/HippoUI/HippoUI.h
===================================================================
--- mugshot-client/trunk/windows/HippoUI/HippoUI.h 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/HippoUI/HippoUI.h 2008-03-26 21:34:45 UTC (rev 7398)
@@ -110,6 +110,7 @@
HWND getWindow() { return window_; }
HICON getSmallIcon() { return smallIcon_; }
HICON getBigIcon() { return bigIcon_; }
+ HippoBSTR getBasePath() throw (std::bad_alloc, HResultException);
private:
class HippoUIUpgradeWindowCallback : public HippoIEWindowCallback
@@ -121,8 +122,6 @@
HippoUI *ui_;
};
- HippoBSTR getBasePath() throw (std::bad_alloc, HResultException);
-
bool registerActive();
bool registerClass();
bool createWindow();
Modified: mugshot-client/trunk/windows/HippoUI/HippoUI.vsprops
===================================================================
--- mugshot-client/trunk/windows/HippoUI/HippoUI.vsprops 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/HippoUI/HippoUI.vsprops 2008-03-26 21:34:45 UTC (rev 7398)
@@ -14,7 +14,7 @@
Name="VCLinkerTool"
AdditionalDependencies="shlwapi.lib ws2_32.lib wininet.lib urlmon.lib advapi32.lib gdi32.lib shell32.lib comctl32.lib jpeg.lib"
OutputFile="$(OutDir)/Mugshot.exe"
- AdditionalLibraryDirectories="../debug;../../mugshot-dependencies/windows-binary/jpeg/lib"
+ AdditionalLibraryDirectories="../debug;../../../mugshot-dependencies/windows-binary/jpeg/lib"
/>
<Tool
Name="VCResourceCompilerTool"
Modified: mugshot-client/trunk/windows/HippoUI/HippoWindowWin.cpp
===================================================================
--- mugshot-client/trunk/windows/HippoUI/HippoWindowWin.cpp 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/HippoUI/HippoWindowWin.cpp 2008-03-26 21:34:45 UTC (rev 7398)
@@ -24,6 +24,7 @@
}
void setContents(HippoCanvasItem *item);
+ void setTheme(HippoCanvasTheme *theme);
void setVisible(bool visible);
void hideToIcon(HippoRectangle *iconRect);
void setRole(HippoWindowRole role);
@@ -223,6 +224,13 @@
return HIPPO_WINDOW(win);
}
+void
+hippo_window_win_set_theme (HippoWindowWin *window_win,
+ HippoCanvasTheme *theme)
+{
+ window_win->impl->setTheme(theme);
+}
+
static void
hippo_window_win_set_property(GObject *object,
guint prop_id,
@@ -390,6 +398,12 @@
contentsControl_->setRoot(item);
}
+void
+HippoWindowImpl::setTheme(HippoCanvasTheme *theme)
+{
+ contentsControl_->setTheme(theme);
+}
+
void
HippoWindowImpl::createChildren()
{
Modified: mugshot-client/trunk/windows/HippoUI/HippoWindowWin.h
===================================================================
--- mugshot-client/trunk/windows/HippoUI/HippoWindowWin.h 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/HippoUI/HippoWindowWin.h 2008-03-26 21:34:45 UTC (rev 7398)
@@ -22,8 +22,9 @@
GType hippo_window_win_get_type (void) G_GNUC_CONST;
HippoWindow* hippo_window_win_new (HippoUI *ui);
+void hippo_window_win_set_theme (HippoWindowWin *window_win,
+ HippoCanvasTheme *theme);
-
G_END_DECLS
#endif /* __HIPPO_WINDOW_WIN_H__ */
Modified: mugshot-client/trunk/windows/HippoUI/Version.h
===================================================================
--- mugshot-client/trunk/windows/HippoUI/Version.h 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/HippoUI/Version.h 2008-03-26 21:34:45 UTC (rev 7398)
@@ -1,2 +1,2 @@
// Always change this and the installer in sync
-static const char *VERSION = "1.1.92";
+static const char *VERSION = "1.1.93";
Modified: mugshot-client/trunk/windows/Sheets/HippoDebug.vsprops
===================================================================
--- mugshot-client/trunk/windows/Sheets/HippoDebug.vsprops 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/Sheets/HippoDebug.vsprops 2008-03-26 21:34:45 UTC (rev 7398)
@@ -14,4 +14,8 @@
RuntimeLibrary="1"
DebugInformationFormat="4"
/>
+ <Tool
+ Name="VCLinkerTool"
+ GenerateDebugInformation="true"
+ />
</VisualStudioPropertySheet>
Modified: mugshot-client/trunk/windows/WiXInstaller/Components.wxs
===================================================================
--- mugshot-client/trunk/windows/WiXInstaller/Components.wxs 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/WiXInstaller/Components.wxs 2008-03-26 21:34:45 UTC (rev 7398)
@@ -90,7 +90,8 @@
<File Id="mugshotExe" Name="Mugshot.exe" src="Mugshot.exe" DiskId="1" Vital="yes">
<Shortcut Id="mugshotShortcut" Directory="ProgramMenuFolder" Name="Mugshot"/>
</File>
- </Component>
+ <File Id="stackerCss" Name="stacker.css" src="stacker.css" DiskId="1" Vital="yes"/>
+ </Component>
<Directory Id="dhImagesDir" Name="Images">
<Component Id="images" Guid="681D6075-3B98-428C-8B73-68D9F15133AD">
Modified: mugshot-client/trunk/windows/WiXInstaller/DumbHippo.wxs
===================================================================
--- mugshot-client/trunk/windows/WiXInstaller/DumbHippo.wxs 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/WiXInstaller/DumbHippo.wxs 2008-03-26 21:34:45 UTC (rev 7398)
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi";>
- <Product Id="7620B5B1-908E-4c3e-A6E0-F335AB06A5D0"
+ <Product Id="5AB1F3C3-972A-4044-B0B7-51BDB6FC6730"
UpgradeCode="9A9721CB-6D56-478C-9AEE-2AAC1D75BA2F"
Name="Mugshot"
Language="1033"
- Version="1.1.92"
+ Version="1.1.93"
Manufacturer="Red Hat">
<Package Id="????????-????-????-????-????????????"
Description="Mugshot client software"
@@ -21,9 +21,9 @@
<Property Id="ARPPRODUCTICON" Value="hippoIcon"/>
<Upgrade Id="9A9721CB-6D56-478C-9AEE-2AAC1D75BA2F">
- <UpgradeVersion Minimum="0" Maximum="1.1.92" Property="DHPREVIOUSVERSIONS"/>
- <UpgradeVersion Minimum="1.1.0" Maximum="1.1.92" Property="DHSAMELICENSE"/>
- <UpgradeVersion Minimum="1.1.92" IncludeMinimum="yes" Property="DHNEWERVERSIONS"/>
+ <UpgradeVersion Minimum="0" Maximum="1.1.93" Property="DHPREVIOUSVERSIONS"/>
+ <UpgradeVersion Minimum="1.1.0" Maximum="1.1.93" Property="DHSAMELICENSE"/>
+ <UpgradeVersion Minimum="1.1.93" IncludeMinimum="yes" Property="DHNEWERVERSIONS"/>
</Upgrade>
<!-- Separate "cabinets" would be used if you broke the installer across floppies ... -->
Modified: mugshot-client/trunk/windows/airbag/airbag.vcproj
===================================================================
--- mugshot-client/trunk/windows/airbag/airbag.vcproj 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/airbag/airbag.vcproj 2008-03-26 21:34:45 UTC (rev 7398)
@@ -135,19 +135,19 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\common\airbag\src\client\windows\sender\crash_report_sender.cc"
+ RelativePath="..\..\..\mugshot-dependencies\airbag\src\client\windows\sender\crash_report_sender.cc"
>
</File>
<File
- RelativePath="..\..\common\airbag\src\client\windows\handler\exception_handler.cc"
+ RelativePath="..\..\..\mugshot-dependencies\airbag\src\client\windows\handler\exception_handler.cc"
>
</File>
<File
- RelativePath="..\..\common\airbag\src\common\windows\guid_string.cc"
+ RelativePath="..\..\..\mugshot-dependencies\airbag\src\common\windows\guid_string.cc"
>
</File>
<File
- RelativePath="..\..\common\airbag\src\common\windows\http_upload.cc"
+ RelativePath="..\..\..\mugshot-dependencies\airbag\src\common\windows\http_upload.cc"
>
</File>
</Filter>
@@ -157,23 +157,23 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath="..\..\common\airbag\src\client\windows\sender\crash_report_sender.h"
+ RelativePath="..\..\..\mugshot-dependencies\airbag\src\client\windows\sender\crash_report_sender.h"
>
</File>
<File
- RelativePath="..\..\common\airbag\src\client\windows\handler\exception_handler.h"
+ RelativePath="..\..\..\mugshot-dependencies\airbag\src\client\windows\handler\exception_handler.h"
>
</File>
<File
- RelativePath="..\..\common\airbag\src\common\windows\guid_string.h"
+ RelativePath="..\..\..\mugshot-dependencies\airbag\src\common\windows\guid_string.h"
>
</File>
<File
- RelativePath="..\..\common\airbag\src\common\windows\http_upload.h"
+ RelativePath="..\..\..\mugshot-dependencies\airbag\src\common\windows\http_upload.h"
>
</File>
<File
- RelativePath="..\..\common\airbag\src\common\windows\string_utils-inl.h"
+ RelativePath="..\..\..\mugshot-dependencies\airbag\src\common\windows\string_utils-inl.h"
>
</File>
</Filter>
Modified: mugshot-client/trunk/windows/airbag/airbag.vsprops
===================================================================
--- mugshot-client/trunk/windows/airbag/airbag.vsprops 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/airbag/airbag.vsprops 2008-03-26 21:34:45 UTC (rev 7398)
@@ -6,6 +6,6 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\common\airbag\src"
+ AdditionalIncludeDirectories="..\..\..\mugshot-dependencies\airbag\src"
/>
</VisualStudioPropertySheet>
Modified: mugshot-client/trunk/windows/cairo/cairo.vsprops
===================================================================
--- mugshot-client/trunk/windows/cairo/cairo.vsprops 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/cairo/cairo.vsprops 2008-03-26 21:34:45 UTC (rev 7398)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;..\..\..\mugshot-dependencies\cairo\src;..\..\..\mugshot-dependencies\cairo\pixman\src;..\..\mugshot-dependencies\windows-binary\libpng\include;..\..\mugshot-dependencies\windows-binary\zlib\include"
+ AdditionalIncludeDirectories=".;..\..\..\mugshot-dependencies\cairo\src;..\..\..\mugshot-dependencies\cairo\pixman\src;..\..\..\mugshot-dependencies\windows-binary\libpng\include;..\..\..\mugshot-dependencies\windows-binary\zlib\include"
PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;BUILDING_CAIRO"
DisableSpecificWarnings="4146;4244;4267;4311"
/>
@@ -14,6 +14,6 @@
Name="VCLinkerTool"
AdditionalDependencies="libpng.lib"
OutputFile="$(OutDir)\libcairo-2.dll"
- AdditionalLibraryDirectories="..\..\mugshot-dependencies\windows-binary\libpng\lib\"
+ AdditionalLibraryDirectories="..\..\..\mugshot-dependencies\windows-binary\libpng\lib\"
/>
</VisualStudioPropertySheet>
Property changes on: mugshot-client/trunk/windows/dependencies
___________________________________________________________________
Name: svn:ignore
+ Debug
Release
Property changes on: mugshot-client/trunk/windows/glib-genmarshal
___________________________________________________________________
Name: svn:ignore
+ Debug
Release
glib-genmarshal.vsprops
Added: mugshot-client/trunk/windows/glib-genmarshal/glib-genmarshal.vcproj
===================================================================
--- mugshot-client/trunk/windows/glib-genmarshal/glib-genmarshal.vcproj 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/glib-genmarshal/glib-genmarshal.vcproj 2008-03-26 21:34:45 UTC (rev 7398)
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="glib-genmarshal"
+ ProjectGUID="{4D10CBD8-0B29-44E5-875B-5871FCA11F74}"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\Sheets\HippoDebug.vsprops;.\glib-genmarshal.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\Sheets\hippoRelease.vsprops;.\glib-genmarshal.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\glib-genmarshal.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Property changes on: mugshot-client/trunk/windows/libcroco
___________________________________________________________________
Name: svn:ignore
+ Debug
Release
libcroco.vcproj
libcroco.vsprops
Property changes on: mugshot-client/trunk/windows/libddm
___________________________________________________________________
Name: svn:ignore
+ Debug
Release
ddm-marshal.c
ddm-marshal.h
Modified: mugshot-client/trunk/windows/libddm/genmarshal.bat
===================================================================
--- mugshot-client/trunk/windows/libddm/genmarshal.bat 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/libddm/genmarshal.bat 2008-03-26 21:34:45 UTC (rev 7398)
@@ -1,6 +1,6 @@
@echo off
PATH=%PATH%;..\dependencies
-set genmarshal=..\dependencies\glib\bin\glib-genmarshal
+set genmarshal=%1\glib-genmarshal
set source=..\..\..\desktop-data-model\ddm\ddm-marshal.list
%genmarshal% --prefix=ddm_marshal --header %source% > ddm-marshal.h
Modified: mugshot-client/trunk/windows/libddm/libddm.vcproj
===================================================================
--- mugshot-client/trunk/windows/libddm/libddm.vcproj 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/libddm/libddm.vcproj 2008-03-26 21:34:45 UTC (rev 7398)
@@ -193,7 +193,7 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="genmarshal.bat
"
+ CommandLine="genmarshal.bat "$(OutDir)"
"
Outputs="ddm-marshal.c;ddm-marshal.h"
/>
</FileConfiguration>
@@ -202,7 +202,7 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="genmarshal.bat
"
+ CommandLine="genmarshal.bat "$(OutDir)"
"
Outputs="ddm-marshal.c;ddm-marshal.h"
/>
</FileConfiguration>
Modified: mugshot-client/trunk/windows/libddm/libddm.vsprops
===================================================================
--- mugshot-client/trunk/windows/libddm/libddm.vsprops 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/libddm/libddm.vsprops 2008-03-26 21:34:45 UTC (rev 7398)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../HippoUtil;../../../mugshot-dependencies/glib;../../../mugshot-dependencies/glib/glib;../libglib;../../mugshot-dependencies/windows-binary/gettext/include;../../common;"../../../desktop-data-model""
+ AdditionalIncludeDirectories=".;../HippoUtil;../../../mugshot-dependencies/glib;../../../mugshot-dependencies/glib/glib;../libglib;../../../mugshot-dependencies/windows-binary/gettext/include;../../common;"../../../desktop-data-model""
PreprocessorDefinitions="DDM_COMPILATION"
DisableSpecificWarnings="4311;4244;4267"
/>
Modified: mugshot-client/trunk/windows/libglib/libglib.vsprops
===================================================================
--- mugshot-client/trunk/windows/libglib/libglib.vsprops 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/libglib/libglib.vsprops 2008-03-26 21:34:45 UTC (rev 7398)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;..\..\..\mugshot-dependencies\glib;..\..\..\mugshot-dependencies\glib\glib;..\..\mugshot-dependencies\windows-binary\gettext\include;..\..\mugshot-dependencies\windows-binary\libiconv\include"
+ AdditionalIncludeDirectories=".;..\..\..\mugshot-dependencies\glib;..\..\..\mugshot-dependencies\glib\glib;..\..\..\mugshot-dependencies\windows-binary\gettext\include;..\..\..\mugshot-dependencies\windows-binary\libiconv\include"
PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;GLIB_COMPILATION"
DisableSpecificWarnings="4018;4244;4267;4311;4312"
/>
@@ -14,7 +14,7 @@
Name="VCLinkerTool"
AdditionalDependencies="iconv.lib intl.lib ws2_32.lib"
OutputFile="$(OutDir)\libglib-2.0-0.dll"
- AdditionalLibraryDirectories="..\..\mugshot-dependencies\windows-binary\libiconv\lib\;..\..\mugshot-dependencies\windows-binary\gettext\lib\"
+ AdditionalLibraryDirectories="..\..\..\mugshot-dependencies\windows-binary\libiconv\lib\;..\..\..\mugshot-dependencies\windows-binary\gettext\lib\"
ModuleDefinitionFile="glib.def"
/>
</VisualStudioPropertySheet>
Modified: mugshot-client/trunk/windows/libgmodule/libgmodule.vsprops
===================================================================
--- mugshot-client/trunk/windows/libgmodule/libgmodule.vsprops 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/libgmodule/libgmodule.vsprops 2008-03-26 21:34:45 UTC (rev 7398)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;..\libglib;..\..\..\mugshot-dependencies\glib;..\..\..\mugshot-dependencies\glib\glib;..\..\mugshot-dependencies\windows-binary\gettext\include;..\..\mugshot-dependencies\windows-binary\libiconv\include"
+ AdditionalIncludeDirectories=".;..\libglib;..\..\..\mugshot-dependencies\glib;..\..\..\mugshot-dependencies\glib\glib;..\..\..\mugshot-dependencies\windows-binary\gettext\include;..\..\..\mugshot-dependencies\windows-binary\libiconv\include"
PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;GMODULE_COMPILATION"
DisableSpecificWarnings="4312;4267"
/>
Modified: mugshot-client/trunk/windows/libgobject/libgobject.vsprops
===================================================================
--- mugshot-client/trunk/windows/libgobject/libgobject.vsprops 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/libgobject/libgobject.vsprops 2008-03-26 21:34:45 UTC (rev 7398)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\libglib\debug;..\libglib;..\..\..\mugshot-dependencies\glib;..\..\..\mugshot-dependencies\glib\glib;..\..\mugshot-dependencies\windows-binary\gettext\include"
+ AdditionalIncludeDirectories="..\libglib\debug;..\libglib;..\..\..\mugshot-dependencies\glib;..\..\..\mugshot-dependencies\glib\glib;..\..\..\mugshot-dependencies\windows-binary\gettext\include"
PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;GOBJECT_COMPILATION"
DisableSpecificWarnings="4018;4244;4267;4311;4312"
/>
Modified: mugshot-client/trunk/windows/libgthread/libgthread.vsprops
===================================================================
--- mugshot-client/trunk/windows/libgthread/libgthread.vsprops 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/libgthread/libgthread.vsprops 2008-03-26 21:34:45 UTC (rev 7398)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\libglib;..\..\..\mugshot-dependencies\glib;..\..\..\mugshot-dependencies\glib\glib;..\..\mugshot-dependencies\windows-binary\gettext\include"
+ AdditionalIncludeDirectories="..\libglib;..\..\..\mugshot-dependencies\glib;..\..\..\mugshot-dependencies\glib\glib;..\..\..\mugshot-dependencies\windows-binary\gettext\include"
PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;GMODULE_COMPILATION"
DisableSpecificWarnings="4311;4312"
/>
Modified: mugshot-client/trunk/windows/libpango/libpango.vsprops
===================================================================
--- mugshot-client/trunk/windows/libpango/libpango.vsprops 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/libpango/libpango.vsprops 2008-03-26 21:34:45 UTC (rev 7398)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../mugshot-dependencies/windows-binary/gettext/include;../../../mugshot-dependencies/glib;../../../mugshot-dependencies/glib/glib;../libglib;../../../mugshot-dependencies/glib/gmodule;../../../mugshot-dependencies/pango/pango;../../../mugshot-dependencies/pango"
+ AdditionalIncludeDirectories=".;../../../mugshot-dependencies/windows-binary/gettext/include;../../../mugshot-dependencies/glib;../../../mugshot-dependencies/glib/glib;../libglib;../../../mugshot-dependencies/glib/gmodule;../../../mugshot-dependencies/pango/pango;../../../mugshot-dependencies/pango"
PreprocessorDefinitions="PANGO_ENABLE_BACKEND;PANGO_ENABLE_ENGINE"
DisableSpecificWarnings="4312;4244;4267"
/>
Modified: mugshot-client/trunk/windows/libpangocairo/libpangocairo.vsprops
===================================================================
--- mugshot-client/trunk/windows/libpangocairo/libpangocairo.vsprops 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/libpangocairo/libpangocairo.vsprops 2008-03-26 21:34:45 UTC (rev 7398)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../libpango;../../mugshot-dependencies/windows-binary/gettext/include;../../../mugshot-dependencies/glib;../../../mugshot-dependencies/glib/glib;../libglib;../cairo;../../../mugshot-dependencies/cairo/src;../../../mugshot-dependencies/glib/gmodule;../../../mugshot-dependencies/pango/pango;../../../mugshot-dependencies/pango"
+ AdditionalIncludeDirectories="../libpango;../../../mugshot-dependencies/windows-binary/gettext/include;../../../mugshot-dependencies/glib;../../../mugshot-dependencies/glib/glib;../libglib;../cairo;../../../mugshot-dependencies/cairo/src;../../../mugshot-dependencies/glib/gmodule;../../../mugshot-dependencies/pango/pango;../../../mugshot-dependencies/pango"
PreprocessorDefinitions="PANGO_ENABLE_BACKEND;PANGO_ENABLE_ENGINE"
DisableSpecificWarnings="4312;4244"
/>
Modified: mugshot-client/trunk/windows/libpangowin32/libpangowin32.vsprops
===================================================================
--- mugshot-client/trunk/windows/libpangowin32/libpangowin32.vsprops 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/libpangowin32/libpangowin32.vsprops 2008-03-26 21:34:45 UTC (rev 7398)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../libpango;../../mugshot-dependencies/windows-binary/gettext/include;../../../mugshot-dependencies/glib;../../../mugshot-dependencies/glib/glib;../libglib;../../../mugshot-dependencies/glib/gmodule;../../../mugshot-dependencies/pango/pango;../../../mugshot-dependencies/pango"
+ AdditionalIncludeDirectories="../libpango;../../../mugshot-dependencies/windows-binary/gettext/include;../../../mugshot-dependencies/glib;../../../mugshot-dependencies/glib/glib;../libglib;../../../mugshot-dependencies/glib/gmodule;../../../mugshot-dependencies/pango/pango;../../../mugshot-dependencies/pango"
PreprocessorDefinitions="PANGO_ENABLE_BACKEND;PANGO_ENABLE_ENGINE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
DisableSpecificWarnings="4312;4244;4267"
/>
Modified: mugshot-client/trunk/windows/loudmouth/loudmouth.vsprops
===================================================================
--- mugshot-client/trunk/windows/loudmouth/loudmouth.vsprops 2008-03-26 21:11:47 UTC (rev 7397)
+++ mugshot-client/trunk/windows/loudmouth/loudmouth.vsprops 2008-03-26 21:34:45 UTC (rev 7398)
@@ -6,15 +6,15 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../mugshot-dependencies/windows-binary/gettext/include;../../../mugshot-dependencies/glib;../../../mugshot-dependencies/glib/glib;../libglib;../../../mugshot-dependencies/loudmouth"
+ AdditionalIncludeDirectories=".;../../../mugshot-dependencies/windows-binary/gettext/include;../../../mugshot-dependencies/glib;../../../mugshot-dependencies/glib/glib;../libglib;../../../mugshot-dependencies/loudmouth"
PreprocessorDefinitions="__WIN32__;LM_COMPILATION;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE"
DisableSpecificWarnings="4244;4267"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="intl.lib glib-2.0.lib ws2_32.lib"
+ AdditionalDependencies="intl.lib ws2_32.lib"
OutputFile="$(OutDir)/loudmouth-1.dll"
- AdditionalLibraryDirectories="../../mugshot-dependencies/windows-binary/gettext/lib"
+ AdditionalLibraryDirectories="../../../mugshot-dependencies/windows-binary/gettext/lib"
ModuleDefinitionFile="../../../mugshot-dependencies/loudmouth/loudmouth/loudmouth.def"
/>
</VisualStudioPropertySheet>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
