Browse Source

Reorganize sources

master
Dorian 7 years ago
parent
commit
57059d14af
  1. 126
      k-meleon/JSBridge/JSBridge.vcxproj
  2. 430
      k-meleon/KMeleon.vcxproj.filters
  3. 267
      k-meleon/KMeleon10.sln
  4. 74
      k-meleon/KmFileLocProvider.h
  5. 169
      k-meleon/UnknownContentTypeHandler.h
  6. 0
      k-meleon/app/About.cpp
  7. 0
      k-meleon/app/About.h
  8. 0
      k-meleon/app/AccelParser.cpp
  9. 0
      k-meleon/app/AccelParser.h
  10. 0
      k-meleon/app/AutoComplete.h
  11. 0
      k-meleon/app/BrowserFrameGlue.cpp
  12. 11
      k-meleon/app/BrowserFrm.cpp
  13. 2
      k-meleon/app/BrowserFrm.h
  14. 193
      k-meleon/app/BrowserFrmTab.cpp
  15. 0
      k-meleon/app/BrowserFrmTab.h
  16. 331
      k-meleon/app/BrowserGlue.cpp
  17. 0
      k-meleon/app/BrowserImpl.cpp
  18. 0
      k-meleon/app/BrowserImpl.h
  19. 0
      k-meleon/app/BrowserImplCtxMenuLstnr.cpp
  20. 0
      k-meleon/app/BrowserImplWebPrgrsLstnr.cpp
  21. 0
      k-meleon/app/BrowserView.cpp
  22. 0
      k-meleon/app/BrowserView.h
  23. 0
      k-meleon/app/BrowserViewFind.cpp
  24. 0
      k-meleon/app/BrowserViewPanning.cpp
  25. 0
      k-meleon/app/BrowserViewUtils.cpp
  26. 337
      k-meleon/app/BrowserWindow.cpp
  27. 34
      k-meleon/app/BrowserWindow.h
  28. 0
      k-meleon/app/CmdLine.cpp
  29. 0
      k-meleon/app/CmdLine.h
  30. 0
      k-meleon/app/Components.cpp
  31. 0
      k-meleon/app/ContentDispatchChooser.cpp
  32. 0
      k-meleon/app/ContentDispatchChooser.h
  33. 2
      k-meleon/app/CookiePromptService.cpp
  34. 18
      k-meleon/app/CookiePromptService.h
  35. 68
      k-meleon/app/Cookies.h
  36. 43
      k-meleon/app/CookiesViewerDlg.cpp
  37. 3
      k-meleon/app/CookiesViewerDlg.h
  38. 0
      k-meleon/app/DPIaware.manifest
  39. 28
      k-meleon/app/DialogEx.h
  40. 117
      k-meleon/app/Dialogs.cpp
  41. 0
      k-meleon/app/Dialogs.h
  42. 18
      k-meleon/app/FavIconList.cpp
  43. 4
      k-meleon/app/FavIconList.h
  44. 0
      k-meleon/app/FontPackageHandler.cpp
  45. 0
      k-meleon/app/FontPackageHandler.h
  46. 0
      k-meleon/app/GenKeyPairDialogs.cpp
  47. 5
      k-meleon/app/GenKeyPairDialogs.h
  48. 10
      k-meleon/app/GenericDlg.cpp
  49. 4
      k-meleon/app/GenericDlg.h
  50. 0
      k-meleon/app/HiddenWnd.cpp
  51. 0
      k-meleon/app/HiddenWnd.h
  52. 0
      k-meleon/app/IBrowserFrameGlue.h
  53. 0
      k-meleon/app/KMeleon.vcproj
  54. 686
      k-meleon/app/KMeleon.vcxproj
  55. 0
      k-meleon/app/KMeleonConst.h
  56. 0
      k-meleon/app/KmAbout.cpp
  57. 10
      k-meleon/app/KmAbout.h
  58. 70
      k-meleon/app/KmAppInfo.cpp
  59. 0
      k-meleon/app/KmAppInfo.h
  60. 31
      k-meleon/app/KmCommand.cpp
  61. 2
      k-meleon/app/KmCommand.h
  62. 292
      k-meleon/app/KmFileLocProvider.cpp
  63. 74
      k-meleon/app/KmFileLocProvider.h
  64. 282
      k-meleon/app/KmImage.cpp
  65. 4
      k-meleon/app/KmImage.h
  66. 4
      k-meleon/app/KmInstaller.h
  67. 4
      k-meleon/app/KmMenu.cpp
  68. 8
      k-meleon/app/KmMenu.h
  69. 38
      k-meleon/app/KmSkin.cpp
  70. 2
      k-meleon/app/KmSkin.h
  71. 16
      k-meleon/app/KmToolbar.cpp
  72. 0
      k-meleon/app/KmToolbar.h
  73. 10
      k-meleon/app/LangParser.cpp
  74. 2
      k-meleon/app/LangParser.h
  75. 0
      k-meleon/app/Log.h
  76. 0
      k-meleon/app/MenuParser.cpp
  77. 0
      k-meleon/app/MenuParser.h
  78. 3
      k-meleon/app/MfcEmbed.cpp
  79. 0
      k-meleon/app/MfcEmbed.h
  80. 2
      k-meleon/app/MfcEmbed.rc
  81. 0
      k-meleon/app/MostRecentUrls.cpp
  82. 0
      k-meleon/app/MostRecentUrls.h
  83. 82
      k-meleon/app/MozUtils.cpp
  84. 2
      k-meleon/app/MozUtils.h
  85. 0
      k-meleon/app/NSSDialogs.cpp
  86. 46
      k-meleon/app/NSSDialogs.h
  87. 0
      k-meleon/app/Parser.cpp
  88. 0
      k-meleon/app/Parser.h
  89. 48
      k-meleon/app/PasswordViewerDlg.cpp
  90. 5
      k-meleon/app/PasswordViewerDlg.h
  91. 26
      k-meleon/app/Permissions.cpp
  92. 25
      k-meleon/app/Permissions.h
  93. 2
      k-meleon/app/Plugins.cpp
  94. 0
      k-meleon/app/Plugins.h
  95. 1
      k-meleon/app/Preferences.cpp
  96. 2
      k-meleon/app/Preferences.h
  97. 0
      k-meleon/app/PreferencesDlg.cpp
  98. 0
      k-meleon/app/PrintProgressDialog.cpp
  99. 0
      k-meleon/app/PrintProgressDialog.h
  100. 0
      k-meleon/app/PrintSetupDialog.cpp
  101. Some files were not shown because too many files have changed in this diff Show More

126
k-meleon/JSBridge/JSBridge.vcxproj

@ -1,126 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{5F7A1684-E791-4F70-A24F-FC6726273512}</ProjectGuid>
<RootNamespace>JSBridge</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../../xulrunner-sdk/include;../../xulrunner-sdk/include/nspr;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>MOZ_FOLD_LIBS ;XP_WIN;XP_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;JSBRIDGE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>nss3.lib;xul.lib;mozalloc.lib;mozjs.lib;xpcomglue_s.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\debug\kplugins\$(ProjectName).dll</OutputFile>
<AdditionalLibraryDirectories>../../xulrunner-sdk/lib_dbg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)JSBridge.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
<ImportLibrary>$(OutDir)JSBridge.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
<Command>copy jsbridge.xpt ..\..\debug\browser\components\</Command>
</PostBuildEvent>
<PreBuildEvent>
<Command>$(ProjectDir)genidl.cmd</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>../../xulrunner-sdk/include;../../xulrunner-sdk/include/nspr;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>MOZ_FOLD_LIBS ;XP_WIN;XP_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;JSBRIDGE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>mozjs.lib;xul.lib;mozalloc.lib;nss3.lib;xpcomglue_s.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\release\kplugins\$(ProjectName).dll</OutputFile>
<AdditionalLibraryDirectories>../../xulrunner-sdk/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<ImportLibrary>$(OutDir)JSBridge.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
<GenerateDebugInformation>true</GenerateDebugInformation>
<LargeAddressAware>true</LargeAddressAware>
</Link>
<PostBuildEvent>
<Command>copy jsbridge.xpt ..\..\release\browser\components</Command>
</PostBuildEvent>
<PreBuildEvent>
<Command>$(ProjectDir)genidl.cmd</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="jscomp.cpp" />
<ClCompile Include="jsplugin.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../mozilla/mozilla/dist/include/js;../../mozilla/mozilla/dist/include/xpconnect;../../mozilla/mozilla/dist/include/caps;../../mozilla/mozilla/dist/include/mimetype;../../mozilla/mozilla/dist/include/imglib2;../../mozilla/mozilla/dist/include/content;../../mozilla/mozilla/dist/include/locale;../../mozilla/mozilla/dist/include/pippki;../../mozilla/mozilla/dist/include/pipnss;../../mozilla/mozilla/dist/include/cookie;../../mozilla/mozilla/dist/include/xpcom_obsolete;../../mozilla/mozilla/dist/include/typeaheadfind;../../mozilla/mozilla/dist/include/appcomps;../../mozilla/mozilla/dist/include/history;../../mozilla/mozilla/dist/include/rdf;../../mozilla/mozilla/dist/include/docshell;../../mozilla/mozilla/dist/include/dom;../../mozilla/mozilla/dist/include/embed_base;../../mozilla/mozilla/dist/include/exthandler;../../mozilla/mozilla/dist/include/find;../../mozilla/mozilla/dist/include/gfx;../../mozilla/mozilla/dist/include/helperAppDlg;../../mozilla/mozilla/dist/include/intl;../../mozilla/mozilla/dist/include/layout;../../mozilla/mozilla/dist/include/necko;../../mozilla/mozilla/dist/include/nkcache;../../mozilla/mozilla/dist/include/pref;../../mozilla/mozilla/dist/include/profile;../../mozilla/mozilla/dist/include/shistory;../../mozilla/mozilla/dist/include/string;../../mozilla/mozilla/dist/include/uriloader;../../mozilla/mozilla/dist/include/wallet;../../mozilla/mozilla/dist/include/webBrowser_core;../../mozilla/mozilla/dist/include/webbrowserpersist;../../mozilla/mozilla/dist/include/webshell;../../mozilla/mozilla/dist/include/widget;../../mozilla/mozilla/dist/include/windowwatcher;../../mozilla/mozilla/dist/include/xpcom;../../mozilla/mozilla/dist/include/nspr;../../mozilla/mozilla/dist/include/webbrwsr;../../mozilla/mozilla/dist/include/commandhandler;../../mozilla/mozilla/dist/include/plugin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../mozilla/mozilla/dist/include/js;../../mozilla/mozilla/dist/include/xpconnect;../../mozilla/mozilla/dist/include/caps;../../mozilla/mozilla/dist/include/mimetype;../../mozilla/mozilla/dist/include/imglib2;../../mozilla/mozilla/dist/include/content;../../mozilla/mozilla/dist/include/locale;../../mozilla/mozilla/dist/include/pippki;../../mozilla/mozilla/dist/include/pipnss;../../mozilla/mozilla/dist/include/cookie;../../mozilla/mozilla/dist/include/xpcom_obsolete;../../mozilla/mozilla/dist/include/typeaheadfind;../../mozilla/mozilla/dist/include/appcomps;../../mozilla/mozilla/dist/include/history;../../mozilla/mozilla/dist/include/rdf;../../mozilla/mozilla/dist/include/docshell;../../mozilla/mozilla/dist/include/dom;../../mozilla/mozilla/dist/include/embed_base;../../mozilla/mozilla/dist/include/exthandler;../../mozilla/mozilla/dist/include/find;../../mozilla/mozilla/dist/include/gfx;../../mozilla/mozilla/dist/include/helperAppDlg;../../mozilla/mozilla/dist/include/intl;../../mozilla/mozilla/dist/include/layout;../../mozilla/mozilla/dist/include/necko;../../mozilla/mozilla/dist/include/nkcache;../../mozilla/mozilla/dist/include/pref;../../mozilla/mozilla/dist/include/profile;../../mozilla/mozilla/dist/include/shistory;../../mozilla/mozilla/dist/include/string;../../mozilla/mozilla/dist/include/uriloader;../../mozilla/mozilla/dist/include/wallet;../../mozilla/mozilla/dist/include/webBrowser_core;../../mozilla/mozilla/dist/include/webbrowserpersist;../../mozilla/mozilla/dist/include/webshell;../../mozilla/mozilla/dist/include/widget;../../mozilla/mozilla/dist/include/windowwatcher;../../mozilla/mozilla/dist/include/xpcom;../../mozilla/mozilla/dist/include/nspr;../../mozilla/mozilla/dist/include/webbrwsr;../../mozilla/mozilla/dist/include/commandhandler;../../mozilla/mozilla/dist/include/plugin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ClCompile Include="nsGenericFactory.cpp" />
</ItemGroup>
<ItemGroup>
<Midl Include="nsIJSBridge.idl">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</Midl>
</ItemGroup>
<ItemGroup>
<ClInclude Include="jscomp.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

430
k-meleon/KMeleon.vcxproj.filters

@ -1,430 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{bd664a74-9a72-442b-8822-dacfd17a70e6}</UniqueIdentifier>
<Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
</Filter>
<Filter Include="Source Files\Components">
<UniqueIdentifier>{e44cf921-7549-41ff-8d5f-d5d478443924}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{dca5c7e1-7a72-4ade-817d-f192d5e678b9}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl</Extensions>
</Filter>
<Filter Include="Header Files\Components">
<UniqueIdentifier>{fec6bdc2-f0d9-40d9-8ffb-8303ce934f95}</UniqueIdentifier>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{751e9435-b782-473a-8738-2f6278107259}</UniqueIdentifier>
<Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="About.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="AccelParser.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="BrowserFrm.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="BrowserFrmTab.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="BrowserGlue.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="BrowserImpl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="BrowserImplCtxMenuLstnr.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="BrowserImplWebPrgrsLstnr.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="BrowserView.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="BrowserViewPanning.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="BrowserViewUtils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="BrowserWindow.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="CmdLine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="CookiesViewerDlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="defineMap.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Dialogs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="FavIconList.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GenericDlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="HiddenWnd.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="KmCommand.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="KmMenu.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="LangParser.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MenuParser.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MfcEmbed.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MostRecentUrls.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MozUtils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Parser.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="PasswordViewerDlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Permissions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Plugins.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Preferences.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="PreferencesDlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="PrintProgressDialog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="PrintSetupDialog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ProfileMgr.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ProfilesDlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ReBarEx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="SaveAsHandler.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="SideBar.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="StdAfx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TabReBar.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ToolBarEx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Tooltips.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="urlbar.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="VisualStylesXP.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Components.cpp">
<Filter>Source Files\Components</Filter>
</ClCompile>
<ClCompile Include="CookiePromptService.cpp">
<Filter>Source Files\Components</Filter>
</ClCompile>
<ClCompile Include="GenKeyPairDialogs.cpp">
<Filter>Source Files\Components</Filter>
</ClCompile>
<ClCompile Include="NSSDialogs.cpp">
<Filter>Source Files\Components</Filter>
</ClCompile>
<ClCompile Include="PromptService.cpp">
<Filter>Source Files\Components</Filter>
</ClCompile>
<ClCompile Include="TooltipsProvider.cpp">
<Filter>Source Files\Components</Filter>
</ClCompile>
<ClCompile Include="UnknownContentTypeHandler.cpp">
<Filter>Source Files\Components</Filter>
</ClCompile>
<ClCompile Include="KmAppInfo.cpp">
<Filter>Source Files\Components</Filter>
</ClCompile>
<ClCompile Include="KmAbout.cpp">
<Filter>Source Files\Components</Filter>
</ClCompile>
<ClCompile Include="KmFileLocProvider.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="About.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="AccelParser.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="BrowserFrm.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="BrowserFrmTab.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="BrowserImpl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="BrowserView.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="BrowserWindow.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="CmdLine.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Cookies.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="CookiesViewerDlg.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Dialogs.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="FavIconList.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="GenericDlg.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="HiddenWnd.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="IBrowserFrameGlue.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="KmCommand.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="kmeleon_plugin.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="KmeleonConst.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="KmMenu.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="LangParser.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Log.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MenuParser.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MfcEmbed.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MozUtils.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PasswordViewerDlg.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Permissions.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Plugins.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Preferences.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PrintProgressDialog.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PrintSetupDialog.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ProfileMgr.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ProfilesDlg.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ReBarEx.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Resource.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="SaveAsHandler.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="SideBar.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="StdAfx.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TabReBar.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ToolBarEx.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Tooltips.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="urlbar.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Utils.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="version.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="VisualStylesXP.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="CookiePromptService.h">
<Filter>Header Files\Components</Filter>
</ClInclude>
<ClInclude Include="FontPackageHandler.h">
<Filter>Header Files\Components</Filter>
</ClInclude>
<ClInclude Include="GenKeyPairDialogs.h">
<Filter>Header Files\Components</Filter>
</ClInclude>
<ClInclude Include="NSSDialogs.h">
<Filter>Header Files\Components</Filter>
</ClInclude>
<ClInclude Include="PromptService.h">
<Filter>Header Files\Components</Filter>
</ClInclude>
<ClInclude Include="TooltipsProvider.h">
<Filter>Header Files\Components</Filter>
</ClInclude>
<ClInclude Include="UnknownContentTypeHandler.h">
<Filter>Header Files\Components</Filter>
</ClInclude>
<ClInclude Include="KmAppInfo.h">
<Filter>Header Files\Components</Filter>
</ClInclude>
<ClInclude Include="AutoComplete.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="KmAbout.h">
<Filter>Header Files\Components</Filter>
</ClInclude>
<ClInclude Include="KmFileLocProvider.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="res\back.bmp">
<Filter>Resource Files</Filter>
</None>
<None Include="res\broken.ico">
<Filter>Resource Files</Filter>
</None>
<None Include="res\Cursor_10.cur">
<Filter>Resource Files</Filter>
</None>
<None Include="res\Cursor_11.cur">
<Filter>Resource Files</Filter>
</None>
<None Include="res\Cursor_12.cur">
<Filter>Resource Files</Filter>
</None>
<None Include="res\Cursor_13.cur">
<Filter>Resource Files</Filter>
</None>
<None Include="res\Cursor_14.cur">
<Filter>Resource Files</Filter>
</None>
<None Include="res\Cursor_15.cur">
<Filter>Resource Files</Filter>
</None>
<None Include="res\Cursor_16.cur">
<Filter>Resource Files</Filter>
</None>
<None Include="res\Cursor_17.cur">
<Filter>Resource Files</Filter>
</None>
<None Include="res\Cursor_27.cur">
<Filter>Resource Files</Filter>
</None>
<None Include="res\KmeleonDocument.ico">
<Filter>Resource Files</Filter>
</None>
<None Include="res\MozillaBrowser.ico">
<Filter>Resource Files</Filter>
</None>
<None Include="res\off.ico">
<Filter>Resource Files</Filter>
</None>
<None Include="res\offcheck.ico">
<Filter>Resource Files</Filter>
</None>
<None Include="res\on.ico">
<Filter>Resource Files</Filter>
</None>
<None Include="res\oncheck.ico">
<Filter>Resource Files</Filter>
</None>
<None Include="res\popupblock.ico">
<Filter>Resource Files</Filter>
</None>
<None Include="res\sinsecur.ico">
<Filter>Resource Files</Filter>
</None>
<None Include="res\ssecur.ico">
<Filter>Resource Files</Filter>
</None>
<None Include="res\toolbar1.bmp">
<Filter>Resource Files</Filter>
</None>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="MfcEmbed.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>

267
k-meleon/KMeleon10.sln

@ -1,133 +1,134 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "k-meleon", "KMeleon.vcxproj", "{8A4A1781-E9C9-6AC3-E5C0-CF1DD49E2D98}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bmpmenu", "bmp_menu\bmp_menu.vcxproj", "{15C2BC79-F47B-2CE5-C97A-A4892D0BB7CF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fullscreen", "fullscreen\fullscreen.vcxproj", "{5761303D-62A7-8010-CE31-3359F561CE25}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loader", "loader\loader.vcxproj", "{B289CEA9-D07D-6B02-9716-46EE0A7A1301}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bookmarks", "ns_bookmarks\ns_bookmarks.vcxproj", "{0F64281F-C47C-4AC4-BE56-CC1C181A05D8}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hotlist", "op_hotlist\op_hotlist.vcxproj", "{DEEC3265-6B49-211A-46FD-51247209C776}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rebarmenu", "rebar_menu\rebar_menu.vcxproj", "{3D8DF23C-7D26-6F3C-9A4C-C6CDA1D3D5AB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toolbars", "toolbars\toolbars.vcxproj", "{2BCBDD98-5EFF-14B9-931B-C82AB34DB060}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "privacy", "privacy\privacy.vcxproj", "{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gestures", "gestures\gestures.vcxproj", "{2E6C70BF-E9CA-416A-B341-2B8550919D9E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "favorites", "ie_favorites\favorites2.vcxproj", "{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sessions", "sessions\sessions.vcxproj", "{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "macros", "macros2\macros2.vcxproj", "{CE210F14-2644-487C-86CA-1E2CB2E04490}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSBridge", "JSBridge\JSBridge.vcxproj", "{5F7A1684-E791-4F70-A24F-FC6726273512}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login", "login\login.vcxproj", "{1288C4B7-D043-4B49-BD74-C443B33961FE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release Static MFC|Win32 = Release Static MFC|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8A4A1781-E9C9-6AC3-E5C0-CF1DD49E2D98}.Debug|Win32.ActiveCfg = Debug Unicode|Win32
{8A4A1781-E9C9-6AC3-E5C0-CF1DD49E2D98}.Debug|Win32.Build.0 = Debug Unicode|Win32
{8A4A1781-E9C9-6AC3-E5C0-CF1DD49E2D98}.Release Static MFC|Win32.ActiveCfg = Release Static MFC|Win32
{8A4A1781-E9C9-6AC3-E5C0-CF1DD49E2D98}.Release Static MFC|Win32.Build.0 = Release Static MFC|Win32
{8A4A1781-E9C9-6AC3-E5C0-CF1DD49E2D98}.Release|Win32.ActiveCfg = Release Unicode|Win32
{8A4A1781-E9C9-6AC3-E5C0-CF1DD49E2D98}.Release|Win32.Build.0 = Release Unicode|Win32
{15C2BC79-F47B-2CE5-C97A-A4892D0BB7CF}.Debug|Win32.ActiveCfg = Debug|Win32
{15C2BC79-F47B-2CE5-C97A-A4892D0BB7CF}.Debug|Win32.Build.0 = Debug|Win32
{15C2BC79-F47B-2CE5-C97A-A4892D0BB7CF}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{15C2BC79-F47B-2CE5-C97A-A4892D0BB7CF}.Release Static MFC|Win32.Build.0 = Release|Win32
{15C2BC79-F47B-2CE5-C97A-A4892D0BB7CF}.Release|Win32.ActiveCfg = Release|Win32
{15C2BC79-F47B-2CE5-C97A-A4892D0BB7CF}.Release|Win32.Build.0 = Release|Win32
{5761303D-62A7-8010-CE31-3359F561CE25}.Debug|Win32.ActiveCfg = Debug|Win32
{5761303D-62A7-8010-CE31-3359F561CE25}.Debug|Win32.Build.0 = Debug|Win32
{5761303D-62A7-8010-CE31-3359F561CE25}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{5761303D-62A7-8010-CE31-3359F561CE25}.Release Static MFC|Win32.Build.0 = Release|Win32
{5761303D-62A7-8010-CE31-3359F561CE25}.Release|Win32.ActiveCfg = Release|Win32
{5761303D-62A7-8010-CE31-3359F561CE25}.Release|Win32.Build.0 = Release|Win32
{B289CEA9-D07D-6B02-9716-46EE0A7A1301}.Debug|Win32.ActiveCfg = Debug|Win32
{B289CEA9-D07D-6B02-9716-46EE0A7A1301}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{B289CEA9-D07D-6B02-9716-46EE0A7A1301}.Release Static MFC|Win32.Build.0 = Release|Win32
{B289CEA9-D07D-6B02-9716-46EE0A7A1301}.Release|Win32.ActiveCfg = Release|Win32
{B289CEA9-D07D-6B02-9716-46EE0A7A1301}.Release|Win32.Build.0 = Release|Win32
{0F64281F-C47C-4AC4-BE56-CC1C181A05D8}.Debug|Win32.ActiveCfg = Debug Unicode|Win32
{0F64281F-C47C-4AC4-BE56-CC1C181A05D8}.Debug|Win32.Build.0 = Debug Unicode|Win32
{0F64281F-C47C-4AC4-BE56-CC1C181A05D8}.Release Static MFC|Win32.ActiveCfg = Release Unicode|Win32
{0F64281F-C47C-4AC4-BE56-CC1C181A05D8}.Release Static MFC|Win32.Build.0 = Release Unicode|Win32
{0F64281F-C47C-4AC4-BE56-CC1C181A05D8}.Release|Win32.ActiveCfg = Release Unicode|Win32
{0F64281F-C47C-4AC4-BE56-CC1C181A05D8}.Release|Win32.Build.0 = Release Unicode|Win32
{DEEC3265-6B49-211A-46FD-51247209C776}.Debug|Win32.ActiveCfg = Debug|Win32
{DEEC3265-6B49-211A-46FD-51247209C776}.Debug|Win32.Build.0 = Debug|Win32
{DEEC3265-6B49-211A-46FD-51247209C776}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{DEEC3265-6B49-211A-46FD-51247209C776}.Release Static MFC|Win32.Build.0 = Release|Win32
{DEEC3265-6B49-211A-46FD-51247209C776}.Release|Win32.ActiveCfg = Release|Win32
{DEEC3265-6B49-211A-46FD-51247209C776}.Release|Win32.Build.0 = Release|Win32
{3D8DF23C-7D26-6F3C-9A4C-C6CDA1D3D5AB}.Debug|Win32.ActiveCfg = Debug|Win32
{3D8DF23C-7D26-6F3C-9A4C-C6CDA1D3D5AB}.Debug|Win32.Build.0 = Debug|Win32
{3D8DF23C-7D26-6F3C-9A4C-C6CDA1D3D5AB}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{3D8DF23C-7D26-6F3C-9A4C-C6CDA1D3D5AB}.Release Static MFC|Win32.Build.0 = Release|Win32
{3D8DF23C-7D26-6F3C-9A4C-C6CDA1D3D5AB}.Release|Win32.ActiveCfg = Release|Win32
{3D8DF23C-7D26-6F3C-9A4C-C6CDA1D3D5AB}.Release|Win32.Build.0 = Release|Win32
{2BCBDD98-5EFF-14B9-931B-C82AB34DB060}.Debug|Win32.ActiveCfg = Debug|Win32
{2BCBDD98-5EFF-14B9-931B-C82AB34DB060}.Debug|Win32.Build.0 = Debug|Win32
{2BCBDD98-5EFF-14B9-931B-C82AB34DB060}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{2BCBDD98-5EFF-14B9-931B-C82AB34DB060}.Release Static MFC|Win32.Build.0 = Release|Win32
{2BCBDD98-5EFF-14B9-931B-C82AB34DB060}.Release|Win32.ActiveCfg = Release|Win32
{2BCBDD98-5EFF-14B9-931B-C82AB34DB060}.Release|Win32.Build.0 = Release|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Debug|Win32.ActiveCfg = Debug|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Debug|Win32.Build.0 = Debug|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Release Static MFC|Win32.Build.0 = Release|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Release|Win32.ActiveCfg = Release|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Release|Win32.Build.0 = Release|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Debug|Win32.ActiveCfg = Debug|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Debug|Win32.Build.0 = Debug|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Release Static MFC|Win32.Build.0 = Release|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Release|Win32.ActiveCfg = Release|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Release|Win32.Build.0 = Release|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Debug|Win32.ActiveCfg = Debug|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Debug|Win32.Build.0 = Debug|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Release Static MFC|Win32.Build.0 = Release|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Release|Win32.ActiveCfg = Release|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Release|Win32.Build.0 = Release|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Debug|Win32.ActiveCfg = Debug Unicode|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Debug|Win32.Build.0 = Debug Unicode|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Release Static MFC|Win32.Build.0 = Release|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Release|Win32.ActiveCfg = Release|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Release|Win32.Build.0 = Release|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Debug|Win32.ActiveCfg = Debug|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Debug|Win32.Build.0 = Debug|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Release Static MFC|Win32.Build.0 = Release|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Release|Win32.ActiveCfg = Release|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Release|Win32.Build.0 = Release|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Debug|Win32.ActiveCfg = Debug|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Debug|Win32.Build.0 = Debug|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Release Static MFC|Win32.Build.0 = Release|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Release|Win32.ActiveCfg = Release|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Release|Win32.Build.0 = Release|Win32
{1288C4B7-D043-4B49-BD74-C443B33961FE}.Debug|Win32.ActiveCfg = Debug|Win32
{1288C4B7-D043-4B49-BD74-C443B33961FE}.Debug|Win32.Build.0 = Debug|Win32
{1288C4B7-D043-4B49-BD74-C443B33961FE}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{1288C4B7-D043-4B49-BD74-C443B33961FE}.Release Static MFC|Win32.Build.0 = Release|Win32
{1288C4B7-D043-4B49-BD74-C443B33961FE}.Release|Win32.ActiveCfg = Release|Win32
{1288C4B7-D043-4B49-BD74-C443B33961FE}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "k-meleon", "app\KMeleon.vcxproj", "{7BB6C711-139E-C685-6DF2-191FFF772A85}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bmpmenu", "kplugins\bmpmenu\bmpmenu.vcxproj", "{07094943-C44A-4247-83AD-86CE1448130B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fullscreen", "kplugins\fullscreen\fullscreen.vcxproj", "{E6248B91-1FDD-5213-AE71-98DDB350CFD4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bookmarks", "kplugins\bookmarks\bookmarks.vcxproj", "{C3975598-71BD-4883-BC8B-238CDDAC570D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hotlist", "kplugins\hotlist\hotlist.vcxproj", "{69B8865D-8D32-455B-9994-A98957992981}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rebarmenu", "kplugins\rebar_menu\rebarmenu.vcxproj", "{4C4124A1-3353-2744-A4F1-D22B2F39CD2B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toolbars", "kplugins\toolbars\toolbars.vcxproj", "{63354FD4-3302-4BC3-8030-E5AC95ACDCF0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "privacy", "kplugins\privacy\privacy.vcxproj", "{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gestures", "kplugins\gestures\gestures.vcxproj", "{2E6C70BF-E9CA-416A-B341-2B8550919D9E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "favorites", "kplugins\favorites\favorites.vcxproj", "{69CDA1F9-86FF-4C5E-8356-AD43A7A400F0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sessions", "kplugins\sessions\sessions.vcxproj", "{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "macros", "kplugins\macros2\macros.vcxproj", "{CE210F14-2644-487C-86CA-1E2CB2E04490}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsbridge", "kplugins\jsbridge\jsbridge.vcxproj", "{5F7A1684-E791-4F70-A24F-FC6726273512}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login", "kplugins\login\login.vcxproj", "{1288C4B7-D043-4B49-BD74-C443B33961FE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spellcheck", "kplugins\spellcheck\spellcheck.vcxproj", "{3D4DAD90-C0B3-4741-B9C1-6A3C5AD57F7E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release Static MFC|Win32 = Release Static MFC|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7BB6C711-139E-C685-6DF2-191FFF772A85}.Debug|Win32.ActiveCfg = Debug|Win32
{7BB6C711-139E-C685-6DF2-191FFF772A85}.Debug|Win32.Build.0 = Debug|Win32
{7BB6C711-139E-C685-6DF2-191FFF772A85}.Release Static MFC|Win32.ActiveCfg = Release Static MFC|Win32
{7BB6C711-139E-C685-6DF2-191FFF772A85}.Release Static MFC|Win32.Build.0 = Release Static MFC|Win32
{7BB6C711-139E-C685-6DF2-191FFF772A85}.Release|Win32.ActiveCfg = Release|Win32
{7BB6C711-139E-C685-6DF2-191FFF772A85}.Release|Win32.Build.0 = Release|Win32
{07094943-C44A-4247-83AD-86CE1448130B}.Debug|Win32.ActiveCfg = Debug|Win32
{07094943-C44A-4247-83AD-86CE1448130B}.Debug|Win32.Build.0 = Debug|Win32
{07094943-C44A-4247-83AD-86CE1448130B}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{07094943-C44A-4247-83AD-86CE1448130B}.Release Static MFC|Win32.Build.0 = Release|Win32
{07094943-C44A-4247-83AD-86CE1448130B}.Release|Win32.ActiveCfg = Release|Win32
{07094943-C44A-4247-83AD-86CE1448130B}.Release|Win32.Build.0 = Release|Win32
{E6248B91-1FDD-5213-AE71-98DDB350CFD4}.Debug|Win32.ActiveCfg = Debug|Win32
{E6248B91-1FDD-5213-AE71-98DDB350CFD4}.Debug|Win32.Build.0 = Debug|Win32
{E6248B91-1FDD-5213-AE71-98DDB350CFD4}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{E6248B91-1FDD-5213-AE71-98DDB350CFD4}.Release Static MFC|Win32.Build.0 = Release|Win32
{E6248B91-1FDD-5213-AE71-98DDB350CFD4}.Release|Win32.ActiveCfg = Release|Win32
{E6248B91-1FDD-5213-AE71-98DDB350CFD4}.Release|Win32.Build.0 = Release|Win32
{C3975598-71BD-4883-BC8B-238CDDAC570D}.Debug|Win32.ActiveCfg = Debug|Win32
{C3975598-71BD-4883-BC8B-238CDDAC570D}.Debug|Win32.Build.0 = Debug|Win32
{C3975598-71BD-4883-BC8B-238CDDAC570D}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{C3975598-71BD-4883-BC8B-238CDDAC570D}.Release Static MFC|Win32.Build.0 = Release|Win32
{C3975598-71BD-4883-BC8B-238CDDAC570D}.Release|Win32.ActiveCfg = Release|Win32
{C3975598-71BD-4883-BC8B-238CDDAC570D}.Release|Win32.Build.0 = Release|Win32
{69B8865D-8D32-455B-9994-A98957992981}.Debug|Win32.ActiveCfg = Debug|Win32
{69B8865D-8D32-455B-9994-A98957992981}.Debug|Win32.Build.0 = Debug|Win32
{69B8865D-8D32-455B-9994-A98957992981}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{69B8865D-8D32-455B-9994-A98957992981}.Release Static MFC|Win32.Build.0 = Release|Win32
{69B8865D-8D32-455B-9994-A98957992981}.Release|Win32.ActiveCfg = Release|Win32
{69B8865D-8D32-455B-9994-A98957992981}.Release|Win32.Build.0 = Release|Win32
{4C4124A1-3353-2744-A4F1-D22B2F39CD2B}.Debug|Win32.ActiveCfg = Debug|Win32
{4C4124A1-3353-2744-A4F1-D22B2F39CD2B}.Debug|Win32.Build.0 = Debug|Win32
{4C4124A1-3353-2744-A4F1-D22B2F39CD2B}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{4C4124A1-3353-2744-A4F1-D22B2F39CD2B}.Release Static MFC|Win32.Build.0 = Release|Win32
{4C4124A1-3353-2744-A4F1-D22B2F39CD2B}.Release|Win32.ActiveCfg = Release|Win32
{4C4124A1-3353-2744-A4F1-D22B2F39CD2B}.Release|Win32.Build.0 = Release|Win32
{63354FD4-3302-4BC3-8030-E5AC95ACDCF0}.Debug|Win32.ActiveCfg = Debug|Win32
{63354FD4-3302-4BC3-8030-E5AC95ACDCF0}.Debug|Win32.Build.0 = Debug|Win32
{63354FD4-3302-4BC3-8030-E5AC95ACDCF0}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{63354FD4-3302-4BC3-8030-E5AC95ACDCF0}.Release Static MFC|Win32.Build.0 = Release|Win32
{63354FD4-3302-4BC3-8030-E5AC95ACDCF0}.Release|Win32.ActiveCfg = Release|Win32
{63354FD4-3302-4BC3-8030-E5AC95ACDCF0}.Release|Win32.Build.0 = Release|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Debug|Win32.ActiveCfg = Debug|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Debug|Win32.Build.0 = Debug|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Release Static MFC|Win32.Build.0 = Release|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Release|Win32.ActiveCfg = Release|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Release|Win32.Build.0 = Release|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Debug|Win32.ActiveCfg = Debug|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Debug|Win32.Build.0 = Debug|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Release Static MFC|Win32.Build.0 = Release|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Release|Win32.ActiveCfg = Release|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Release|Win32.Build.0 = Release|Win32
{69CDA1F9-86FF-4C5E-8356-AD43A7A400F0}.Debug|Win32.ActiveCfg = Debug|Win32
{69CDA1F9-86FF-4C5E-8356-AD43A7A400F0}.Debug|Win32.Build.0 = Debug|Win32
{69CDA1F9-86FF-4C5E-8356-AD43A7A400F0}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{69CDA1F9-86FF-4C5E-8356-AD43A7A400F0}.Release Static MFC|Win32.Build.0 = Release|Win32
{69CDA1F9-86FF-4C5E-8356-AD43A7A400F0}.Release|Win32.ActiveCfg = Release|Win32
{69CDA1F9-86FF-4C5E-8356-AD43A7A400F0}.Release|Win32.Build.0 = Release|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Debug|Win32.ActiveCfg = Debug|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Debug|Win32.Build.0 = Debug|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Release Static MFC|Win32.Build.0 = Release|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Release|Win32.ActiveCfg = Release|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Release|Win32.Build.0 = Release|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Debug|Win32.ActiveCfg = Debug|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Debug|Win32.Build.0 = Debug|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Release Static MFC|Win32.Build.0 = Release|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Release|Win32.ActiveCfg = Release|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Release|Win32.Build.0 = Release|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Debug|Win32.ActiveCfg = Debug|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Debug|Win32.Build.0 = Debug|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Release Static MFC|Win32.Build.0 = Release|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Release|Win32.ActiveCfg = Release|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Release|Win32.Build.0 = Release|Win32
{1288C4B7-D043-4B49-BD74-C443B33961FE}.Debug|Win32.ActiveCfg = Debug|Win32
{1288C4B7-D043-4B49-BD74-C443B33961FE}.Debug|Win32.Build.0 = Debug|Win32
{1288C4B7-D043-4B49-BD74-C443B33961FE}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{1288C4B7-D043-4B49-BD74-C443B33961FE}.Release Static MFC|Win32.Build.0 = Release|Win32
{1288C4B7-D043-4B49-BD74-C443B33961FE}.Release|Win32.ActiveCfg = Release|Win32
{1288C4B7-D043-4B49-BD74-C443B33961FE}.Release|Win32.Build.0 = Release|Win32
{3D4DAD90-C0B3-4741-B9C1-6A3C5AD57F7E}.Debug|Win32.ActiveCfg = Debug|Win32
{3D4DAD90-C0B3-4741-B9C1-6A3C5AD57F7E}.Debug|Win32.Build.0 = Debug|Win32
{3D4DAD90-C0B3-4741-B9C1-6A3C5AD57F7E}.Release Static MFC|Win32.ActiveCfg = Release|Win32
{3D4DAD90-C0B3-4741-B9C1-6A3C5AD57F7E}.Release Static MFC|Win32.Build.0 = Release|Win32
{3D4DAD90-C0B3-4741-B9C1-6A3C5AD57F7E}.Release|Win32.ActiveCfg = Release|Win32
{3D4DAD90-C0B3-4741-B9C1-6A3C5AD57F7E}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

74
k-meleon/KmFileLocProvider.h

@ -1,74 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: Mozilla-sample-code 1.0
*
* Copyright (c) 2002 Netscape Communications Corporation and
* other contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this Mozilla sample software and associated documentation files
* (the "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to permit
* persons to whom the Software is furnished to do so, subject to the
* following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
* Contributor(s):
* Conrad Carlen <conrad@ingress.com>
*
* ***** END LICENSE BLOCK ***** */
#include "nsIDirectoryService.h"
#include "nsILocalFile.h"
#include "nsXPCOMGlue.h"
#define K_APP_SKINS_DIR "KASkins"
#define K_APP_KPLUGINS_DIR "KAPlugins"
#define K_USER_SKINS_DIR "KUSkins"
#define K_USER_KPLUGINS_DIR "KUPlugins"
#define K_APP_SETTING_DEFAULTS "KDefSettings"
#define K_USER_SETTING "KUserSettings"
class nsILocalFile;
//*****************************************************************************
// class winEmbedFileLocProvider
//*****************************************************************************
class KmFileLocProvider : public nsIDirectoryServiceProvider2
{
public:
// aProductDirName is the name (not path) of the dir
// in which the application registry and profiles live.
KmFileLocProvider(const nsAString& aProductDirName);
NS_DECL_ISUPPORTS
NS_DECL_NSIDIRECTORYSERVICEPROVIDER
NS_DECL_NSIDIRECTORYSERVICEPROVIDER2
CString GetProductDirectory(bool local = false);
BOOL SetProfile(nsAString& aDir, nsAString& aLocalDir);
protected:
virtual ~KmFileLocProvider();
NS_METHOD CloneMozBinDirectory(nsIFile **aLocalFile);
NS_METHOD GetDefaultUserProfileRoot(nsIFile **aLocalFile, bool aLocal = false);
NS_METHOD GetProductDirectory(nsIFile **aLocalFile, bool aLocal = false);
nsString mProductDirName;
nsCOMPtr<nsIFile> mMozBinDirectory;
nsCOMPtr<nsIFile> mProductDirectory;
nsCOMPtr<nsIFile> mLocalProductDirectory;
nsCOMPtr<nsIFile> mProfileDirectory;
nsCOMPtr<nsIFile> mProfileLocalDirectory;
};

169
k-meleon/UnknownContentTypeHandler.h

@ -1,169 +0,0 @@
#ifndef __UNKNOWNCONTENTTYPE__
#define __UNKNOWNCONTENTTYPE__
//static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
// {42770B50-03E9-11d3-8068-00600811A9C3}
#define NS_UNKNOWNCONTENTTYPEHANDLER_CID \
{ 0x42770b50, 0x3e9, 0x11d3, { 0x80, 0x68, 0x0, 0x60, 0x8, 0x11, 0xa9, 0xc3 } }
static NS_DEFINE_CID(kUnknownContentTypeHandlerCID, NS_UNKNOWNCONTENTTYPEHANDLER_CID);
#define NS_DOWNLOAD_CID \
{ 0xe3fa9d0a, 0x1dd1, 0x11b2, { 0xbd, 0xef, 0x8c, 0x72, 0x0b, 0x59, 0x74, 0x45 } }
static NS_DEFINE_CID(kDownloadCID, NS_DOWNLOAD_CID);
#include "DialogEx.h"
#include "nsIExternalHelperAppService.h"
#include "nsIHelperAppLauncherDialog.h"
#include "nsIContentHandler.h"
// Idiot callback function
typedef void (*ProgressDialogCallback)(char* uri, LPCTSTR file, nsresult, void*);
class CUnknownContentTypeHandler : public nsIHelperAppLauncherDialog, public nsIContentHandler
{
public:
NS_DEFINE_STATIC_CID_ACCESSOR( NS_UNKNOWNCONTENTTYPEHANDLER_CID );
// ctor/dtor
CUnknownContentTypeHandler() {
}
virtual ~CUnknownContentTypeHandler() {
}
// This class implements the nsISupports interface functions.
NS_DECL_ISUPPORTS
// This class implements the nsIHelperAppLauncherDialog interface functions.
NS_DECL_NSIHELPERAPPLAUNCHERDIALOG
NS_DECL_NSICONTENTHANDLER
// Defered show
NS_IMETHOD Show(CWnd* parent = NULL);
protected:
CString GetTypeName();
nsCOMPtr<nsIHelperAppLauncher> mAppLauncher;
nsCOMPtr<nsIDOMWindow> mDomWindow;
}; // CUnknownContentTypeHandler
//nsresult NewUnknownContentHandlerFactory(nsIFactory** aFactory);
//nsresult NewDownloadFactory(nsIFactory** aFactory);
#include "resource.h"
#include "nsITransfer.h"
class CProgressDialog : public CDialog,
public nsITransfer,
public nsSupportsWeakReference
//,public nsIWebProgressListener2
{
public:
enum { IDD = IDD_PROGRESS };
NS_DECL_ISUPPORTS
NS_DECL_NSIWEBPROGRESSLISTENER
NS_DECL_NSIWEBPROGRESSLISTENER2
NS_DECL_NSITRANSFER
CProgressDialog(BOOL bAuto=TRUE);
virtual ~CProgressDialog();
void InitPersist(nsIURI *aSource, nsIFile *aTarget, nsIWebBrowserPersist *aPersist, BOOL bShowDialog);
void SetCallBack(ProgressDialogCallback, void*);
//void InitLauncher(nsIHelperAppLauncher *aLauncher, int aHandleContentOp = 0);
void Cancel();
void Close();
// void PostNcDestroy();
// seems unnecessary
// virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
protected:
//nsCOMPtr<nsIObserver> mObserver;
//nsCOMPtr<nsIWebBrowserPersist> mPersist;
nsCOMPtr<nsIHelperAppLauncher> m_HelperAppLauncher;
nsCOMPtr<nsICancelable> mCancelable;
nsCOMPtr<nsIRequest> mRequest;
nsCOMPtr<nsIMIMEInfo> mMIMEInfo;
nsCOMPtr<nsIURI> mTarget;
nsCOMPtr<nsIFile> mTempFile;
ProgressDialogCallback mCallback;
void* mParam;
BOOL mPaused;
int m_HandleContentOp;
// this is used to calculate speed
PRInt64 mStartTime;
// this is used to slow down the updates
PRInt64 mLastUpdateTime;
PRInt64 mTotalBytes;
int mDone;
BOOL m_bAuto; // automatically invoked by a download
BOOL m_bClose; // close the window when the download is finished
BOOL m_bWindow; // display a progress window
nsCString m_uri;
CString mFileName;
CString mFilePath;
//CString mTempFile;
char *mUri;
void InitControl(const char *uri, const TCHAR *filepath);
virtual void OnCancel();
afx_msg void OnOpen();
afx_msg void OnClose();
afx_msg void OnPause();
afx_msg void OnOpenFolder();
DECLARE_MESSAGE_MAP()
virtual void OnOK();
nsresult ExecuteDesiredAction();
nsresult OpenWithApplication();
nsresult MoveTempToTarget();
nsresult GetTargetFile(nsIFile **aTargetFile);
public:
afx_msg void OnBnClickedCloseWhenDone();
afx_msg BOOL OnQueryEndSession();
};
class COpenSaveDlg : public CDialog
{
//DECLARE_DYNAMIC(COpenSaveDlg)
public:
COpenSaveDlg(CWnd* pParent = NULL); // constructeur standard
virtual ~COpenSaveDlg();
enum { IDD = IDD_OPENSAVE };
protected:
virtual void DoDataExchange(CDataExchange* pDX); // Prise en charge DDX/DDV
DECLARE_MESSAGE_MAP()
public:
CString m_csFilename;
CString m_csFiletype;
CString m_csSource;
afx_msg void OnBnClickedOpen();
virtual BOOL OnInitDialog();
afx_msg void OnTimer(UINT nIDEvent);
CStatic m_cFileIcon;
afx_msg void OnDestroy();
};
#endif

0
k-meleon/About.cpp → k-meleon/app/About.cpp

0
k-meleon/About.h → k-meleon/app/About.h

0
k-meleon/AccelParser.cpp → k-meleon/app/AccelParser.cpp

0
k-meleon/AccelParser.h → k-meleon/app/AccelParser.h

0
k-meleon/AutoComplete.h → k-meleon/app/AutoComplete.h

0
k-meleon/BrowserFrameGlue.cpp → k-meleon/app/BrowserFrameGlue.cpp

11
k-meleon/BrowserFrm.cpp → k-meleon/app/BrowserFrm.cpp

@ -74,7 +74,7 @@
#include "PasswordViewerDlg.h"
#include "CookiesViewerDlg.h"
#include "Permissions.h"
#include "rebar_menu/hot_tracking.h"
#include "../kplugins/rebar_menu/hot_tracking.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@ -85,7 +85,7 @@ static char THIS_FILE[] = __FILE__;
/////////////////////////////////////////////////////////////////////////////
// CBrowserFrame
IMPLEMENT_DYNAMIC(CBrowserFrame, CFrameWnd)
IMPLEMENT_DYNAMIC(CBrowserFrame, CFrameWnd);
BEGIN_MESSAGE_MAP(CBrowserFrame, CFrameWnd)
//{{AFX_MSG_MAP(CBrowserFrame)
@ -1227,7 +1227,7 @@ void CBrowserFrame::ToggleToolBar(UINT uID)
void CBrowserFrame::ToggleToolbarLock()
{
BOOL locked = theApp.preferences.GetBool(PREF_TOOLBAND_LOCKED, false);
bool locked = theApp.preferences.GetBool(PREF_TOOLBAND_LOCKED, false);
locked = !locked;
theApp.preferences.SetBool(PREF_TOOLBAND_LOCKED, locked);
CBrowserFrame* pBrowserFrame;
@ -1633,8 +1633,7 @@ void CBrowserFrame::OnViewStatusBar()
void CBrowserFrame::UpdateSecurityStatus(PRInt32 aState)
{
UINT tpTextId, iconResID;
TCHAR* icoFile;
UINT tpTextId;
HICON securityIcon = NULL;
if(aState & nsIWebProgressListener::STATE_IS_INSECURE) {
@ -1899,7 +1898,7 @@ BOOL CBrowserFrame::OnToolTipText(UINT id, NMHDR* pNMHDR, LRESULT* pResult)
return CFrameWnd::OnToolTipText(id, pNMHDR, pResult);
}
void CBrowserFrame::AllowJS(BOOL allow)
void CBrowserFrame::AllowJS(bool allow)
{
GetActiveView()->GetBrowserWrapper()->AllowJS(allow);
}

2
k-meleon/BrowserFrm.h → k-meleon/app/BrowserFrm.h

@ -263,7 +263,7 @@ public:
CToolBarEx* CreateToolbar(UINT style);
void SetBackImage ();
virtual void AllowJS(BOOL allow);
virtual void AllowJS(bool allow);
protected:
int InitLayout();

193
k-meleon/BrowserFrmTab.cpp → k-meleon/app/BrowserFrmTab.cpp

@ -25,9 +25,8 @@
class CBrowserGlueTab : public CBrowserGlue
{
public:
CBrowserGlueTab(CBrowserFrame* frame, CBrowserView* view) :
CBrowserGlue(frame, view)
{}
CBrowserGlueTab(CBrowserFrame* frame, CBrowserView* view) : CBrowserGlue(frame, view)
{};
CBrowserWrapper* ReuseWindow(BOOL useCurrent)
{
@ -64,7 +63,7 @@ public:
{
CBrowserGlue::UpdateBusyState(aBusy);
CString title;
if (aBusy) {
if (theApp.preferences.GetBool("kmeleon.tabs.useLoadingIcon", TRUE))
((CBrowserFrmTab*)mpBrowserFrame)->SetTabIcon((CBrowserTab*)mpBrowserView, theApp.favicons.GetLoadingIcon());
@ -84,7 +83,7 @@ public:
}
else title = mTitle;
}
((CBrowserFrmTab*)mpBrowserFrame)->SetTabTitle((CBrowserTab*)mpBrowserView, title);
}
@ -152,7 +151,7 @@ BOOL CBrowserFrmTab::OnToolTipText(UINT id, NMHDR* pNMHDR, LRESULT* pResult)
TOOLTIPTEXTA* pTTTA = (TOOLTIPTEXTA*)pNMHDR;
TOOLTIPTEXTW* pTTTW = (TOOLTIPTEXTW*)pNMHDR;
CString tabBarTip = tab->GetBrowserGlue()->mLocation;
if (tabBarTip.GetLength()>tooltipWidth)
tabBarTip = tabBarTip.Mid(0, tooltipWidth-3) + _T("...");
@ -183,7 +182,7 @@ BOOL CBrowserFrmTab::OnToolTipText(UINT id, NMHDR* pNMHDR, LRESULT* pResult)
}
CBrowserFrmTab::CBrowserFrmTab(PRUint32 chromeMask, LONG style)
: CBrowserFrame(chromeMask,style)
: CBrowserFrame(chromeMask,style)
{
m_pPreviousSelectedTab = NULL;
m_wndCBrowserTab = NULL;
@ -193,7 +192,7 @@ CBrowserFrmTab::CBrowserFrmTab(PRUint32 chromeMask, LONG style)
CBrowserFrmTab::~CBrowserFrmTab()
{
/* for (int i=0;i<m_iBrowserCount;i++)
/* for (int i=0;i<m_iBrowserCount;i++)
delete m_Tabs[i];*/
if (m_wndTabs)
delete m_wndTabs;
@ -203,53 +202,53 @@ void CBrowserFrmTab::OnDestroy()
m_wndCBrowserTab = NULL;
for (int i=0;i<m_iBrowserCount;i++)
m_Tabs[i]->DestroyWindow();
CBrowserFrame::OnDestroy();
}
void CBrowserFrmTab::OnClose()
{
int ConfirmClose = theApp.preferences.GetBool("browser.tabs.warnOnClose", 1);
if (ConfirmClose && m_iBrowserCount>1)
{
SetForegroundWindow();
CString str;
str.Format(IDS_CLOSE_SEVERAL_TABS, m_iBrowserCount);
if (MessageBox(str, 0, MB_OKCANCEL|MB_ICONWARNING) != IDOK)
return;
}
int ConfirmClose = theApp.preferences.GetBool("browser.tabs.warnOnClose", 1);
if (ConfirmClose && m_iBrowserCount>1)
{
SetForegroundWindow();
CString str;
str.Format(IDS_CLOSE_SEVERAL_TABS, m_iBrowserCount);
if (MessageBox(str, 0, MB_OKCANCEL|MB_ICONWARNING) != IDOK)
return;
}
//for (int i = 0;i<m_iBrowserCount;i++)
// m_Tabs[i]->Destroy();
//for (int i = 0;i<m_iBrowserCount;i++)
// m_Tabs[i]->Destroy();
CBrowserFrame::OnClose();
CBrowserFrame::OnClose();
}
int CBrowserFrmTab::OnCreate(LPCREATESTRUCT lpCreateStruct)
{
if (CFrameWnd::OnCreate(lpCreateStruct) == -1)
return -1;
return -1;
// tell all our plugins that we were created
if (!IsDialog())
theApp.plugins.SendMessage("*", "* OnCreate", "Create", (long)this->m_hWnd, 1 & (IsPopup()?2:0) );
// Create a ReBar window to which the toolbar and UrlBar
// will be added
BOOL hasLine = theApp.preferences.GetBool("kmeleon.display.toolbars_line", TRUE);
if (!m_wndReBar.Create(this, RBS_DBLCLKTOGGLE | RBS_VARHEIGHT | (hasLine ? RBS_BANDBORDERS:0)))
{
TRACE0("Failed to create ReBar\n");
return -1; // fail to create
}
// will be added
BOOL hasLine = theApp.preferences.GetBool("kmeleon.display.toolbars_line", TRUE);
if (!m_wndReBar.Create(this, RBS_DBLCLKTOGGLE | RBS_VARHEIGHT | (hasLine ? RBS_BANDBORDERS:0)))
{
TRACE0("Failed to create ReBar\n");
return -1; // fail to create
}
m_wndReBar.SetNeedSeparator(true);
// Create the bar which will contain the tab list
// It would be better to use a tabcontrol but, currently
// i'm not sure how to deal with it, and it would not fit
// the skin.
m_wndTabs = new CTabReBar();
m_wndTabs = new CTabReBar();
if (!m_wndTabs->Create(&m_wndReBar, ID_TABS_BAR))
{
TRACE0("Failed to create the tab toolbar\n");
@ -262,9 +261,9 @@ int CBrowserFrmTab::OnCreate(LPCREATESTRUCT lpCreateStruct)
// Create the first tab
if (CreateBrowserTab(true)==NULL)
{
TRACE0("Failed to create view window\n");
return -1;
}
TRACE0("Failed to create view window\n");
return -1;
}
if (CBrowserFrame::InitLayout() == -1)
return -1;
@ -276,13 +275,13 @@ int CBrowserFrmTab::OnCreate(LPCREATESTRUCT lpCreateStruct)
int index = m_wndReBar.FindByName(_T("Tabs"));
m_wndReBar.ShowBand(index, FALSE);
}
return 0;
}
CBrowserTab* CBrowserFrmTab::CreateBrowserTab(bool first)
{
// Fail if we reached the maximun number of tabs
// Fail if we reached the maximun number of tabs
if (m_iBrowserCount >= MAX_TABS_NUMBER)
{
::AfxMessageBox(IDS_MAXTABSNUMBER, MB_ICONSTOP );
@ -293,14 +292,14 @@ CBrowserTab* CBrowserFrmTab::CreateBrowserTab(bool first)
m_Tabs[m_iBrowserCount] = new CBrowserTab();
// Pass "this" to the View for later callbacks
// and/or access to any public data members, if needed
m_Tabs[m_iBrowserCount]->SetBrowserFrame(this);
// and/or access to any public data members, if needed
m_Tabs[m_iBrowserCount]->SetBrowserFrame(this);
// Pass on the BrowserFrameGlue also to the View which
// it will use during the Init() process after creation
// of the BrowserImpl obj. Essentially, the View object
// hooks up the Embedded browser's callbacks to the BrowserFrame
// via this BrowserFrameGlue object
// it will use during the Init() process after creation
// of the BrowserImpl obj. Essentially, the View object
// hooks up the Embedded browser's callbacks to the BrowserFrame
// via this BrowserFrameGlue object
// It will be deleted by the view.
m_Tabs[m_iBrowserCount]->SetBrowserGlue(new CBrowserGlueTab(this, m_Tabs[m_iBrowserCount]));
@ -313,7 +312,7 @@ CBrowserTab* CBrowserFrmTab::CreateBrowserTab(bool first)
CString str;
str.LoadString(IDS_EMPTY);
int buttonIndex = m_iBrowserCount;
if (theApp.preferences.iOnOpenTab == 1
if (theApp.preferences.iOnOpenTab == 1
&& m_iCBrowserView>=0)
buttonIndex = m_wndTabs->FindById(TABINDEXTOID(m_iCBrowserView)) + 1;
@ -334,10 +333,10 @@ CBrowserTab* CBrowserFrmTab::CreateBrowserTab(bool first)
UpdateTabListMenu();
return m_Tabs[m_iBrowserCount++];
}
// Failed to create the view. Cleaning.
delete m_Tabs[m_iBrowserCount];
return NULL;
}
@ -351,7 +350,7 @@ BOOL CBrowserFrmTab::SafeSetActiveBrowser(CBrowserTab* aNewActiveTab)
{
unsigned count = GetTabCount();
if (!count) return FALSE;
for (unsigned i=0; i<count; i++)
if (GetTabIndex(i) == aNewActiveTab) {
SetActiveBrowser(aNewActiveTab);
@ -376,11 +375,11 @@ void CBrowserFrmTab::SetActiveBrowser(CBrowserTab* aNewActiveTab)
m_wndCBrowserTab->GetBrowserWrapper()->SetVisible(false);
PostMessage(UWM_UPDATESESSIONHISTORY, 0, 0);
}
CBrowserTab* oldTab = m_wndCBrowserTab;
m_iCBrowserView = aNewActiveTab->m_iIndex;
m_wndCBrowserTab = aNewActiveTab;
//SendMessage(WM_SWITCHTAB, (WPARAM)m_wndCBrowserTab, (LPARAM)aNewActiveTab);
theApp.plugins.SendMessage("*", "*", "SwitchTab", (long)oldTab->GetSafeHwnd(), (long)aNewActiveTab->GetSafeHwnd());
@ -388,7 +387,7 @@ void CBrowserFrmTab::SetActiveBrowser(CBrowserTab* aNewActiveTab)
//m_wndCBrowserView->Activate(WA_ACTIVE, NULL, false);
//m_Tabs[index].xBrowserFrameGlueObj->m_bActive = true;
UpdateTitle(m_wndCBrowserTab->GetBrowserGlue()->mTitle);
UpdateSecurityStatus(m_wndCBrowserTab->GetBrowserGlue()->mSecurityState);
UpdatePopupNotification(m_wndCBrowserTab->GetBrowserGlue()->mPopupBlockedHost);
@ -412,9 +411,8 @@ void CBrowserFrmTab::SetActiveBrowser(CBrowserTab* aNewActiveTab)
// Reposition the view
RecalcLayout();
}
// I'm overriding RecalcLayout so the current active browser view
// is repositionned.
@ -429,7 +427,6 @@ void CBrowserFrmTab::RecalcLayout(BOOL bNotify)
bNotify = TRUE;