Imported Upstream version 0.2.2

19 files changed, 103 insertions, 54 deletions

diff --git a/data/Makefile.in b/data/Makefile.in
index 157d4b5..da0334b 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -124,6 +124,8 @@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
 ASM_VERSION = @ASM_VERSION@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -206,7 +208,10 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SMARTIRC4NET_ASSEMBLY = @SMARTIRC4NET_ASSEMBLY@
+SMARTIRC4NET_CFLAGS = @SMARTIRC4NET_CFLAGS@
 SMARTIRC4NET_FILES = @SMARTIRC4NET_FILES@
+SMARTIRC4NET_LIBS = @SMARTIRC4NET_LIBS@
+SPARKLE_SMARTIRC4NETDIR = @SPARKLE_SMARTIRC4NETDIR@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 V = @V@
diff --git a/data/html/Makefile.in b/data/html/Makefile.in
index 60c7375..98b8ed2 100644
--- a/data/html/Makefile.in
+++ b/data/html/Makefile.in
@@ -84,6 +84,8 @@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
 ASM_VERSION = @ASM_VERSION@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -166,7 +168,10 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SMARTIRC4NET_ASSEMBLY = @SMARTIRC4NET_ASSEMBLY@
+SMARTIRC4NET_CFLAGS = @SMARTIRC4NET_CFLAGS@
 SMARTIRC4NET_FILES = @SMARTIRC4NET_FILES@
+SMARTIRC4NET_LIBS = @SMARTIRC4NET_LIBS@
+SPARKLE_SMARTIRC4NETDIR = @SPARKLE_SMARTIRC4NETDIR@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 V = @V@
diff --git a/data/html/event-entry.html b/data/html/event-entry.html
index fbeed41..1ede472 100644
--- a/data/html/event-entry.html
+++ b/data/html/event-entry.html
@@ -1,20 +1,16 @@
 <div class='event-entry'>
-
     <div class='event-entry-content'>
-
-        <div class='no-buddy-icon'>
-            <div class='buddy-icon' style='background-image: url("<!-- $event-avatar-url -->");'></div>
-        </div>
-
         <div class='event-info'>
-            <b><!-- $event-user-name --></b>
-            <!-- $event-entry-content -->
+            <div class='wrapper'>
+                <div class='no-buddy-icon'>
+                    <div class='buddy-icon' style='background-image: url("<!-- $event-avatar-url -->");'></div>
+                </div>
+                <b><!-- $event-user-name --></b><br/>
+                <small><!-- $event-time --></small>
+            </div>
+            <div class='event-time' style='background-color: <!-- $event-folder-color -->'><!-- $event-folder --></div>
         </div>
-                
-        <div class='event-time'><!-- $event-time --></div>
-
+        <!-- $event-entry-content -->
         <div style='clear: both'></div>
-
     </div>
-
 </div>
diff --git a/data/html/event-log.html b/data/html/event-log.html
index a595ea8..fc3f625 100644
--- a/data/html/event-log.html
+++ b/data/html/event-log.html
@@ -4,7 +4,7 @@
         <title>SparkleShare Event Log</title>
         <style>
             body {
-                background-color: #f0f0f0;
+                background-color: #dedede;
                 color:            <!-- $body-color -->;
                 font-size:        <!-- $body-font-size -->;
                 font-family:      <!-- $body-font-family -->;
@@ -16,7 +16,7 @@
 
             small {
                 font-size: <!-- $small-font-size -->;
-                color:     <!-- $small-color -->;
+                color:     <!-- $secondary-font-color -->;
             }
 
             .moved-arrow {
@@ -25,13 +25,9 @@
 
             .day-entry-header {
                 font-size:     <!-- $day-entry-header-font-size -->;         
-                color:         #babdb6;
-                text-align:    center;
-                width:         90%;
-                text-shadow:   0  1px 0 rgba(255, 255, 255, 1.0);
+                color:         #444;
                 margin-bottom: 9px;
-                margin-left:   auto;
-                margin-right:  auto;            
+                margin-left:   30px;
             }
             
             .day-entry-content {
@@ -48,43 +44,70 @@
             }
 
             .event-time {
+                opacity: 0.8;
                 font-size:     80%;
-                color:         <!-- $secondary-font-color -->;
-                float:         right;
+                color:         #fff;
+                float: right;
+                padding: 3px 15px;
+                font-weight: bold;
+                -webkit-border-radius: 100px;
             }
 
             .event-entry-content {
                 display:               block;
-                width:                 400px;
-                background-color:      #fff;
+                width:                 440px;
+                background-color:      #f0f0f0;
                 margin-left:           auto;
                 margin-right:          auto;
-                margin-bottom:         9px;
-                padding:               18px;
-                -webkit-border-radius: 6px;
-                border:                #ddd 1px solid;
+                margin-bottom:         12px;
+                padding:               0px;
+                padding-bottom: 6px;
+                border:                #ccc 1px solid;
             }
-            
-            dl {
-                padding: 0;
-                margin: 0;
-                padding-bottom: 15px;
+
+            .wrapper {
+                float: left;
             }
-            
-            dt {
-                padding-bottom: 12px;
-                padding-top:    12px;
-                font-size:      80%;
-                color:          <!-- $secondary-font-color -->;
+
+            dl {
+                padding : 0;
+                margin:  0;
             }
             
             dd {
-                width:          300px;
+                width:          90%;
                 overflow:       hidden;
-                padding-left:   0;
-                margin-left:    12px;
                 text-overflow:  ellipsis;
-                padding-bottom: 9px;
+                padding:        0;
+                padding-top:    2px;
+                padding-bottom: 4px;
+                padding-left:   22px;
+                margin:         0;
+                margin-bottom:  2px;
+                margin-left:    12px;
+                border-bottom:  1px solid #ddd;
+                background-repeat: no-repeat;
+                background-position: center left;
+            }
+
+            dd:last-child {
+                border: none;
+            }
+
+            .document-added {
+                background-image: url('<!-- $document-added-background-image -->');
+            }
+
+            .document-deleted {
+                background-image: url('<!-- $document-deleted-background-image -->');
+            }
+
+            .document-edited {
+                background-image: url('<!-- $document-edited-background-image -->');
+            }
+
+            .document-moved {
+                background-image: url('<!-- $document-moved-background-image -->');
             }
 
             .no-buddy-icon {
@@ -104,6 +127,11 @@
 
             .event-info {
                 float: left;
+                padding: 15px;
+                margin-bottom: 6px;
+                width: 410px;
+                background-color: #fff;
+                border-bottom: 1px #ccc solid;
             }
         </style>
     </head>
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index fd62183..79026af 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -8,7 +8,12 @@ system_theme_icons =					\
 	apps,folder-sparkleshare-24.png			\
 	apps,folder-sparkleshare-256.png		\
 	apps,folder-sparkleshare-32.png			\
-	apps,folder-sparkleshare-48.png
+	apps,folder-sparkleshare-48.png			\
+	status,process-syncing-sparkleshare-i-24.png \
+	status,process-syncing-sparkleshare-ii-24.png \
+	status,process-syncing-sparkleshare-iii-24.png \
+	status,process-syncing-sparkleshare-iiii-24.png \
+	status,process-syncing-sparkleshare-iiiii-24.png
 
 app_theme_icons =					\
 	animations,process-syncing-sparkleshare-24.png	\
@@ -25,10 +30,10 @@ app_theme_icons =					\
 	status,avatar-default-24.png			\
 	status,avatar-default-32.png			\
 	status,avatar-default-48.png			\
-	status,document-added-16.png			\
-	status,document-edited-16.png			\
-	status,document-moved-16.png			\
-	status,document-removed-16.png			\
+	status,document-added-12.png			\
+	status,document-edited-12.png			\
+	status,document-deleted-12.png			\
+	status,document-moved-12.png			\
 	status,dialog-error-16.png			\
 	status,dialog-error-24.png
 
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index 19050a2..c57608d 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -59,6 +59,8 @@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
 ASM_VERSION = @ASM_VERSION@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -141,7 +143,10 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SMARTIRC4NET_ASSEMBLY = @SMARTIRC4NET_ASSEMBLY@
+SMARTIRC4NET_CFLAGS = @SMARTIRC4NET_CFLAGS@
 SMARTIRC4NET_FILES = @SMARTIRC4NET_FILES@
+SMARTIRC4NET_LIBS = @SMARTIRC4NET_LIBS@
+SPARKLE_SMARTIRC4NETDIR = @SPARKLE_SMARTIRC4NETDIR@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 V = @V@
@@ -205,7 +210,12 @@ system_theme_icons = \
 	apps,folder-sparkleshare-24.png			\
 	apps,folder-sparkleshare-256.png		\
 	apps,folder-sparkleshare-32.png			\
-	apps,folder-sparkleshare-48.png
+	apps,folder-sparkleshare-48.png			\
+	status,process-syncing-sparkleshare-i-24.png \
+	status,process-syncing-sparkleshare-ii-24.png \
+	status,process-syncing-sparkleshare-iii-24.png \
+	status,process-syncing-sparkleshare-iiii-24.png \
+	status,process-syncing-sparkleshare-iiiii-24.png
 
 app_theme_icons = \
 	animations,process-syncing-sparkleshare-24.png	\
@@ -222,10 +232,10 @@ app_theme_icons = \
 	status,avatar-default-24.png			\
 	status,avatar-default-32.png			\
 	status,avatar-default-48.png			\
-	status,document-added-16.png			\
-	status,document-edited-16.png			\
-	status,document-moved-16.png			\
-	status,document-removed-16.png			\
+	status,document-added-12.png			\
+	status,document-edited-12.png			\
+	status,document-deleted-12.png			\
+	status,document-moved-12.png			\
 	status,dialog-error-16.png			\
 	status,dialog-error-24.png
 
diff --git a/data/icons/document-added-12.png b/data/icons/document-added-12.png
new file mode 100644
index 0000000..409867d
--- /dev/null
+++ b/data/icons/document-added-12.png
diff --git a/data/icons/document-added-16.png b/data/icons/document-added-16.png
deleted file mode 100644
index 14fa8a3..0000000
--- a/data/icons/document-added-16.png
+++ /dev/null
diff --git a/data/icons/document-deleted-12.png b/data/icons/document-deleted-12.png
new file mode 100644
index 0000000..f558574
--- /dev/null
+++ b/data/icons/document-deleted-12.png
diff --git a/data/icons/document-edited-12.png b/data/icons/document-edited-12.png
new file mode 100644
index 0000000..57b5096
--- /dev/null
+++ b/data/icons/document-edited-12.png
diff --git a/data/icons/document-edited-16.png b/data/icons/document-edited-16.png
deleted file mode 100644
index e0a9f97..0000000
--- a/data/icons/document-edited-16.png
+++ /dev/null
diff --git a/data/icons/document-moved-12.png b/data/icons/document-moved-12.png
new file mode 100644
index 0000000..50f4fb3
--- /dev/null
+++ b/data/icons/document-moved-12.png
diff --git a/data/icons/document-moved-16.png b/data/icons/document-moved-16.png
deleted file mode 100644
index 834f6a7..0000000
--- a/data/icons/document-moved-16.png
+++ /dev/null
diff --git a/data/icons/document-removed-16.png b/data/icons/document-removed-16.png
deleted file mode 100644
index 4695e87..0000000
--- a/data/icons/document-removed-16.png
+++ /dev/null
diff --git a/data/icons/process-syncing-sparkleshare-i-24.png b/data/icons/process-syncing-sparkleshare-i-24.png
new file mode 100644
index 0000000..286e79d
--- /dev/null
+++ b/data/icons/process-syncing-sparkleshare-i-24.png
diff --git a/data/icons/process-syncing-sparkleshare-ii-24.png b/data/icons/process-syncing-sparkleshare-ii-24.png
new file mode 100644
index 0000000..83dd2cf
--- /dev/null
+++ b/data/icons/process-syncing-sparkleshare-ii-24.png
diff --git a/data/icons/process-syncing-sparkleshare-iii-24.png b/data/icons/process-syncing-sparkleshare-iii-24.png
new file mode 100644
index 0000000..6f6b9e5
--- /dev/null
+++ b/data/icons/process-syncing-sparkleshare-iii-24.png
diff --git a/data/icons/process-syncing-sparkleshare-iiii-24.png b/data/icons/process-syncing-sparkleshare-iiii-24.png
new file mode 100644
index 0000000..31f9a53
--- /dev/null
+++ b/data/icons/process-syncing-sparkleshare-iiii-24.png
diff --git a/data/icons/process-syncing-sparkleshare-iiiii-24.png b/data/icons/process-syncing-sparkleshare-iiiii-24.png
new file mode 100644
index 0000000..a0e2476
--- /dev/null
+++ b/data/icons/process-syncing-sparkleshare-iiiii-24.png