diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/colourtag-theme-default.css b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/colourtag-theme-default.css deleted file mode 100644 index 15d12208..00000000 --- a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/colourtag-theme-default.css +++ /dev/null @@ -1,99 +0,0 @@ -/* @group Layout Colours */ - -#bar, -.photo-navigation, -.movie-title { - background-color: #51748C; -} - -#pageHeader #title { - background-color: #FF7E00; -} - -#pageHeader h1, -#pageHeader h2 { - text-shadow: 0px -1px 0px #994B00; -} - -#footer { - background-color: #82B4D7; -} - -#footer p { - text-shadow: 0px -1px 0px #4E6C81; -} - -#breadcrumbcontainer li { - color: #5B7E96; -} - -/* @end */ - -/* @group Content Colours */ - -body, -.blog-entry-body, -.blog-entry-date, -.blog-entry { - color: #7F7F7F; -} - - -#sidebarContainer .sideHeader, -#sidebarContainer #sidebar h1, -#sidebarContainer #sidebar h2, -#sidebarContainer #sidebar h3 { - color: #51748C; -} - -#sidebarContainer { - color: #A6A6A6; -} - -#sidebarContainer #sidebar a, -#breadcrumbcontainer, -a:link, a:visited { - color: #656565; -} - -h1, h2, h3, h4, h5, -h1.blog-entry-title a, -.blog-archive-headings-wrapper, -.album-title, -.photo-title, -.movie-page-title { - color: #FF7E00; -} - - - -/* @end */ - -/* @group Navbar */ - -#navcontainer a { - color: #7F7F7F; -} - -#navcontainer a:hover, -#navcontainer #current, -#navcontainer .currentAncestor, -#sidebarContainer #sidebar a:hover, -.photo-navigation a:hover, -a:hover, a:active, -form, -h1 { - color: #FF7E00; -} - -#navcontainer ul ul a:hover, -#navcontainer ul ul #current, -#navcontainer ul ul .currentAncestor { - background: #FF7E00; - color: #fff; - border-bottom-color: #FF7E00; -} - - - -/* @end */ \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/banner/curve_solid.css b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/banner/curve_solid.css deleted file mode 100644 index da249e32..00000000 --- a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/banner/curve_solid.css +++ /dev/null @@ -1,3 +0,0 @@ -#pageHeader #overlay_curve_solid { - display: block; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/banner/stripes_glow.css b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/banner/stripes_glow.css deleted file mode 100644 index 444f0e6c..00000000 --- a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/banner/stripes_glow.css +++ /dev/null @@ -1,3 +0,0 @@ -#pageHeader #overlay_stripes_glow { -display: block; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/banner/stripes_solid.css b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/banner/stripes_solid.css deleted file mode 100644 index 39c25215..00000000 --- a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/banner/stripes_solid.css +++ /dev/null @@ -1,3 +0,0 @@ -#pageHeader #overlay_stripes_solid { - display: block; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/banner/swirls.css b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/banner/swirls.css deleted file mode 100644 index 6b185fc3..00000000 --- a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/banner/swirls.css +++ /dev/null @@ -1,3 +0,0 @@ -#pageHeader #overlay_swirls { - display: block; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/alternative.css b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/alternative.css deleted file mode 100644 index 0a662f24..00000000 --- a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/alternative.css +++ /dev/null @@ -1,70 +0,0 @@ -.filesharing-item { - background: url(../../images/download_icon.png) no-repeat 0 3px; - padding-left: 20px; -} - -/* @group Blog */ - -.blog-archive-link { - background: url(../../images/blog_home.png) no-repeat 0 5px; - padding-left: 20px; -} - -.blog-entry-date { - padding-left: 20px; - background: url(../../images/blog_clock.png) no-repeat 0 3px; -} - -/*styles the category link in the main entry */ -.blog-entry-category { - background: url(../../images/blog_file.png) no-repeat 0 0; -} - -.blog-entry-body { - padding: 20px 0 40px 0; - background: url(../../images/blog_bottom_bar.png) no-repeat left bottom; -} - -.blog-entry-comments { - padding-left: 20px; - background: url(../../images/blog_comments.png) no-repeat 0 3px; -} - -.blog-trackback-link { - padding-left: 20px; - background: url(../../images/blog_trackback.png) no-repeat 0 0px; -} - -p.blog-entry-tags { - background: url(../../images/blog_tag.png) no-repeat 0 3px; -} - -/* styles the archives in the blog sidebar */ - -.blog-archive-link-enabled { - - background: url(../../images/blog_icon.png) no-repeat 0; -} - -.blog-archive-link-disabled { - background: url(../../images/blog_icon.png) no-repeat 0; -} - -/* Styles the blog categories in the blog sidebar */ - -.blog-category-link-enabled { - background: url(../../images/blog_file.png) no-repeat 0; -} - -.blog-category-link-disabled { - background: url(../../images/blog_file.png) no-repeat 0 3px; -} - -.blog-rss-link { - background: url(../../images/blog_rss.png) no-repeat 0;} - -.blog-comments-rss-link { - background: url(../../images/blog_rss.png) no-repeat 0; -} - -/* @end */ \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/black.css b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/black.css deleted file mode 100644 index a816248e..00000000 --- a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/black.css +++ /dev/null @@ -1,25 +0,0 @@ -.blog-entry-category { - background: url(../../images/file_black.png) no-repeat left 0; - } - -p.blog-entry-tags { - background: url(../../images/tag_black.png) no-repeat left 2px; -} - -.blog-category-link-disabled, -.blog-archive-link-disabled { - background: url(../../images/file_black.png) no-repeat left center; -} - - -.blog-category-link-enabled, -.blog-archive-link-enabled { - background: url(../../images/file_black.png) no-repeat left 1px; -} - -.blog-rss-link { - background: url(../../images/feed.png) no-repeat 0;} - -.blog-comments-rss-link { - background: url(../../images/feed.png) no-repeat 0; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/blue.css b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/blue.css deleted file mode 100644 index a8fdad09..00000000 --- a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/blue.css +++ /dev/null @@ -1,25 +0,0 @@ -.blog-entry-category { - background: url(../../images/file_blue.png) no-repeat left 0; - } - -p.blog-entry-tags { - background: url(../../images/tag_blue.png) no-repeat left 2px; -} - -.blog-category-link-disabled, -.blog-archive-link-disabled { - background: url(../../images/file_blue.png) no-repeat left center; -} - - -.blog-category-link-enabled, -.blog-archive-link-enabled { - background: url(../../images/file_blue.png) no-repeat left 1px; -} - -.blog-rss-link { - background: url(../../images/feed.png) no-repeat 0;} - -.blog-comments-rss-link { - background: url(../../images/feed.png) no-repeat 0; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/brown.css b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/brown.css deleted file mode 100644 index 52d8a6b1..00000000 --- a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/brown.css +++ /dev/null @@ -1,25 +0,0 @@ -.blog-entry-category { - background: url(../../images/file_brown.png) no-repeat left 0; - } - -p.blog-entry-tags { - background: url(../../images/tag_brown.png) no-repeat left 2px; -} - -.blog-category-link-disabled, -.blog-archive-link-disabled { - background: url(../../images/file_brown.png) no-repeat left center; -} - - -.blog-category-link-enabled, -.blog-archive-link-enabled { - background: url(../../images/file_brown.png) no-repeat left 1px; -} - -.blog-rss-link { - background: url(../../images/feed.png) no-repeat 0;} - -.blog-comments-rss-link { - background: url(../../images/feed.png) no-repeat 0; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/green.css b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/green.css deleted file mode 100644 index 1114ad47..00000000 --- a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/green.css +++ /dev/null @@ -1,25 +0,0 @@ -.blog-entry-category { - background: url(../../images/file_green.png) no-repeat left 0; - } - -p.blog-entry-tags { - background: url(../../images/tag_green.png) no-repeat left 2px; -} - -.blog-category-link-disabled, -.blog-archive-link-disabled { - background: url(../../images/file_green.png) no-repeat left center; -} - - -.blog-category-link-enabled, -.blog-archive-link-enabled { - background: url(../../images/file_green.png) no-repeat left 1px; -} - -.blog-rss-link { - background: url(../../images/feed.png) no-repeat 0;} - -.blog-comments-rss-link { - background: url(../../images/feed.png) no-repeat 0; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/pink.css b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/pink.css deleted file mode 100644 index ac25b094..00000000 --- a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/pink.css +++ /dev/null @@ -1,26 +0,0 @@ -.blog-entry-category { - background: url(../../images/file_pink.png) no-repeat left 0; - } - -p.blog-entry-tags { - background: url(../../images/tag_pink.png) no-repeat left 2px; -} - - -.blog-category-link-disabled, -.blog-archive-link-disabled { - background: url(../../images/file_pink.png) no-repeat left center; -} - - -.blog-category-link-enabled, -.blog-archive-link-enabled { - background: url(../../images/file_pink.png) no-repeat left 2px; -} - -.blog-rss-link { - background: url(../../images/feed.png) no-repeat 0;} - -.blog-comments-rss-link { - background: url(../../images/feed.png) no-repeat 0; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/red.css b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/red.css deleted file mode 100644 index 7d23dfdb..00000000 --- a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/icons/red.css +++ /dev/null @@ -1,32 +0,0 @@ -.blog-entry-category { - background: url(../../images/file_red.png) no-repeat left 0; - } - -p.blog-entry-tags { - background: url(../../images/tag_red.png) no-repeat left 2px; -} - -.blog-category-link-disabled, -.blog-archive-link-disabled { - background: url(../../images/file_red.png) no-repeat left center; -} - - -.blog-category-link-enabled, -.blog-archive-link-enabled { - background: url(../../images/file_red.png) no-repeat left 1px; -} - -.blog-rss-link { - background: url(../../images/feed.png) no-repeat 0;} - -.blog-comments-rss-link { - background: url(../../images/feed.png) no-repeat 0; -} - -.blog-rss-link { - background: url(../../images/feed.png) no-repeat 0;} - -.blog-comments-rss-link { - background: url(../../images/feed.png) no-repeat 0; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/logo_position/center.css b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/logo_position/center.css deleted file mode 100644 index ee422a98..00000000 --- a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/logo_position/center.css +++ /dev/null @@ -1,3 +0,0 @@ -#pageHeader #logo img { - margin: 10px auto 0; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/logo_position/left.css b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/logo_position/left.css deleted file mode 100644 index beb0cbf7..00000000 --- a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/logo_position/left.css +++ /dev/null @@ -1,4 +0,0 @@ -#pageHeader #logo img { - float: left; - margin: 10px 0 0 30px; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/logo_position/right.css b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/logo_position/right.css deleted file mode 100644 index a4a0caf7..00000000 --- a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/logo_position/right.css +++ /dev/null @@ -1,4 +0,0 @@ -#pageHeader #logo img { - float: right; - margin: 10px 30px 0 0; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/sidebar/sidebar_left.css b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/sidebar/sidebar_left.css deleted file mode 100644 index d9592ade..00000000 --- a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/sidebar/sidebar_left.css +++ /dev/null @@ -1,15 +0,0 @@ -#contentContainer { - float: right; - padding-right: 7px; - background-position: top left; -} - -#sidebarContainer { - float: left; - padding-left: 7px; -} - -#sidebarContainer #sidebar { - padding-left: 30px; - padding-right: 10px; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/sidebar/sidebar_none.css b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/sidebar/sidebar_none.css deleted file mode 100644 index d18e1f27..00000000 --- a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/sidebar/sidebar_none.css +++ /dev/null @@ -1,8 +0,0 @@ -#sidebarContainer { - display: none; -} - -#contentContainer { - width: auto; - background-image: none; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/sidebar/sidebar_right.css b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/sidebar/sidebar_right.css deleted file mode 100644 index 5a0a941b..00000000 --- a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/sidebar/sidebar_right.css +++ /dev/null @@ -1,15 +0,0 @@ -#contentContainer { - float: left; - padding-left: 7px; - background-position: top right; -} - -#sidebarContainer { - float: right; - padding-right: 7px; -} - -#sidebarContainer #sidebar { - padding-right: 30px; - padding-left: 10px; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_bottom_bar.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_bottom_bar.png deleted file mode 100644 index a76ad531..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_bottom_bar.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_clock.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_clock.png deleted file mode 100644 index 9aed16dc..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_clock.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_comments.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_comments.png deleted file mode 100644 index 36af5fc7..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_comments.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_file.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_file.png deleted file mode 100644 index 2c723b42..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_file.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_home.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_home.png deleted file mode 100644 index b69156e5..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_home.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_icon.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_icon.png deleted file mode 100644 index 417efe66..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_icon.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_rss.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_rss.png deleted file mode 100644 index 3c7e8439..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_rss.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_tag.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_tag.png deleted file mode 100644 index 3be03350..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_tag.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_trackback.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_trackback.png deleted file mode 100644 index 0b29d7af..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/blog_trackback.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/button_over.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/button_over.png deleted file mode 100644 index 54d9ee15..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/button_over.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/container_top_grad.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/container_top_grad.png deleted file mode 100644 index 608b6107..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/container_top_grad.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/content_sep.bak.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/content_sep.bak.png deleted file mode 100644 index 8762f462..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/content_sep.bak.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/content_sep.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/content_sep.png deleted file mode 100644 index 2fe33d61..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/content_sep.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/content_top.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/content_top.png deleted file mode 100644 index 1331d890..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/content_top.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/download_icon.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/download_icon.png deleted file mode 100644 index def80b9a..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/download_icon.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/file_black.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/file_black.png deleted file mode 100644 index 4b0e2118..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/file_black.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/file_blue.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/file_blue.png deleted file mode 100644 index fa483bee..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/file_blue.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/file_brown.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/file_brown.png deleted file mode 100644 index 72bde9fc..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/file_brown.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/file_green.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/file_green.png deleted file mode 100644 index 512f704f..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/file_green.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/file_pink.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/file_pink.png deleted file mode 100644 index 3e598435..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/file_pink.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/file_red.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/file_red.png deleted file mode 100644 index 6f1963c4..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/file_red.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/header_bg.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/header_bg.png deleted file mode 100644 index bcef0a8d..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/header_bg.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/header_curve_solid.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/header_curve_solid.png deleted file mode 100644 index 20b2a4b6..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/header_curve_solid.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/header_stripes_glow.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/header_stripes_glow.png deleted file mode 100644 index dc4d0eee..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/header_stripes_glow.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/header_stripes_solid.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/header_stripes_solid.png deleted file mode 100644 index e36f3337..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/header_stripes_solid.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/header_swirls.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/header_swirls.png deleted file mode 100644 index ce8a27a3..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/header_swirls.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/photo_shadow_bottom.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/photo_shadow_bottom.png deleted file mode 100644 index a742b538..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/photo_shadow_bottom.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/photo_shadow_top.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/photo_shadow_top.png deleted file mode 100644 index 814c0d30..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/photo_shadow_top.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/photo_thumbnail.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/photo_thumbnail.png deleted file mode 100644 index 47750b33..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/photo_thumbnail.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/tag_black.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/tag_black.png deleted file mode 100644 index 485b8971..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/tag_black.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/tag_blue.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/tag_blue.png deleted file mode 100644 index b51fda54..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/tag_blue.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/tag_brown.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/tag_brown.png deleted file mode 100644 index e472389c..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/tag_brown.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/tag_green.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/tag_green.png deleted file mode 100644 index 27d833b8..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/tag_green.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/tag_pink.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/tag_pink.png deleted file mode 100644 index dbdc1ee4..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/tag_pink.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/tag_red.png b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/tag_red.png deleted file mode 100644 index 9c8a716a..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/images/tag_red.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/png/pngbehavior.htc b/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/png/pngbehavior.htc deleted file mode 100644 index 09ff463c..00000000 --- a/resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/png/pngbehavior.htc +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/colourtag-theme-default.css b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/colourtag-theme-default.css deleted file mode 100644 index 15d12208..00000000 --- a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/colourtag-theme-default.css +++ /dev/null @@ -1,99 +0,0 @@ -/* @group Layout Colours */ - -#bar, -.photo-navigation, -.movie-title { - background-color: #51748C; -} - -#pageHeader #title { - background-color: #FF7E00; -} - -#pageHeader h1, -#pageHeader h2 { - text-shadow: 0px -1px 0px #994B00; -} - -#footer { - background-color: #82B4D7; -} - -#footer p { - text-shadow: 0px -1px 0px #4E6C81; -} - -#breadcrumbcontainer li { - color: #5B7E96; -} - -/* @end */ - -/* @group Content Colours */ - -body, -.blog-entry-body, -.blog-entry-date, -.blog-entry { - color: #7F7F7F; -} - - -#sidebarContainer .sideHeader, -#sidebarContainer #sidebar h1, -#sidebarContainer #sidebar h2, -#sidebarContainer #sidebar h3 { - color: #51748C; -} - -#sidebarContainer { - color: #A6A6A6; -} - -#sidebarContainer #sidebar a, -#breadcrumbcontainer, -a:link, a:visited { - color: #656565; -} - -h1, h2, h3, h4, h5, -h1.blog-entry-title a, -.blog-archive-headings-wrapper, -.album-title, -.photo-title, -.movie-page-title { - color: #FF7E00; -} - - - -/* @end */ - -/* @group Navbar */ - -#navcontainer a { - color: #7F7F7F; -} - -#navcontainer a:hover, -#navcontainer #current, -#navcontainer .currentAncestor, -#sidebarContainer #sidebar a:hover, -.photo-navigation a:hover, -a:hover, a:active, -form, -h1 { - color: #FF7E00; -} - -#navcontainer ul ul a:hover, -#navcontainer ul ul #current, -#navcontainer ul ul .currentAncestor { - background: #FF7E00; - color: #fff; - border-bottom-color: #FF7E00; -} - - - -/* @end */ \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/banner/curve_solid.css b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/banner/curve_solid.css deleted file mode 100644 index da249e32..00000000 --- a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/banner/curve_solid.css +++ /dev/null @@ -1,3 +0,0 @@ -#pageHeader #overlay_curve_solid { - display: block; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/banner/stripes_glow.css b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/banner/stripes_glow.css deleted file mode 100644 index 444f0e6c..00000000 --- a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/banner/stripes_glow.css +++ /dev/null @@ -1,3 +0,0 @@ -#pageHeader #overlay_stripes_glow { -display: block; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/banner/stripes_solid.css b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/banner/stripes_solid.css deleted file mode 100644 index 39c25215..00000000 --- a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/banner/stripes_solid.css +++ /dev/null @@ -1,3 +0,0 @@ -#pageHeader #overlay_stripes_solid { - display: block; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/banner/swirls.css b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/banner/swirls.css deleted file mode 100644 index 6b185fc3..00000000 --- a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/banner/swirls.css +++ /dev/null @@ -1,3 +0,0 @@ -#pageHeader #overlay_swirls { - display: block; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/alternative.css b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/alternative.css deleted file mode 100644 index 0a662f24..00000000 --- a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/alternative.css +++ /dev/null @@ -1,70 +0,0 @@ -.filesharing-item { - background: url(../../images/download_icon.png) no-repeat 0 3px; - padding-left: 20px; -} - -/* @group Blog */ - -.blog-archive-link { - background: url(../../images/blog_home.png) no-repeat 0 5px; - padding-left: 20px; -} - -.blog-entry-date { - padding-left: 20px; - background: url(../../images/blog_clock.png) no-repeat 0 3px; -} - -/*styles the category link in the main entry */ -.blog-entry-category { - background: url(../../images/blog_file.png) no-repeat 0 0; -} - -.blog-entry-body { - padding: 20px 0 40px 0; - background: url(../../images/blog_bottom_bar.png) no-repeat left bottom; -} - -.blog-entry-comments { - padding-left: 20px; - background: url(../../images/blog_comments.png) no-repeat 0 3px; -} - -.blog-trackback-link { - padding-left: 20px; - background: url(../../images/blog_trackback.png) no-repeat 0 0px; -} - -p.blog-entry-tags { - background: url(../../images/blog_tag.png) no-repeat 0 3px; -} - -/* styles the archives in the blog sidebar */ - -.blog-archive-link-enabled { - - background: url(../../images/blog_icon.png) no-repeat 0; -} - -.blog-archive-link-disabled { - background: url(../../images/blog_icon.png) no-repeat 0; -} - -/* Styles the blog categories in the blog sidebar */ - -.blog-category-link-enabled { - background: url(../../images/blog_file.png) no-repeat 0; -} - -.blog-category-link-disabled { - background: url(../../images/blog_file.png) no-repeat 0 3px; -} - -.blog-rss-link { - background: url(../../images/blog_rss.png) no-repeat 0;} - -.blog-comments-rss-link { - background: url(../../images/blog_rss.png) no-repeat 0; -} - -/* @end */ \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/black.css b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/black.css deleted file mode 100644 index a816248e..00000000 --- a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/black.css +++ /dev/null @@ -1,25 +0,0 @@ -.blog-entry-category { - background: url(../../images/file_black.png) no-repeat left 0; - } - -p.blog-entry-tags { - background: url(../../images/tag_black.png) no-repeat left 2px; -} - -.blog-category-link-disabled, -.blog-archive-link-disabled { - background: url(../../images/file_black.png) no-repeat left center; -} - - -.blog-category-link-enabled, -.blog-archive-link-enabled { - background: url(../../images/file_black.png) no-repeat left 1px; -} - -.blog-rss-link { - background: url(../../images/feed.png) no-repeat 0;} - -.blog-comments-rss-link { - background: url(../../images/feed.png) no-repeat 0; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/blue.css b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/blue.css deleted file mode 100644 index a8fdad09..00000000 --- a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/blue.css +++ /dev/null @@ -1,25 +0,0 @@ -.blog-entry-category { - background: url(../../images/file_blue.png) no-repeat left 0; - } - -p.blog-entry-tags { - background: url(../../images/tag_blue.png) no-repeat left 2px; -} - -.blog-category-link-disabled, -.blog-archive-link-disabled { - background: url(../../images/file_blue.png) no-repeat left center; -} - - -.blog-category-link-enabled, -.blog-archive-link-enabled { - background: url(../../images/file_blue.png) no-repeat left 1px; -} - -.blog-rss-link { - background: url(../../images/feed.png) no-repeat 0;} - -.blog-comments-rss-link { - background: url(../../images/feed.png) no-repeat 0; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/brown.css b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/brown.css deleted file mode 100644 index 52d8a6b1..00000000 --- a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/brown.css +++ /dev/null @@ -1,25 +0,0 @@ -.blog-entry-category { - background: url(../../images/file_brown.png) no-repeat left 0; - } - -p.blog-entry-tags { - background: url(../../images/tag_brown.png) no-repeat left 2px; -} - -.blog-category-link-disabled, -.blog-archive-link-disabled { - background: url(../../images/file_brown.png) no-repeat left center; -} - - -.blog-category-link-enabled, -.blog-archive-link-enabled { - background: url(../../images/file_brown.png) no-repeat left 1px; -} - -.blog-rss-link { - background: url(../../images/feed.png) no-repeat 0;} - -.blog-comments-rss-link { - background: url(../../images/feed.png) no-repeat 0; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/green.css b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/green.css deleted file mode 100644 index 1114ad47..00000000 --- a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/green.css +++ /dev/null @@ -1,25 +0,0 @@ -.blog-entry-category { - background: url(../../images/file_green.png) no-repeat left 0; - } - -p.blog-entry-tags { - background: url(../../images/tag_green.png) no-repeat left 2px; -} - -.blog-category-link-disabled, -.blog-archive-link-disabled { - background: url(../../images/file_green.png) no-repeat left center; -} - - -.blog-category-link-enabled, -.blog-archive-link-enabled { - background: url(../../images/file_green.png) no-repeat left 1px; -} - -.blog-rss-link { - background: url(../../images/feed.png) no-repeat 0;} - -.blog-comments-rss-link { - background: url(../../images/feed.png) no-repeat 0; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/pink.css b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/pink.css deleted file mode 100644 index ac25b094..00000000 --- a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/pink.css +++ /dev/null @@ -1,26 +0,0 @@ -.blog-entry-category { - background: url(../../images/file_pink.png) no-repeat left 0; - } - -p.blog-entry-tags { - background: url(../../images/tag_pink.png) no-repeat left 2px; -} - - -.blog-category-link-disabled, -.blog-archive-link-disabled { - background: url(../../images/file_pink.png) no-repeat left center; -} - - -.blog-category-link-enabled, -.blog-archive-link-enabled { - background: url(../../images/file_pink.png) no-repeat left 2px; -} - -.blog-rss-link { - background: url(../../images/feed.png) no-repeat 0;} - -.blog-comments-rss-link { - background: url(../../images/feed.png) no-repeat 0; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/red.css b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/red.css deleted file mode 100644 index 7d23dfdb..00000000 --- a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/icons/red.css +++ /dev/null @@ -1,32 +0,0 @@ -.blog-entry-category { - background: url(../../images/file_red.png) no-repeat left 0; - } - -p.blog-entry-tags { - background: url(../../images/tag_red.png) no-repeat left 2px; -} - -.blog-category-link-disabled, -.blog-archive-link-disabled { - background: url(../../images/file_red.png) no-repeat left center; -} - - -.blog-category-link-enabled, -.blog-archive-link-enabled { - background: url(../../images/file_red.png) no-repeat left 1px; -} - -.blog-rss-link { - background: url(../../images/feed.png) no-repeat 0;} - -.blog-comments-rss-link { - background: url(../../images/feed.png) no-repeat 0; -} - -.blog-rss-link { - background: url(../../images/feed.png) no-repeat 0;} - -.blog-comments-rss-link { - background: url(../../images/feed.png) no-repeat 0; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/logo_position/center.css b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/logo_position/center.css deleted file mode 100644 index ee422a98..00000000 --- a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/logo_position/center.css +++ /dev/null @@ -1,3 +0,0 @@ -#pageHeader #logo img { - margin: 10px auto 0; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/logo_position/left.css b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/logo_position/left.css deleted file mode 100644 index beb0cbf7..00000000 --- a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/logo_position/left.css +++ /dev/null @@ -1,4 +0,0 @@ -#pageHeader #logo img { - float: left; - margin: 10px 0 0 30px; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/logo_position/right.css b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/logo_position/right.css deleted file mode 100644 index a4a0caf7..00000000 --- a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/logo_position/right.css +++ /dev/null @@ -1,4 +0,0 @@ -#pageHeader #logo img { - float: right; - margin: 10px 30px 0 0; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/sidebar/sidebar_left.css b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/sidebar/sidebar_left.css deleted file mode 100644 index d9592ade..00000000 --- a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/sidebar/sidebar_left.css +++ /dev/null @@ -1,15 +0,0 @@ -#contentContainer { - float: right; - padding-right: 7px; - background-position: top left; -} - -#sidebarContainer { - float: left; - padding-left: 7px; -} - -#sidebarContainer #sidebar { - padding-left: 30px; - padding-right: 10px; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/sidebar/sidebar_none.css b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/sidebar/sidebar_none.css deleted file mode 100644 index d18e1f27..00000000 --- a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/sidebar/sidebar_none.css +++ /dev/null @@ -1,8 +0,0 @@ -#sidebarContainer { - display: none; -} - -#contentContainer { - width: auto; - background-image: none; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/sidebar/sidebar_right.css b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/sidebar/sidebar_right.css deleted file mode 100644 index 5a0a941b..00000000 --- a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/sidebar/sidebar_right.css +++ /dev/null @@ -1,15 +0,0 @@ -#contentContainer { - float: left; - padding-left: 7px; - background-position: top right; -} - -#sidebarContainer { - float: right; - padding-right: 7px; -} - -#sidebarContainer #sidebar { - padding-right: 30px; - padding-left: 10px; -} \ No newline at end of file diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_bottom_bar.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_bottom_bar.png deleted file mode 100644 index a76ad531..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_bottom_bar.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_clock.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_clock.png deleted file mode 100644 index 9aed16dc..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_clock.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_comments.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_comments.png deleted file mode 100644 index 36af5fc7..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_comments.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_file.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_file.png deleted file mode 100644 index 2c723b42..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_file.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_home.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_home.png deleted file mode 100644 index b69156e5..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_home.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_icon.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_icon.png deleted file mode 100644 index 417efe66..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_icon.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_rss.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_rss.png deleted file mode 100644 index 3c7e8439..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_rss.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_tag.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_tag.png deleted file mode 100644 index 3be03350..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_tag.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_trackback.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_trackback.png deleted file mode 100644 index 0b29d7af..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/blog_trackback.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/button_over.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/button_over.png deleted file mode 100644 index 54d9ee15..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/button_over.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/container_top_grad.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/container_top_grad.png deleted file mode 100644 index 608b6107..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/container_top_grad.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/content_sep.bak.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/content_sep.bak.png deleted file mode 100644 index 8762f462..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/content_sep.bak.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/content_sep.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/content_sep.png deleted file mode 100644 index 2fe33d61..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/content_sep.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/content_top.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/content_top.png deleted file mode 100644 index 1331d890..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/content_top.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/download_icon.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/download_icon.png deleted file mode 100644 index def80b9a..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/download_icon.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/file_black.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/file_black.png deleted file mode 100644 index 4b0e2118..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/file_black.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/file_blue.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/file_blue.png deleted file mode 100644 index fa483bee..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/file_blue.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/file_brown.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/file_brown.png deleted file mode 100644 index 72bde9fc..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/file_brown.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/file_green.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/file_green.png deleted file mode 100644 index 512f704f..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/file_green.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/file_pink.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/file_pink.png deleted file mode 100644 index 3e598435..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/file_pink.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/file_red.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/file_red.png deleted file mode 100644 index 6f1963c4..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/file_red.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/header_bg.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/header_bg.png deleted file mode 100644 index bcef0a8d..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/header_bg.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/header_curve_solid.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/header_curve_solid.png deleted file mode 100644 index 20b2a4b6..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/header_curve_solid.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/header_stripes_glow.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/header_stripes_glow.png deleted file mode 100644 index dc4d0eee..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/header_stripes_glow.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/header_stripes_solid.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/header_stripes_solid.png deleted file mode 100644 index e36f3337..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/header_stripes_solid.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/header_swirls.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/header_swirls.png deleted file mode 100644 index ce8a27a3..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/header_swirls.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/photo_shadow_bottom.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/photo_shadow_bottom.png deleted file mode 100644 index a742b538..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/photo_shadow_bottom.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/photo_shadow_top.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/photo_shadow_top.png deleted file mode 100644 index 814c0d30..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/photo_shadow_top.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/photo_thumbnail.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/photo_thumbnail.png deleted file mode 100644 index 47750b33..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/photo_thumbnail.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/tag_black.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/tag_black.png deleted file mode 100644 index 485b8971..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/tag_black.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/tag_blue.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/tag_blue.png deleted file mode 100644 index b51fda54..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/tag_blue.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/tag_brown.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/tag_brown.png deleted file mode 100644 index e472389c..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/tag_brown.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/tag_green.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/tag_green.png deleted file mode 100644 index 27d833b8..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/tag_green.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/tag_pink.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/tag_pink.png deleted file mode 100644 index dbdc1ee4..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/tag_pink.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/tag_red.png b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/tag_red.png deleted file mode 100644 index 9c8a716a..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/images/tag_red.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/png/pngbehavior.htc b/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/png/pngbehavior.htc deleted file mode 100644 index 09ff463c..00000000 --- a/resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/png/pngbehavior.htc +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index 486d8557..53d0688d 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -70,6 +70,12 @@ const QString UBSvgSubsetAdaptor::sPixelUnit = "px"; const QString UBSvgSubsetAdaptor::sFontWeightPrefix = "font-weight:"; const QString UBSvgSubsetAdaptor::sFontStylePrefix = "font-style:"; const QString UBSvgSubsetAdaptor::sFormerUniboardDocumentNamespaceUri = "http://www.mnemis.com/uniboard"; + +const QString tElement = "element"; +const QString tGroup = "group"; +const QString tGroups = "groups"; +const QString aId = "id"; + QMap UBSvgSubsetAdaptor::additionalElementToStore; QString UBSvgSubsetAdaptor::toSvgTransform(const QMatrix& matrix) @@ -107,6 +113,7 @@ QMatrix UBSvgSubsetAdaptor::fromSvgTransform(const QString& transform) } + static bool itemZIndexComp(const QGraphicsItem* item1, const QGraphicsItem* item2) { @@ -360,7 +367,7 @@ UBSvgSubsetAdaptor::UBSvgSubsetReader::UBSvgSubsetReader(UBDocumentProxy* pProxy UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() { - UBGraphicsScene *scene = 0; + mScene = 0; UBGraphicsWidgetItem *currentWidget = 0; mFileVersion = 40100; // default to 4.1.0 @@ -369,19 +376,20 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() UBGraphicsStrokesGroup* strokesGroup = 0; UBDrawingController* dc = UBDrawingController::drawingController(); - while (!mXmlReader.atEnd()) { mXmlReader.readNext(); if (mXmlReader.isStartElement()) { qreal zFromSvg = getZValueFromSvg(); + QUuid uuidFromSvg = getUuidFromSvg(); + if (mXmlReader.name() == "svg") { - if (!scene) + if (!mScene) { - scene = new UBGraphicsScene(mProxy); + mScene = new UBGraphicsScene(mProxy); } // introduced in UB 4.2 @@ -418,7 +426,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() if (!svgSceneUuid.isNull()) { - scene->setUuid(QUuid(svgSceneUuid.toString())); + mScene->setUuid(QUuid(svgSceneUuid.toString())); } // introduced in UB 4.0 @@ -438,7 +446,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() sceneRect.setWidth(ts.at(2).toFloat()); sceneRect.setHeight(ts.at(3).toFloat()); - scene->setSceneRect(sceneRect); + mScene->setSceneRect(sceneRect); } else { @@ -459,7 +467,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() if (!ubDarkBackground.isNull()) crossedBackground = (ubCrossedBackground.toString() == xmlTrue); - scene->setBackground(darkBackground, crossedBackground); + mScene->setBackground(darkBackground, crossedBackground); QStringRef pageNominalSize = mXmlReader.attributes().value(mNamespaceUri, "nominal-size"); if (!pageNominalSize.isNull()) @@ -472,7 +480,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() sceneSize.setWidth(ts.at(0).toInt()); sceneSize.setHeight(ts.at(1).toInt()); - scene->setNominalSize(sceneSize); + mScene->setNominalSize(sceneSize); } else { @@ -525,11 +533,11 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() if (mXmlReader.name() == "polygon") { - polygonItem = polygonItemFromPolygonSvg(scene->isDarkBackground() ? Qt::white : Qt::black); + polygonItem = polygonItemFromPolygonSvg(mScene->isDarkBackground() ? Qt::white : Qt::black); } else if (mXmlReader.name() == "line") { - polygonItem = polygonItemFromLineSvg(scene->isDarkBackground() ? Qt::white : Qt::black); + polygonItem = polygonItemFromLineSvg(mScene->isDarkBackground() ? Qt::white : Qt::black); } if (polygonItem) @@ -546,7 +554,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() polygonItem->setStrokesGroup(strokesGroup); } }else{ - scene->addItem(polygonItem); + mScene->addItem(polygonItem); } polygonItem->setData(UBGraphicsItemData::ItemLayerType, QVariant(UBItemLayerType::Graphic)); @@ -557,7 +565,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() else if (mXmlReader.name() == "polyline") { QList polygonItems - = polygonItemsFromPolylineSvg(scene->isDarkBackground() ? Qt::white : Qt::black); + = polygonItemsFromPolylineSvg(mScene->isDarkBackground() ? Qt::white : Qt::black); foreach(UBGraphicsPolygonItem* polygonItem, polygonItems) { @@ -572,7 +580,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() strokesGroup->addToGroup(polygonItem); } }else{ - scene->addItem(polygonItem); + mScene->addItem(polygonItem); } polygonItem->setData(UBGraphicsItemData::ItemLayerType, QVariant(UBItemLayerType::Graphic)); @@ -594,19 +602,22 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() if (href.contains("png")) { - QGraphicsPixmapItem* pixmapItem = pixmapItemFromSvg(); + UBGraphicsPixmapItem* pixmapItem = pixmapItemFromSvg(); if (pixmapItem) { pixmapItem->setFlag(QGraphicsItem::ItemIsMovable, true); pixmapItem->setFlag(QGraphicsItem::ItemIsSelectable, true); - scene->addItem(pixmapItem); + mScene->addItem(pixmapItem); if (zFromSvg != UBZLayerController::errorNum()) UBGraphicsItem::assignZValue(pixmapItem, zFromSvg); + if (!uuidFromSvg.isNull()) + pixmapItem->setUuid(uuidFromSvg); + if (isBackground) - scene->setAsBackgroundObject(pixmapItem); + mScene->setAsBackgroundObject(pixmapItem); pixmapItem->show(); } @@ -620,13 +631,13 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() svgItem->setFlag(QGraphicsItem::ItemIsMovable, true); svgItem->setFlag(QGraphicsItem::ItemIsSelectable, true); - scene->addItem(svgItem); + mScene->addItem(svgItem); if (zFromSvg != UBZLayerController::errorNum()) UBGraphicsItem::assignZValue(svgItem, zFromSvg); if (isBackground) - scene->setAsBackgroundObject(svgItem); + mScene->setAsBackgroundObject(svgItem); svgItem->show(); } @@ -646,11 +657,14 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() audioItem->setFlag(QGraphicsItem::ItemIsMovable, true); audioItem->setFlag(QGraphicsItem::ItemIsSelectable, true); - scene->addItem(audioItem); + mScene->addItem(audioItem); if (zFromSvg != UBZLayerController::errorNum()) UBGraphicsItem::assignZValue(audioItem, zFromSvg); + if (!uuidFromSvg.isNull()) + audioItem->setUuid(uuidFromSvg); + audioItem->show(); //force start to load the video and display the first frame @@ -667,11 +681,14 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() videoItem->setFlag(QGraphicsItem::ItemIsMovable, true); videoItem->setFlag(QGraphicsItem::ItemIsSelectable, true); - scene->addItem(videoItem); + mScene->addItem(videoItem); if (zFromSvg != UBZLayerController::errorNum()) UBGraphicsItem::assignZValue(videoItem, zFromSvg); + if (!uuidFromSvg.isNull()) + videoItem->setUuid(uuidFromSvg); + videoItem->show(); //force start to load the video and display the first frame @@ -688,11 +705,14 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() textItem->setFlag(QGraphicsItem::ItemIsMovable, true); textItem->setFlag(QGraphicsItem::ItemIsSelectable, true); - scene->addItem(textItem); + mScene->addItem(textItem); if (zFromSvg != UBZLayerController::errorNum()) UBGraphicsItem::assignZValue(textItem, zFromSvg); + if (!uuidFromSvg.isNull()) + textItem->setUuid(uuidFromSvg); + textItem->show(); } } @@ -702,11 +722,14 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() if (mask) { - scene->addItem(mask); - scene->registerTool(mask); + mScene->addItem(mask); + mScene->registerTool(mask); if (zFromSvg != UBZLayerController::errorNum()) UBGraphicsItem::assignZValue(mask, zFromSvg); + + if (!uuidFromSvg.isNull()) + mask->setUuid(uuidFromSvg); } } else if (mXmlReader.name() == "ruler") @@ -718,8 +741,8 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() ubZValue = mXmlReader.attributes().value(mNamespaceUri, "z-value").toString(); if (ruler) { - scene->addItem(ruler); - scene->registerTool(ruler); + mScene->addItem(ruler); + mScene->registerTool(ruler); if (zFromSvg != UBZLayerController::errorNum()) UBGraphicsItem::assignZValue(ruler, zFromSvg); @@ -732,8 +755,8 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() if (compass) { - scene->addItem(compass); - scene->registerTool(compass); + mScene->addItem(compass); + mScene->registerTool(compass); if (zFromSvg != UBZLayerController::errorNum()) UBGraphicsItem::assignZValue(compass, zFromSvg); @@ -745,8 +768,8 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() if (protractor) { - scene->addItem(protractor); - scene->registerTool(protractor); + mScene->addItem(protractor); + mScene->registerTool(protractor); if (zFromSvg != UBZLayerController::errorNum()) UBGraphicsItem::assignZValue(protractor, zFromSvg); @@ -758,8 +781,8 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() if (triangle) { - scene->addItem(triangle); - scene->registerTool(triangle); + mScene->addItem(triangle); + mScene->registerTool(triangle); if (zFromSvg != UBZLayerController::errorNum()) UBGraphicsItem::assignZValue(triangle, zFromSvg); @@ -770,8 +793,8 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() UBGraphicsCache* cache = cacheFromSvg(); if(cache) { - scene->addItem(cache); - scene->registerTool(cache); + mScene->addItem(cache); + mScene->registerTool(cache); UBApplication::boardController->notifyCache(true); if (zFromSvg != UBZLayerController::errorNum()) @@ -796,13 +819,13 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() pdfItem->setFlag(QGraphicsItem::ItemIsMovable, true); pdfItem->setFlag(QGraphicsItem::ItemIsSelectable, true); - scene->addItem(pdfItem); + mScene->addItem(pdfItem); if (zFromSvg != UBZLayerController::errorNum()) UBGraphicsItem::assignZValue(pdfItem, zFromSvg); if (isBackground) - scene->setAsBackgroundObject(pdfItem); + mScene->setAsBackgroundObject(pdfItem); pdfItem->show(); @@ -819,11 +842,14 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() appleWidgetItem->resize(foreignObjectWidth, foreignObjectHeight); - scene->addItem(appleWidgetItem); + mScene->addItem(appleWidgetItem); if (zFromSvg != UBZLayerController::errorNum()) UBGraphicsItem::assignZValue(appleWidgetItem, zFromSvg); + if (!uuidFromSvg.isNull()) + appleWidgetItem->setUuid(uuidFromSvg); + appleWidgetItem->show(); currentWidget = appleWidgetItem; @@ -840,11 +866,14 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() w3cWidgetItem->resize(foreignObjectWidth, foreignObjectHeight); - scene->addItem(w3cWidgetItem); + mScene->addItem(w3cWidgetItem); if (zFromSvg != UBZLayerController::errorNum()) UBGraphicsItem::assignZValue(w3cWidgetItem, zFromSvg); + if (!uuidFromSvg.isNull()) + w3cWidgetItem->setUuid(uuidFromSvg); + w3cWidgetItem->show(); currentWidget = w3cWidgetItem; @@ -859,11 +888,14 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() textItem->setFlag(QGraphicsItem::ItemIsMovable, true); textItem->setFlag(QGraphicsItem::ItemIsSelectable, true); - scene->addItem(textItem); + mScene->addItem(textItem); if (zFromSvg != UBZLayerController::errorNum()) UBGraphicsItem::assignZValue(textItem, zFromSvg); + if (!uuidFromSvg.isNull()) + textItem->setUuid(uuidFromSvg); + textItem->show(); } } @@ -885,6 +917,10 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() QString value = mXmlReader.attributes().value("value").toString(); currentWidget->setDatastoreEntry(key, value); + } else if (mXmlReader.name() == tGroups) { + //considering groups section at the end of the document + + readGroupRoot(); } // else if (mXmlReader.name() == "teacherBar" || mXmlReader.name() == "teacherGuide"){ // sTeacherGuideNode.clear(); @@ -907,8 +943,8 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() { if (mXmlReader.name() == "g") { - if(strokesGroup && scene){ - scene->addItem(strokesGroup); + if(strokesGroup && mScene){ + mScene->addItem(strokesGroup); //graphicsItemFromSvg(strokesGroup); } @@ -930,6 +966,8 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() // storageClass->load(sTeacherGuideNode); // } // } + + } } @@ -938,8 +976,8 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() qWarning() << "error parsing Sankore file " << mXmlReader.errorString(); } - if (scene) { - scene->setModified(false); + if (mScene) { + mScene->setModified(false); } if (annotationGroup) @@ -948,9 +986,82 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() delete annotationGroup; } - return scene; + return mScene; +} + + +UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() +{ + UBGraphicsGroupContainerItem *result = new UBGraphicsGroupContainerItem(); + + QUuid groupUuid = QUuid(mXmlReader.attributes().value(aId).toString()); + + mXmlReader.readNext(); + while (!mXmlReader.atEnd()) { + if (mXmlReader.isEndElement()) { + mXmlReader.readNext(); + result->setUuid(groupUuid); + if (!result->childItems().count()) { + delete result; + result = 0; + } + break; + } else if (mXmlReader.isStartElement()) { + if (mXmlReader.name() == tGroup) { + qDebug() << "came across the group id is" << mXmlReader.attributes().value(aId); + UBGraphicsGroupContainerItem *curGroup = readGroup(); + if (curGroup) { + result->addToGroup(curGroup); + } + } else if (mXmlReader.name() == tElement) { + QGraphicsItem *curItem = readElementFromGroup(); + if (curItem) { + result->addToGroup(curItem); + } + }else { + mXmlReader.skipCurrentElement(); + } + } else { + mXmlReader.readNext(); + } + } + + return result; } +void UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroupRoot() +{ + mXmlReader.readNext(); + while (!mXmlReader.atEnd()) { + if (mXmlReader.isEndElement()) { + mXmlReader.readNext(); + break; + } else if (mXmlReader.isStartElement()) { + if (mXmlReader.name() == tGroup) { + UBGraphicsGroupContainerItem *curGroup = readGroup(); + if (curGroup) { + mScene->addGroup(curGroup); + } + }else { + mXmlReader.skipCurrentElement(); + } + } else { + mXmlReader.readNext(); + } + } +} + +QGraphicsItem *UBSvgSubsetAdaptor::UBSvgSubsetReader::readElementFromGroup() +{ + QGraphicsItem *result = 0; + + result = mScene->itemByUuid(QUuid(mXmlReader.attributes().value(aId).toString())); + + mXmlReader.skipCurrentElement(); + mXmlReader.readNext(); + + return result; +} void UBSvgSubsetAdaptor::persistScene(UBDocumentProxy* proxy, UBGraphicsScene* pScene, const int pageIndex) { @@ -1007,6 +1118,13 @@ bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(int pageIndex) { if (mScene->isModified()) { + + //Creating dom structure to store information + QDomDocument groupDomDocument; + QDomElement groupRoot = groupDomDocument.createElement(tGroups); + groupDomDocument.appendChild(groupRoot); + + static int i = 0; qDebug() << "persist call no is " << ++i; @@ -1248,7 +1366,7 @@ bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(int pageIndex) UBGraphicsGroupContainerItem *groupItem = qgraphicsitem_cast(item); if (groupItem && groupItem->isVisible()) { - qDebug() << "came across the group during the parsing, uuid is " << groupItem->data(UBGraphicsItemData::ItemUuid).toString(); + persistGroupToDom(groupItem, &groupRoot, &groupDomDocument); continue; } } @@ -1280,6 +1398,30 @@ bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(int pageIndex) qWarning() << "unknown type"; } + //writing group data + if (groupRoot.hasChildNodes()) { + mXmlWriter.writeStartElement(tGroups); + QDomElement curElement = groupRoot.firstChildElement(); + while (!curElement.isNull()) { + if (curElement.hasAttribute(aId)) { + mXmlWriter.writeStartElement(tGroup); + mXmlWriter.writeAttribute(aId, curElement.attribute(aId)); + QDomElement curSubElement = curElement.firstChildElement(); + while (!curSubElement.isNull()) { + if (curSubElement.hasAttribute(aId)) { + mXmlWriter.writeStartElement(tElement); + mXmlWriter.writeAttribute(aId, curSubElement.attribute(aId)); + mXmlWriter.writeEndElement(); + curSubElement = curSubElement.nextSiblingElement(); + } + } + mXmlWriter.writeEndElement(); + } + curElement = curElement.nextSiblingElement(); + } + mXmlWriter.writeEndElement(); + } + mXmlWriter.writeEndDocument(); QString fileName = mDocumentPath + UBFileSystemUtils::digitFileFormat("/page%1.svg", mPageIndex); QFile file(fileName); @@ -1302,6 +1444,29 @@ bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(int pageIndex) return true; } +void UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistGroupToDom(QGraphicsItem *groupItem, QDomElement *curParent, QDomDocument *groupDomDocument) +{ + QUuid uuid = UBGraphicsScene::getPersonalUuid(groupItem); + if (!uuid.isNull()) { + QDomElement curGroupElement = groupDomDocument->createElement(tGroup); + curGroupElement.setAttribute(aId, uuid); + curParent->appendChild(curGroupElement); + + foreach (QGraphicsItem *item, groupItem->childItems()) { + QUuid tmpUuid = UBGraphicsScene::getPersonalUuid(item); + if (!tmpUuid.isNull()) { + if (item->type() == UBGraphicsGroupContainerItem::Type && item->childItems().count()) { + persistGroupToDom(item, curParent, groupDomDocument); + } else { + QDomElement curSubElement = groupDomDocument->createElement(tGroup); + curSubElement.setAttribute(aId, tmpUuid); + curGroupElement.appendChild(curSubElement); + } + } + } + } +} + void UBSvgSubsetAdaptor::UBSvgSubsetWriter::polygonItemToSvgLine(UBGraphicsPolygonItem* polygonItem, bool groupHoldsInfo) { mXmlWriter.writeStartElement("line"); @@ -2204,6 +2369,20 @@ qreal UBSvgSubsetAdaptor::UBSvgSubsetReader::getZValueFromSvg() return result; } +QUuid UBSvgSubsetAdaptor::UBSvgSubsetReader::getUuidFromSvg() +{ + QUuid result; + + QString strUuid = mXmlReader.attributes().value(mNamespaceUri, "uuid").toString(); + QUuid uuid = QUuid(strUuid); + if (!uuid.isNull()) { + result = uuid; + } + + return result; +} + + void UBSvgSubsetAdaptor::UBSvgSubsetWriter::graphicsItemToSvg(QGraphicsItem* item) { mXmlWriter.writeAttribute("x", "0"); @@ -2402,6 +2581,7 @@ UBGraphicsW3CWidgetItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::graphicsW3CWidge QStringRef uuid = mXmlReader.attributes().value(mNamespaceUri, "uuid"); QString pixPath = mDocumentPath + "/" + UBPersistenceManager::widgetDirectory + "/" + uuid.toString() + ".png"; + QPixmap snapshot(pixPath); if (!snapshot.isNull()) widgetItem->w3cWidget()->setSnapshot(snapshot); diff --git a/src/adaptors/UBSvgSubsetAdaptor.h b/src/adaptors/UBSvgSubsetAdaptor.h index 517f036a..010fb939 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.h +++ b/src/adaptors/UBSvgSubsetAdaptor.h @@ -41,6 +41,7 @@ class UBPersistenceManager; class UBGraphicsTriangle; class UBGraphicsCache; class IDataStorage; +class UBGraphicsGroupContainerItem; class UBSvgSubsetAdaptor { @@ -94,6 +95,8 @@ class UBSvgSubsetAdaptor static QMap additionalElementToStore; + + class UBSvgSubsetReader { public: @@ -140,9 +143,14 @@ class UBSvgSubsetAdaptor UBGraphicsCache* cacheFromSvg(); + void readGroupRoot(); + QGraphicsItem *readElementFromGroup(); + UBGraphicsGroupContainerItem* readGroup(); + void graphicsItemFromSvg(QGraphicsItem* gItem); qreal getZValueFromSvg(); + QUuid getUuidFromSvg(); QXmlStreamReader mXmlReader; int mFileVersion; @@ -155,6 +163,7 @@ class UBSvgSubsetAdaptor bool mGroupHasInfo; QString mNamespaceUri; + UBGraphicsScene *mScene; }; class UBSvgSubsetWriter @@ -169,6 +178,7 @@ class UBSvgSubsetAdaptor private: + void persistGroupToDom(QGraphicsItem *groupItem, QDomElement *curParent, QDomDocument *curDomDocument); void polygonItemToSvgPolygon(UBGraphicsPolygonItem* polygonItem, bool groupHoldsInfo); void polygonItemToSvgLine(UBGraphicsPolygonItem* polygonItem, bool groupHoldsInfo); void strokeToSvgPolyline(UBGraphicsStroke* stroke, bool groupHoldsInfo); diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index 2185125d..59f4e8e5 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -562,7 +562,8 @@ UBBoardView::mouseMoveEvent (QMouseEvent *event) || item->type() == UBGraphicsMediaItem::Type || item->type() == UBGraphicsSvgItem::Type || item->type() == UBGraphicsTextItem::Type - || item->type() == UBGraphicsStrokesGroup::Type) { + || item->type() == UBGraphicsStrokesGroup::Type + || item->type() == UBGraphicsGroupContainerItem::Type) { if (!mJustSelectedItems.contains(item)) { item->setSelected(true); diff --git a/src/domain/UBGraphicsGroupContainerItem.cpp b/src/domain/UBGraphicsGroupContainerItem.cpp index a342d848..9b38687c 100644 --- a/src/domain/UBGraphicsGroupContainerItem.cpp +++ b/src/domain/UBGraphicsGroupContainerItem.cpp @@ -25,6 +25,8 @@ UBGraphicsGroupContainerItem::UBGraphicsGroupContainerItem(QGraphicsItem *parent UBGraphicsGroupContainerItem::setAcceptHoverEvents(true); + setUuid(QUuid::createUuid()); + setData(UBGraphicsItemData::itemLayerType, QVariant(itemLayerType::ObjectItem)); //Necessary to set if we want z value to be assigned correctly } diff --git a/src/domain/UBGraphicsPixmapItem.cpp b/src/domain/UBGraphicsPixmapItem.cpp index e7008cfa..c1586f8d 100644 --- a/src/domain/UBGraphicsPixmapItem.cpp +++ b/src/domain/UBGraphicsPixmapItem.cpp @@ -38,6 +38,8 @@ UBGraphicsPixmapItem::UBGraphicsPixmapItem(QGraphicsItem* parent) setData(UBGraphicsItemData::itemLayerType, QVariant(itemLayerType::ObjectItem)); //Necessary to set if we want z value to be assigned correctly setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); + + setUuid(QUuid::createUuid()); //more logical solution is in creating uuid for element in element's constructor } UBGraphicsPixmapItem::~UBGraphicsPixmapItem() diff --git a/src/domain/UBGraphicsPolygonItem.cpp b/src/domain/UBGraphicsPolygonItem.cpp index 1fc87f6a..9c6dee10 100644 --- a/src/domain/UBGraphicsPolygonItem.cpp +++ b/src/domain/UBGraphicsPolygonItem.cpp @@ -189,18 +189,18 @@ void UBGraphicsPolygonItem::paint ( QPainter * painter, const QStyleOptionGraphi QGraphicsPolygonItem::paint(painter, option, widget); } -//QPainterPath UBGraphicsPolygonItem::shape() const -//{ +QPainterPath UBGraphicsPolygonItem::shape() const +{ -// QPainterPath path; -// path.addRect(boundingRect()); + QPainterPath path; + path.addRect(boundingRect()); -// return path; + return path; -//// static QPainterPath shapePath = QGraphicsPolygonItem::shape(); +// static QPainterPath shapePath = QGraphicsPolygonItem::shape(); -//// return shapePath; -//} +// return shapePath; +} UBGraphicsScene* UBGraphicsPolygonItem::scene() diff --git a/src/domain/UBGraphicsPolygonItem.h b/src/domain/UBGraphicsPolygonItem.h index 663658f2..851092b2 100644 --- a/src/domain/UBGraphicsPolygonItem.h +++ b/src/domain/UBGraphicsPolygonItem.h @@ -118,7 +118,7 @@ class UBGraphicsPolygonItem : public QGraphicsPolygonItem, public UBItem protected: void paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget); -// QPainterPath shape () const; + QPainterPath shape () const; private: diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index dbaebdc0..4f9c4a68 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -1490,7 +1490,22 @@ UBGraphicsGroupContainerItem *UBGraphicsScene::createGroup(QListsetVisible(true); groupItem->setFocus(); - qDebug() << groupItem->uuid().toString(); + if (enableUndoRedoStack) { //should be deleted after scene own undo stack implemented + UBGraphicsItemUndoCommand* uc = new UBGraphicsItemUndoCommand(this, 0, groupItem); + UBApplication::undoStack->push(uc); + } + + setDocumentUpdated(); + + return groupItem; +} + +void UBGraphicsScene::addGroup(UBGraphicsGroupContainerItem *groupItem) +{ + addItem(groupItem); + groupItem->setVisible(true); + groupItem->setFocus(); + if (groupItem->uuid().isNull()) { groupItem->setUuid(QUuid::createUuid()); } @@ -1501,8 +1516,6 @@ UBGraphicsGroupContainerItem *UBGraphicsScene::createGroup(QListsetZValue(item->data(UBGraphicsItemData::ItemOwnZValue).toReal()); } +QUuid UBGraphicsScene::getPersonalUuid(QGraphicsItem *item) +{ + QString idCandidate = item->data(UBGraphicsItemData::ItemUuid).toString(); + return idCandidate == QUuid().toString() ? QUuid() : QUuid(idCandidate); +} + qreal UBGraphicsScene::changeZLevelTo(QGraphicsItem *item, UBZLayerController::moveDestination dest) { return mZLayerController->changeZLevelTo(item, dest); diff --git a/src/domain/UBGraphicsScene.h b/src/domain/UBGraphicsScene.h index f37602c3..69c92abb 100644 --- a/src/domain/UBGraphicsScene.h +++ b/src/domain/UBGraphicsScene.h @@ -145,6 +145,7 @@ class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem UBGraphicsW3CWidgetItem* addOEmbed(const QUrl& pContentUrl, const QPointF& pPos = QPointF(0, 0)); UBGraphicsGroupContainerItem *createGroup(QList items); + void addGroup(UBGraphicsGroupContainerItem *groupItem); QGraphicsItem* setAsBackgroundObject(QGraphicsItem* item, bool pAdaptTransformation = false, bool expand = false); @@ -162,6 +163,8 @@ class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem QRectF normalizedSceneRect(qreal ratio = -1.0); + QGraphicsItem *itemByUuid(QUuid uuid); + void moveTo(const QPointF& pPoint); void drawLineTo(const QPointF& pEndPoint, const qreal& pWidth, bool bLineStyle); void eraseLineTo(const QPointF& pEndPoint, const qreal& pWidth); @@ -294,6 +297,8 @@ class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem void setSelectedZLevel(QGraphicsItem *item); void setOwnZlevel(QGraphicsItem *item); + static QUuid getPersonalUuid(QGraphicsItem *item); + public slots: void hideEraser(); diff --git a/src/domain/UBGraphicsStrokesGroup.cpp b/src/domain/UBGraphicsStrokesGroup.cpp index cd5f92d4..80ad9281 100644 --- a/src/domain/UBGraphicsStrokesGroup.cpp +++ b/src/domain/UBGraphicsStrokesGroup.cpp @@ -9,6 +9,7 @@ UBGraphicsStrokesGroup::UBGraphicsStrokesGroup(QGraphicsItem *parent):QGraphicsI mDelegate->setFlippable(true); setData(UBGraphicsItemData::ItemLayerType, UBItemLayerType::Object); + setUuid(QUuid::createUuid()); setData(UBGraphicsItemData::itemLayerType, QVariant(itemLayerType::ObjectItem)); //Necessary to set if we want z value to be assigned correctly setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); setFlag(QGraphicsItem::ItemIsSelectable, true); diff --git a/src/domain/UBGraphicsSvgItem.cpp b/src/domain/UBGraphicsSvgItem.cpp index 6cf3ddcb..a17b04b0 100644 --- a/src/domain/UBGraphicsSvgItem.cpp +++ b/src/domain/UBGraphicsSvgItem.cpp @@ -63,6 +63,8 @@ void UBGraphicsSvgItem::init() setMaximumCacheSize(boundingRect().size().toSize() * UB_MAX_ZOOM); setData(UBGraphicsItemData::itemLayerType, QVariant(itemLayerType::ObjectItem)); //Necessary to set if we want z value to be assigned correctly + + setUuid(QUuid::createUuid()); } @@ -194,3 +196,9 @@ UBGraphicsPixmapItem* UBGraphicsSvgItem::toPixmapItem() const return pixmapItem; } + +void UBGraphicsSvgItem::setUuid(const QUuid &pUuid) +{ + UBItem::setUuid(pUuid); + setData(UBGraphicsItemData::ItemUuid, QVariant(pUuid)); //store item uuid inside the QGraphicsItem to fast operations with Items on the scene +} diff --git a/src/domain/UBGraphicsSvgItem.h b/src/domain/UBGraphicsSvgItem.h index eb238cf4..09ce0762 100644 --- a/src/domain/UBGraphicsSvgItem.h +++ b/src/domain/UBGraphicsSvgItem.h @@ -61,6 +61,8 @@ class UBGraphicsSvgItem: public QGraphicsSvgItem, public UBItem, public UBGraphi virtual UBGraphicsPixmapItem* toPixmapItem() const; virtual UBGraphicsItemDelegate *Delegate() const {return mDelegate;} + virtual void setUuid(const QUuid &pUuid); + protected: virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); diff --git a/src/domain/UBGraphicsTextItem.cpp b/src/domain/UBGraphicsTextItem.cpp index 16328d3e..cc5a4148 100644 --- a/src/domain/UBGraphicsTextItem.cpp +++ b/src/domain/UBGraphicsTextItem.cpp @@ -53,6 +53,8 @@ UBGraphicsTextItem::UBGraphicsTextItem(QGraphicsItem * parent) setTextInteractionFlags(Qt::TextEditorInteraction); + setUuid(QUuid::createUuid()); + connect(document(), SIGNAL(contentsChanged()), mDelegate, SLOT(contentsChanged())); connect(document(), SIGNAL(undoCommandAdded()), this, SLOT(undoCommandAdded())); diff --git a/src/domain/UBItem.cpp b/src/domain/UBItem.cpp index 54c16e73..5a837509 100644 --- a/src/domain/UBItem.cpp +++ b/src/domain/UBItem.cpp @@ -18,7 +18,7 @@ #include "core/memcheck.h" UBItem::UBItem() - : mUuid(QUuid::createUuid()) + : mUuid(QUuid()) , mRenderingQuality(UBItem::RenderingQualityNormal) { // NOOP