# HG changeset patch # User fturovic # Date 1265309983 21600 # Node ID 04365e85d9b07db3471299c5935a3b994e4ab229 # Parent ed312e9f896173e7af5ad2e4ea9cc377615f2c4b merging 2.5 changes into 3.0 diff -r ed312e9f8961 -r 04365e85d9b0 carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/book.css --- a/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/book.css Mon Feb 01 14:01:35 2010 -0600 +++ b/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/book.css Thu Feb 04 12:59:43 2010 -0600 @@ -5,30 +5,29 @@ */ /* Add whitespace around entire display to avoid crowding edges of view */ -/* 20070523-Removed top margin size to close gap between location breadcrumbs and page title */ html { margin: 2px 10px 10px 10px; } -/* Set default font to serif style, 12-pt and plain */ +/* 20091007 added verdana and ariel to list to match SFO website fonts choices */ body, p, table { - font-family: Geneva, Arial, Helvetica, sans-serif; - font-size: 13px; + font-family: Verdana, Ariel, Helvetica, sans-serif; + font-size: 0.9em; font-weight: normal; } -/* Use sans-serif fonts for all title styles */ h1, h2, h3, h4, h5, h6, strong, em { - font-family: Helvetica, sans-serif; + font-family: Verdana, Ariel, Helvetica, sans-serif; color: #000000; } -h1 { font-size:20px } -h2 { font-size:18px } -h3 { font-size:16px } -h4 { font-size:14px } -h5 { font-size:13px } -h6 { font-size:12px } +/* 20091007 - changed sizes to use em versus px */ +h1 { font-size: 1.3em } +h2 { font-size: 1.2em } +h3 { font-size: 1.1em } +h4 { font-size: 1.0em } +h5 { font-size: 0.9em } +h6 { font-size: 0.8em } /* For headlines at the top of a view, add space */ /* 20090224-changed green fade to gold header image */ @@ -38,6 +37,10 @@ padding:10px 0px 10px 12px; } +/* 20091007 SFO styling added */ +h1.NavTitle { font-size: 1.2em } +h3 .NavListTitle { font-size: 1.1em } + li { margin-bottom:8px; margin-top:8px; @@ -48,28 +51,29 @@ padding-top:10px; margin-top:20px; border-top:1px solid #999; - font-family: Helvetica, sans-serif; - font-size: 11px; - color:#333; + font-family: Verdana, Ariel, Helvetica, sans-serif; + font-size: 0.8em; + color: #333333; } .listing { + background-color: #ffe869; font-family: "Courier New", Courier, mono; + font-size: 1.1em; color: #000000; - background-color: #FFFFCC; margin: 5px 0px; } .code, pre { font-family: "Courier New", Courier, mono; - font-size: 13px; + font-size: 1.1em; color: #000000; } .step { /* background-color: #EEE; */ /* margin: 10px 0px; */ - color: #111; + /* color: #111; */ /* border-bottom:2px solid #EEE; */ } @@ -88,7 +92,6 @@ table { border: solid #999 1px; table-layout: auto; - font-size: 13px; } td, th { @@ -97,11 +100,8 @@ vertical-align:top; } -/* 20070522-replaced gray with green background to match gradiant color for title */ th { - background-color:#FDDD1F; /* background-color:#acd79b; - background-color:#999; - color:#FFF; */ + background-color: #ffd62c; } div.ol.p { @@ -118,11 +118,9 @@ font-weight:normal; } -/* Make all H4 and H5 items appear in bold gray against a light green background */ div h5, div h4 { padding:5px 0px 5px 12px; - background-color:#FFFF66; - /* background-color: #EEE; */ + background-color: #ffd62c; font-weight:bold; color: #000000; } @@ -130,8 +128,6 @@ /* Notes stand out using a light top & bottom borders with dark gray text */ p.note { - /* color: #03C; */ - /* background-color: #FFFF99; */ color: #333; padding: 5px; margin-left: 1em; @@ -143,11 +139,12 @@ /* Figure/Listing/Table titles are centered and gray */ p.figure { - color: #333; + color: #026690; text-align: center; font-weight: bold; } + /* highly visible red background and white text for things that need fixing before release */ /* SHOULD NOT BE PRESENT IN RELEASED PRODUCTS */ .fix { @@ -163,14 +160,14 @@ } .titleSmall { - font-family: Helvetica, sans-serif; - font-size: 11px; + font-family: Verdana, Ariel, Helvetica, sans-serif; + font-size: 0.8em; } .plain { - font-family: Helvetica, sans-serif; - font-size: 12px; + font-family: Verdana, Ariel, Helvetica, sans-serif; + font-size: 0.9em; font-style: normal; line-height: normal; font-weight: normal; @@ -179,6 +176,6 @@ text-decoration: none; } -a:link { color: #0033CC } +a:link { color: #026690 } a:visited { color: #555555 } -a:hover { color: #0033CC } +a:hover { color: #FFD62C } diff -r ed312e9f8961 -r 04365e85d9b0 carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/import_archive_file_project.png Binary file carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/import_archive_file_project.png has changed diff -r ed312e9f8961 -r 04365e85d9b0 carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/import_general_archive_file.png Binary file carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/import_general_archive_file.png has changed diff -r ed312e9f8961 -r 04365e85d9b0 carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/import_project_sources.png Binary file carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/import_project_sources.png has changed diff -r ed312e9f8961 -r 04365e85d9b0 carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/import_source_project.jpg Binary file carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/import_source_project.jpg has changed diff -r ed312e9f8961 -r 04365e85d9b0 carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/sdkTOC.htm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/sdkTOC.htm Thu Feb 04 12:59:43 2010 -0600 @@ -0,0 +1,43 @@ + + + + + + Carbide SDK Overview + + + + + +

Carbide SDK Overview

+ + + + \ No newline at end of file diff -r ed312e9f8961 -r 04365e85d9b0 carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/sdkTOC.xml --- a/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/sdkTOC.xml Mon Feb 01 14:01:35 2010 -0600 +++ b/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/sdkTOC.xml Thu Feb 04 12:59:43 2010 -0600 @@ -6,6 +6,8 @@ + + diff -r ed312e9f8961 -r 04365e85d9b0 core/com.nokia.carbide.cpp/.settings/org.eclipse.core.resources.prefs --- a/core/com.nokia.carbide.cpp/.settings/org.eclipse.core.resources.prefs Mon Feb 01 14:01:35 2010 -0600 +++ b/core/com.nokia.carbide.cpp/.settings/org.eclipse.core.resources.prefs Thu Feb 04 12:59:43 2010 -0600 @@ -1,4 +1,5 @@ #Wed Oct 21 14:27:41 CDT 2009 eclipse.preferences.version=1 encoding/about.ini=UTF-8 +encoding/config.ini=UTF-8 encoding/plugin_customization.ini=UTF-8 diff -r ed312e9f8961 -r 04365e85d9b0 core/com.nokia.carbide.cpp/about.html --- a/core/com.nokia.carbide.cpp/about.html Mon Feb 01 14:01:35 2010 -0600 +++ b/core/com.nokia.carbide.cpp/about.html Thu Feb 04 12:59:43 2010 -0600 @@ -15,7 +15,7 @@

 

 

-

Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +

Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
License: http://www.eclipse.org/legal/epl-v10.html

This product includes software developed by Eclipse Project. http://www.eclipse.org

diff -r ed312e9f8961 -r 04365e85d9b0 core/com.nokia.carbide.cpp/about.ini --- a/core/com.nokia.carbide.cpp/about.ini Mon Feb 01 14:01:35 2010 -0600 +++ b/core/com.nokia.carbide.cpp/about.ini Thu Feb 04 12:59:43 2010 -0600 @@ -26,4 +26,4 @@ # Link to tips and tricks help page # optional -# tipsAndTricksHref=/com.nokia.carbide.cpp.doc.user/html/hints_tips.htm +tipsAndTricksHref=/com.nokia.carbide.cpp.doc.user/html/hints_tips.htm diff -r ed312e9f8961 -r 04365e85d9b0 core/com.nokia.carbide.cpp/book.css --- a/core/com.nokia.carbide.cpp/book.css Mon Feb 01 14:01:35 2010 -0600 +++ b/core/com.nokia.carbide.cpp/book.css Thu Feb 04 12:59:43 2010 -0600 @@ -5,30 +5,29 @@ */ /* Add whitespace around entire display to avoid crowding edges of view */ -/* 20070523-Removed top margin size to close gap between location breadcrumbs and page title */ html { margin: 2px 10px 10px 10px; } -/* Set default font to serif style, 12-pt and plain */ +/* 20091007 added verdana and ariel to list to match SFO website fonts choices */ body, p, table { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 13px; + font-family: Verdana, Ariel, Helvetica, sans-serif; + font-size: 0.9em; font-weight: normal; } -/* Use sans-serif fonts for all title styles */ h1, h2, h3, h4, h5, h6, strong, em { - font-family: Helvetica, sans-serif; + font-family: Verdana, Ariel, Helvetica, sans-serif; color: #000000; } -h1 { font-size:20px } -h2 { font-size:18px } -h3 { font-size:16px } -h4 { font-size:14px } -h5 { font-size:13px } -h6 { font-size:12px } +/* 20091007 - changed sizes to use em versus px */ +h1 { font-size: 1.3em } +h2 { font-size: 1.2em } +h3 { font-size: 1.1em } +h4 { font-size: 1.0em } +h5 { font-size: 0.9em } +h6 { font-size: 0.8em } /* For headlines at the top of a view, add space */ /* 20090224-changed green fade to gold header image */ @@ -48,28 +47,29 @@ padding-top:10px; margin-top:20px; border-top:1px solid #999; - font-family: Helvetica, sans-serif; - font-size: 11px; - color:#333; + font-family: Verdana, Ariel, Helvetica, sans-serif; + font-size: 0.8em; + color: #333333; } .listing { + background-color: #ffe869; font-family: "Courier New", Courier, mono; + font-size: 1.1em; color: #000000; - background-color: #FFFFCC; margin: 5px 0px; } .code, pre { font-family: "Courier New", Courier, mono; - font-size: 13px; + font-size: 1.1em; color: #000000; } .step { /* background-color: #EEE; */ /* margin: 10px 0px; */ - color: #111; + /* color: #111; */ /* border-bottom:2px solid #EEE; */ } @@ -88,7 +88,6 @@ table { border: solid #999 1px; table-layout: auto; - font-size: 13px; } td, th { @@ -97,11 +96,8 @@ vertical-align:top; } -/* 20070522-replaced gray with green background to match gradiant color for title */ th { - background-color:#FDDD1F; /* background-color:#acd79b; - background-color:#999; - color:#FFF; */ + background-color: #ffd62c; } div.ol.p { @@ -118,11 +114,9 @@ font-weight:normal; } -/* Make all H4 and H5 items appear in bold gray against a light green background */ div h5, div h4 { padding:5px 0px 5px 12px; - background-color:#FFFF66; - /* background-color: #EEE; */ + background-color: #ffd62c; font-weight:bold; color: #000000; } @@ -130,8 +124,6 @@ /* Notes stand out using a light top & bottom borders with dark gray text */ p.note { - /* color: #03C; */ - /* background-color: #FFFF99; */ color: #333; padding: 5px; margin-left: 1em; @@ -143,11 +135,12 @@ /* Figure/Listing/Table titles are centered and gray */ p.figure { - color: #333; + color: #026690; text-align: center; font-weight: bold; } + /* highly visible red background and white text for things that need fixing before release */ /* SHOULD NOT BE PRESENT IN RELEASED PRODUCTS */ .fix { @@ -163,14 +156,14 @@ } .titleSmall { - font-family: Helvetica, sans-serif; - font-size: 11px; + font-family: Verdana, Ariel, Helvetica, sans-serif; + font-size: 0.8em; } .plain { - font-family: Helvetica, sans-serif; - font-size: 12px; + font-family: Verdana, Ariel, Helvetica, sans-serif; + font-size: 0.9em; font-style: normal; line-height: normal; font-weight: normal; @@ -179,6 +172,6 @@ text-decoration: none; } -a:link { color: #0033CC } +a:link { color: #026690 } a:visited { color: #555555 } -a:hover { color: #0033CC } +aa:hover { color: #FFD62C } diff -r ed312e9f8961 -r 04365e85d9b0 core/com.nokia.carbide.cpp/html/helpDATA.xml --- a/core/com.nokia.carbide.cpp/html/helpDATA.xml Mon Feb 01 14:01:35 2010 -0600 +++ b/core/com.nokia.carbide.cpp/html/helpDATA.xml Thu Feb 04 12:59:43 2010 -0600 @@ -6,17 +6,30 @@ + + + + + + - - + + + + + + + + + - - - + - - - + + + + + diff -r ed312e9f8961 -r 04365e85d9b0 core/com.nokia.carbide.cpp/html/help_keys_Toc.htm --- a/core/com.nokia.carbide.cpp/html/help_keys_Toc.htm Mon Feb 01 14:01:35 2010 -0600 +++ b/core/com.nokia.carbide.cpp/html/help_keys_Toc.htm Thu Feb 04 12:59:43 2010 -0600 @@ -36,7 +36,7 @@
  • Browse or enter the From preference file name in the Select Import page
  • Click Finish
    • - + \ No newline at end of file diff -r ed312e9f8961 -r 04365e85d9b0 core/com.nokia.carbide.cpp/html/help_keys_carbide.htm --- a/core/com.nokia.carbide.cpp/html/help_keys_carbide.htm Mon Feb 01 14:01:35 2010 -0600 +++ b/core/com.nokia.carbide.cpp/html/help_keys_carbide.htm Thu Feb 04 12:59:43 2010 -0600 @@ -120,7 +120,7 @@
  • Microsoft Visual Studio Shortcuts
  • Nokia Codewarrior Shortcuts
    • - + \ No newline at end of file diff -r ed312e9f8961 -r 04365e85d9b0 core/com.nokia.carbide.cpp/html/help_keys_cw.htm --- a/core/com.nokia.carbide.cpp/html/help_keys_cw.htm Mon Feb 01 14:01:35 2010 -0600 +++ b/core/com.nokia.carbide.cpp/html/help_keys_cw.htm Thu Feb 04 12:59:43 2010 -0600 @@ -205,7 +205,7 @@
  • Microsoft Visual Studio Shortcuts
  • Nokia Carbide.c++ Shortcuts
    • - + \ No newline at end of file diff -r ed312e9f8961 -r 04365e85d9b0 core/com.nokia.carbide.cpp/html/help_keys_vs.htm --- a/core/com.nokia.carbide.cpp/html/help_keys_vs.htm Mon Feb 01 14:01:35 2010 -0600 +++ b/core/com.nokia.carbide.cpp/html/help_keys_vs.htm Thu Feb 04 12:59:43 2010 -0600 @@ -196,7 +196,7 @@
  • Nokia Carbide.c++ Shortcuts
  • Nokia Codewarrior Shortcuts
    • - + \ No newline at end of file diff -r ed312e9f8961 -r 04365e85d9b0 core/com.nokia.carbide.cpp/html/intro/migrateExtensionContent.xml --- a/core/com.nokia.carbide.cpp/html/intro/migrateExtensionContent.xml Mon Feb 01 14:01:35 2010 -0600 +++ b/core/com.nokia.carbide.cpp/html/intro/migrateExtensionContent.xml Thu Feb 04 12:59:43 2010 -0600 @@ -11,13 +11,6 @@ - - Download this whitepaper to learn how Carbide.c++ compares to Microsoft Visual Studio and Nokia CodeWarrior for Symbian development. -

    License Information

    COPYRIGHTS
    -

    Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html

    +

    Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html

    NOTICES

    Portions of this product are covered by the following licenses:

      -
    • Eclipse 3.4 (available at http://www.eclipse.org/legal/epl/notice.php)
      • -
    • Eclipse CDT 5.0 (available at http://www.eclipse.org/legal/epl/notice.php)
      • +
    • Eclipse 3.5 (available at http://www.eclipse.org/legal/epl/notice.php)
      • +
    • Eclipse CDT 6.0 (available at http://www.eclipse.org/legal/epl/notice.php)
    • Eclipse EMF 2.3 (available at http://www.eclipse.org/legal/epl/notice.php)
    • Eclipse GEF 3.3 (available at http://www.eclipse.org/legal/epl/notice.php)
    • Eclipse Remote System Explorer-1.0 (available at http://www.eclipse.org/legal/epl-v10.html)
      • diff -r ed312e9f8961 -r 04365e85d9b0 core/com.nokia.carbide.cpp/html/welcome_note.htm --- a/core/com.nokia.carbide.cpp/html/welcome_note.htm Mon Feb 01 14:01:35 2010 -0600 +++ b/core/com.nokia.carbide.cpp/html/welcome_note.htm Thu Feb 04 12:59:43 2010 -0600 @@ -7,9 +7,9 @@ -

      Welcome to Carbide.c++ 3.0.0

      -

      Thank you for installing Carbide.c++3.0! It's an improvement over 2.5 with many improvements including support for Eclipse 3.5 and CDT 6.0, as well as numerous bug fixes.

      -

      However, perhaps the best part about Carbide.c++ is the Carbide.c++ Development Kit (CDK) that you can use to build custom extensions for Carbide.c++. Update your installation of Carbide through the Carbide.c++ update site to get a copy of the CDK. Take a look, and let us know what you built!

      +

      Welcome to Carbide.c++ 3.0

      +

      Thank you for installing Carbide.c++ 3.0! It's an improvement over 2.5 with many improvements including support for Eclipse 3.5 and CDT 6.0, as well as numerous bug fixes.

      +

      However, perhaps the best part about Carbide.c++ is the Carbide.c++ Development Kit (CDK) that you can use to build custom extensions for Carbide.c++. Update your installation of Carbide through the Carbide.c++ Update Site to get a copy of the Carbide.c++ Development Kit > Carbide.c++ Plug-in SDK. Take a look, and let us know what you build!

      Finally, if you find bugs, please let us know by submitting it at the new Carbide Bugzilla bug tracking site located at https://xdabug001.ext.nokia.com/bugzilla

      For any other questions, please don't hesitate to contact us.

      Thank you again for choosing Carbide.c++! We hope you like it.

      diff -r ed312e9f8961 -r 04365e85d9b0 core/com.nokia.carbide.cpp/plugin.xml --- a/core/com.nokia.carbide.cpp/plugin.xml Mon Feb 01 14:01:35 2010 -0600 +++ b/core/com.nokia.carbide.cpp/plugin.xml Thu Feb 04 12:59:43 2010 -0600 @@ -40,7 +40,7 @@ value="product:themes/carbide/graphics/root/brandmark.gif"/> + value="Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved."/>