Commit changes uptil 0.88.1-1.11uydx1.5

Signed-off-by: Anish Mangal <anish@sugarlabs.org>

13 files changed, 891 insertions, 7 deletions

diff --git a/gtk/engine/sugar-style.c b/gtk/engine/sugar-style.c
index 5e5dbfc..b81fe69 100644
--- a/gtk/engine/sugar-style.c
+++ b/gtk/engine/sugar-style.c
@@ -444,7 +444,7 @@ sugar_style_draw_box (GtkStyle       *style,
 
             sugar_fill_generic_info (&info, style, state_type, shadow_type, widget, detail, x, y, width, height);
             
-            if (widget && !gtk_widget_is_sensitive (widget))
+            if (widget && !GTK_WIDGET_IS_SENSITIVE (widget))
                 info.state = GTK_STATE_INSENSITIVE;
 
             /* Needed because the trough and bar are cached in a buffer inside GtkProgress. */
@@ -458,7 +458,7 @@ sugar_style_draw_box (GtkStyle       *style,
 
             sugar_fill_generic_info (&info, style, state_type, shadow_type, widget, detail, x, y, width, height);
             
-            if (widget && !gtk_widget_is_sensitive (widget))
+            if (widget && !GTK_WIDGET_IS_SENSITIVE (widget))
                 info.state = GTK_STATE_INSENSITIVE;
             
             if (widget && GTK_IS_PROGRESS_BAR (widget)) {
@@ -641,7 +641,7 @@ sugar_style_draw_shadow (GtkStyle       *style,
         if (widget && GTK_WIDGET_HAS_FOCUS (widget)) {
             info.state = GTK_STATE_ACTIVE;
         }
-        if (widget && !gtk_widget_is_sensitive (widget)) {
+        if (widget && !GTK_WIDGET_IS_SENSITIVE (widget)) {
             info.state = GTK_STATE_INSENSITIVE;
         }
 
diff --git a/gtk/theme/Makefile.am b/gtk/theme/Makefile.am
index a6b0bd8..2940ccc 100644
--- a/gtk/theme/Makefile.am
+++ b/gtk/theme/Makefile.am
@@ -6,13 +6,25 @@ sugar-100.gtkrc: gtkrc.em
 	$(srcdir)/em.py -p $$ -D scaling=\'100\' $(srcdir)/gtkrc.em > \
 		$(top_builddir)/gtk/theme/sugar-100.gtkrc
 
+sugar-72-contrast.gtkrc: gtkrc-contrast.em
+	$(srcdir)/em.py -p $$ -D scaling=\'72\' $(srcdir)/gtkrc-contrast.em > \
+		$(top_builddir)/gtk/theme/sugar-72-contrast.gtkrc
+
+sugar-100-contrast.gtkrc: gtkrc-contrast.em
+	$(srcdir)/em.py -p $$ -D scaling=\'100\' $(srcdir)/gtkrc-contrast.em > \
+		$(top_builddir)/gtk/theme/sugar-100-contrast.gtkrc
+
 clean:
 	$(RM) sugar-72.gtkrc
 	$(RM) sugar-100.gtkrc
+	$(RM) sugar-72-contrast.gtkrc
+	$(RM) sugar-100-contrast.gtkrc
 
 GTKRC_FILES =		\
 	sugar-72.gtkrc	\
-	sugar-100.gtkrc
+	sugar-100.gtkrc \
+	sugar-100-contrast.gtkrc \
+	sugar-72-contrast.gtkrc
 
 install-data-local: $(GTKRC_FILES)
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/sugar-72/gtk-2.0
@@ -21,10 +33,18 @@ install-data-local: $(GTKRC_FILES)
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/sugar-100/gtk-2.0
 	$(INSTALL_DATA) $(top_builddir)/gtk/theme/sugar-100.gtkrc \
 		$(DESTDIR)$(datadir)/themes/sugar-100/gtk-2.0/gtkrc
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/sugar-72-contrast/gtk-2.0
+	$(INSTALL_DATA) $(top_builddir)/gtk/theme/sugar-72-contrast.gtkrc \
+		$(DESTDIR)$(datadir)/themes/sugar-72-contrast/gtk-2.0/gtkrc
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/sugar-100-contrast/gtk-2.0
+	$(INSTALL_DATA) $(top_builddir)/gtk/theme/sugar-100-contrast.gtkrc \
+		$(DESTDIR)$(datadir)/themes/sugar-100-contrast/gtk-2.0/gtkrc
 
 uninstall-local:
 	rm -rf $(DESTDIR)$(datadir)/themes/sugar-72/gtk-2.0
 	rm -rf $(DESTDIR)$(datadir)/themes/sugar-100/gtk-2.0
+	rm -rf $(DESTDIR)$(datadir)/themes/sugar-100-contrast/gtk-2.0
+	rm -rf $(DESTDIR)$(datadir)/themes/sugar-72-contrast/gtk-2.0
 
-EXTRA_DIST = em.py gtkrc.em
+EXTRA_DIST = em.py gtkrc.em gtkrc-contrast.em
 CLEANFILES = $(GTKRC_FILES)
diff --git a/gtk/theme/gtkrc-contrast.em b/gtk/theme/gtkrc-contrast.em
new file mode 100644
index 0000000..508eaed
--- /dev/null
+++ b/gtk/theme/gtkrc-contrast.em
@@ -0,0 +1,555 @@
+${
+import math
+
+def my_floor(num):
+    return int(math.floor(num))
+
+def my_ceil(num):
+    return int(math.ceil(num))
+
+
+# Should we set the line width in the engine to 2.25, and draw non pixel aligned lines?
+# Are these already the correct sizes for the XO?
+
+# These sizes need to be sanity checked ...
+if scaling == "100":
+    xo = True
+    icon_base = 11
+else: # About 72% of the XO size, adjusted so that eg. toolbuttons work
+    xo = False
+    icon_base = 8               # 7.92
+
+}
+${
+icon_small = icon_base * 3
+icon_large = icon_base * 5
+
+small_icons = [ "gtk-menu", "gtk-dnd", "gtk-small-toolbar", "gtk-button" ]
+large_icons = [ "gtk-large-toolbar" ]
+
+icon_sizes = []
+for icon in small_icons:
+    icon_sizes += [icon + "=" + str(icon_small) + ',' + str(icon_small)]
+for icon in large_icons:
+    icon_sizes += [icon + "=" + str(icon_large) + ',' + str(icon_large)]
+
+icon_sizes = ":".join(icon_sizes)
+
+}
+gtk-icon-sizes="$icon_sizes"
+
+style "default"   
+{ 
+  engine "hcengine" {
+    edge_thickness = 2
+  }
+
+  xthickness = 2
+  ythickness = 2
+
+# For Java Desktop System
+  PanelMenu::stripe-gradient-top = "#000033"
+  PanelMenu::stripe-gradient-bottom = "#000033"
+  
+  GtkWidget::interior-focus = 1
+  GtkWidget::wide-separators = 0
+  GtkWidget::separator-height = 2
+  GtkWidget::separator-width = 2
+  GtkRange::activate-slider = 1
+  GtkArrow::arrow-size = 1.0
+  GtkToolbar::shadow-type = GTK_SHADOW_NONE
+  GtkToolbar::space-size = 30
+  GtkProgressBar::min-horizontal-bar-height = 15
+  GtkProgressBar::min-vertical-bar-width = 15
+
+  GtkWidget::link-color = "#FFFFFF"
+  GtkWidget::visited-link-color = "#FFCCFF"
+  GtkWidget::focus-line-pattern = "\4\2"
+  GtkWidget::focus-line-width = 5 
+  GtkHSV::focus-line-pattern = "\0"
+  GtkWidget::interior_focus = 1
+  GtkWidget::focus-padding = 0
+  GtkEntry::cursor_color    = "#FF0000" 
+  GtkTextView::cursor_color    = "#FF0000"
+  EelEditableLabel::cursor_color    = "#FF0000"
+  GtkTextView::cursor_aspect_ratio = 0.3
+  GtkEntry::cursor_aspect_ratio = 0.3
+  EelEditableLabel::cursor_aspect_ratio = 0.3
+  NautilusIconContainer::frame_text = 1
+  GtkTreeView::expander-size = 32
+  GtkRange::stepper-size = 20
+  
+
+  GtkCheckButton::indicator-size = 25
+  
+  fg[NORMAL]      = "#FFFFFF"
+  text[NORMAL]    = "#FFFFFF"
+  bg[NORMAL]      = "#000033" 
+  base[NORMAL]    = "#000033"
+
+  fg[INSENSITIVE]      = "#999999"
+  bg[INSENSITIVE]      = "#333333"
+  text[INSENSITIVE]      = "#999999"
+  base[INSENSITIVE]      = "#333333"
+
+  fg[PRELIGHT]    = "#000000"	
+  text[PRELIGHT]    = "#003333"
+  bg[PRELIGHT] = "#CCCC00"
+  base[PRELIGHT]    = "#FFFFFF"
+
+  fg[ACTIVE]      = "#FFFFFF"
+  text[ACTIVE] = "#000000" 
+  bg[ACTIVE]      = "#666699"
+  base[ACTIVE]      = "#CCCC00"
+
+  fg[SELECTED]    = "#000033"
+  text[SELECTED]    = "#000033"
+  bg[SELECTED]    = "#FFFFFF"
+  base[SELECTED]    = "#CCCC00"
+
+
+}
+
+class "GtkWidget" style "default"
+
+style "panel-icons"
+{
+
+}
+class "GtkWidget" style "panel-icons"
+style "media-icons"
+{
+
+}
+class "GtkWidget" style "media-icons"
+
+###########widget - details
+
+style "window"
+{
+
+}
+
+style "window-child"
+{
+
+}
+
+style "white-bg"
+{
+
+}
+
+style "white-bg-child"
+{
+
+}
+
+style "black-bg"
+{
+
+}
+
+style "black-bg-child"
+{
+
+}
+
+
+style "groupbox-panel"
+{
+
+}
+
+style "groupbox-panel-child"
+{
+
+}
+
+style "groupbox-palette"
+{
+
+}
+
+style "groupbox-palette-child"
+{
+
+}
+
+style "menu"
+{
+    bg[PRELIGHT] = "#000033"
+    fg[PRELIGHT] = "#FFFFFF"
+
+    GtkMenu::scroll-arrow-vlength = 25
+    GtkMenu::horizontal-padding = 2
+    GtkMenu::vertical-padding   = 2
+    # This means the outline of the submenu overlaps with a palette.
+    # However in the case of two normal menus, they are next to each other.
+    # It is not possible to be smarter about this, because the style comes from
+    # the submenu.
+    GtkMenu::horizontal-offset  = 0
+    GtkMenu::vertical-offset    = 0
+
+    xthickness = 0
+    ythickness = 0
+}
+
+style "palette-menu" = "menu"
+{
+    GtkMenu::horizontal-padding = 0
+    GtkMenu::vertical-padding   = 0
+
+    xthickness = 0
+    ythickness = 15
+
+    fg[NORMAL]="#FFFFFF"
+}
+
+# Can this all be moved in the menuitem style?
+style "menu-child"
+{
+    fg[NORMAL]="#FFFFFF"
+    base[NORMAL] = "#FFFFFF"
+
+}
+
+
+
+#########################################################
+#########################################################
+
+
+style "textview"
+{
+    text[NORMAL]="#000000"
+    base[NORMAL]="#FFFFFF"
+
+    GtkTextView::interior-focus = 1
+}
+
+style "scrollbar"
+{
+    fg[NORMAL]="#FFFFFF"
+    fg[ACTIVE]="#FFFFFF"
+    base[NORMAL]="#FFFFFF"
+    base[ACTIVE]="#FFFFFF"
+}
+
+# hints for the trough padding hacks
+# We cannot go trough GTK+, as we don't want a padding on all sides, but only one
+# If we wanted padding on all sides, trough-border would work great.
+style "hscrollbar" = "scrollbar"
+{
+
+}
+
+style "vscrollbar" = "scrollbar"
+{
+
+}
+
+style "hscrollbar-scrolled-window"
+{
+    
+}
+
+style "vscrollbar-scrolled-window"
+{
+  
+}
+
+style "scale"
+{
+    GtkWidget::focus-line-width = 0
+
+    fg[NORMAL]="#FFFFFF"
+    fg[ACTIVE]="#FFFFFF"  
+
+    # "square" slider (really round of course)
+    # Same as indicator-size?
+    GtkRange::slider-width = 32
+    GtkScale::slider-length = 32
+    GtkRange::trough-border = 0
+    GtkRange::stepper-spacing = 0
+    GtkRange::trough-side-details = 1
+}
+
+# hints for the trough sizing hacks
+style "hscale" = "scale"
+{
+
+}
+
+style "vscale" = "scale"
+{
+
+}
+
+style "spinbutton"
+{
+    xthickness = 15
+    ythickness = 7
+    GtkWidget::focus-line-width = 0
+}
+
+
+style "frame"
+{
+
+}
+
+style "notebook-tab"
+{
+    fg[NORMAL] = "#FFFFFF"
+}
+
+style "notebook-panel"
+{
+   fg[NORMAL] = "#FFFFFF"
+}
+
+style "toolbox-notebook"
+{
+   fg[NORMAL] = "#FFFFFF"
+}
+
+style "toolbutton"
+{
+   fg[NORMAL] = "#FFFFFF"
+}
+
+style "separatortoolbutton"
+{
+    fg[NORMAL] = "#FFFFFF"
+}
+
+style "toolbar"
+{
+
+}
+
+style "toolbox"
+{
+   fg[NORMAL] = "#000033"
+}
+
+style "panel"
+{
+
+}
+
+style "entry"
+{
+    fg[NORMAL] = "#000000"
+    base[NORMAL] = "#FFFFFF"
+    text[NORMAL] = "#000000"
+}
+
+style "button"
+{
+    fg[NORMAL] = "#FFFFFF"
+}
+
+style "combobox"
+{
+    base[NORMAL] = "#FFFFFF"
+}
+
+style "comboboxentry"
+{
+    fg[NORMAL]="#FFFFFF" 
+}
+
+style "checkbutton"
+{
+   fg[NORMAL] = "#FFFFFF"
+}
+
+style "progressbar"
+{
+
+}
+
+style "menuitem"
+{
+    GtkMenuItem::horizontal-padding = 0
+    GtkMenuItem::arrow-spacing = 15
+    GtkMenuItem::toggle-spacing = 15
+
+    fg[NORMAL] = "#FFFFFF"
+
+    xthickness = 15
+    ythickness = 10
+}
+
+style "checkmenuitem"
+{
+    GtkCheckMenuItem::indicator-size = 26
+    GtkMenuItem::toggle-spacing = 10
+}
+
+style "imagemenuitem"
+{
+
+}
+
+style "separatormenuitem"
+{
+   fg[NORMAL] = "#FFFFFF"
+
+   GtkWidget::wide-separators = 1
+   GtkWidget::separator-height = 30
+
+   ythickness = 0
+   xthickness = 0
+}
+
+style "trayicon"
+{
+    
+}
+
+style "parent-bg"
+{
+    fg[NORMAL]="#FFFFFF"
+    engine "sugar" {
+        bg[NORMAL] = parent_bg_color
+        bg[INSENSITIVE] = parent_bg_color
+    }
+}
+
+style "label"{
+	fg[NORMAL]="#FFFFFF"
+}
+style "hseparator"{
+	fg[NORMAL]="#FFFFFF"
+}
+style "white_treeview"{
+	fg[NORMAL]="#000000"
+	#base[NORMAL]="#000000"
+	text[NORMAL]="#000000"
+	#bg[NORMAL]="#000000"
+}
+
+####################################################################
+# Default style, setting some generic options and style properties
+####################################################################
+class "GtkWidget" style "default"
+
+
+####################################################################
+# Styles that apply the different background (and foreground) colors
+####################################################################
+
+# This one should probably be the default (ie. no window-child style)
+widget_class "<GtkWindow>"               style "window"
+widget_class "<GtkWindow>*"              style "window-child"
+
+widget_class "*<SugarAlert>"               style "black-bg"
+widget_class "*<SugarAlert>*"              style "black-bg-child"
+
+widget_class "*<SugarSectionView>"       style "white-bg"
+widget_class "*<SugarSectionView>*"      style "white-bg-child"
+
+
+# The notebook is very high, so that everything is overriden
+# Only the color of the tab labels needs to be modified inside the
+# notebooks in this style (and the widget itself).
+# Assume that there is either just a normal label in the notebook tab, or
+# it is inside a GtkBox (H- or VBox) together with eg. a close button.
+widget_class "*<GtkNotebook>"                        style "notebook-tab"
+widget_class "*<GtkNotebook>.<GtkLabel>"             style "notebook-tab"
+widget_class "*<GtkNotebook>.<GtkBox>.<GtkLabel>"    style "notebook-tab"
+
+
+# SugarPalette and Menu
+widget_class "*<GtkMenu>"               style "menu"
+widget_class "<SugarPalette>"           style "menu"
+widget_class "<SugarPalette>.*"         style "menu-child"
+widget_class "<SugarPalette>*<GtkMenu>" style "palette-menu"
+widget_class "*<GtkMenuShell>.*"        style "menu-child"
+
+# SugarFrameWindow
+widget_class "*<SugarFrameWindow>*"    style "frame"
+
+# SugarPanel
+widget_class "*<SugarPanel>*"          style "panel"
+
+
+# GroupBoxes (don't set bg[NORMAL] on the widget itself)
+widget_class "<GtkWindow>*<SugarGroupBox>*"   style "groupbox-panel-child"
+
+widget_class "<GtkWindow>*<GtkNotebook>*"   style "groupbox-panel-child"
+widget_class "<GtkWindow>*<GtkNotebook>"    style "notebook-panel"
+
+
+widget_class "<SugarPalette>*<SugarGroupBox>*"   style "groupbox-palette-child"
+
+
+# SugarToolbox
+#widget_class "*<SugarToolbox>" style "toolbox"
+#widget_class "*<SugarToolbox>*" style "toolbox-child"
+#widget_class "*<SugarToolbox>*<GtkEventBox>" style "toolbox"
+#widget_class "*<SugarToolbox>*<GtkLayout>"   style "toolbox"
+widget_class "*<SugarToolbox>*"        style "toolbox"
+widget_class "*<GtkToolbar>*"          style "toolbox"
+widget_class "*<SugarToolbox>.<GtkNotebook>" style "toolbox-notebook"
+
+
+####################################################################
+# Normal widget styles, using the above things
+####################################################################
+# The following only uses widget_class matches to get the priority
+# right. An alternative would be to lower the priority of the
+# background matches (which need widget_class) to eg. "application"
+
+widget_class "*<GtkMenuItem>*"            style "menuitem"
+widget_class "*<GtkCheckMenuItem>"        style "checkmenuitem"
+widget_class "*<GtkImageMenuItem>"        style "imagemenuitem"
+widget_class "*<GtkSeparatorMenuItem>*"   style "separatormenuitem"
+
+# Buttons and Combos
+widget_class "*<GtkButton>*"           style "button"
+widget_class "*<GtkCheckButton>*"      style "checkbutton"
+widget_class "*<GtkComboBox>*"         style "combobox"
+widget_class "*<GtkComboBoxEntry>*"    style "comboboxentry"
+widget_class "*<GtkCombo>*"            style "comboboxentry"
+
+# Entries
+widget_class "*<GtkEntry>"       style "entry"
+widget_class "*<GtkSpinButton>"  style "spinbutton"
+widget_class "*<GtkTextView>"    style "textview"
+
+
+# Misc widgets
+widget_class "*<GtkHScrollbar>"  style "hscrollbar"
+widget_class "*<GtkVScrollbar>"  style "vscrollbar"
+widget_class "*<GtkHScale>"      style "hscale"
+widget_class "*<GtkVScale>"      style "vscale"
+widget_class "*<GtkProgressBar>" style "progressbar"
+
+# Scrolled window scrollbars
+widget_class "*<GtkScrolledWindow>.<GtkVScrollbar>" style "vscrollbar-scrolled-window"
+widget_class "*<GtkScrolledWindow>.<GtkHScrollbar>" style "hscrollbar-scrolled-window"
+
+# Toolbar
+widget_class "*<GtkToolButton>*"          style "toolbutton"
+widget_class "*<GtkSeparatorToolItem>*"   style "separatortoolbutton"
+widget_class "*<GtkToolbar>"              style "toolbar"
+
+# Tray
+widget_class "*<SugarTrayIcon>*" style "trayicon"
+
+# Widgets that should get the background color from the parent
+widget_class "*<GtkEventBox>"        style "parent-bg"
+widget_class "*<GtkLayout>"          style "parent-bg"
+widget_class "*<GtkViewport>"        style "parent-bg"
+widget_class "*<GtkDrawingArea>"     style "parent-bg"
+widget_class "*<GtkScrolledWindow>"  style "parent-bg"
+
+widget_class "*<GtkLabel>*"	     style "label"
+widget_class "*<GtkHSeparator>*"      style "hseparator"
+
+widget_class "*<JournalTreeView>*" style "white_treeview"
+widget_class "*<SugarActivitiesTreeView>*" style "white_treeview"
diff --git a/icons/scalable/actions/Makefile.am b/icons/scalable/actions/Makefile.am
index a00a2df..9a5ba6c 100644
--- a/icons/scalable/actions/Makefile.am
+++ b/icons/scalable/actions/Makefile.am
@@ -44,6 +44,7 @@ icon_DATA =						\
 	insert-image.svg				\
 	insert-table.svg				\
 	invite.svg					\
+	journal-reindex.svg				\
 	list-add.svg					\
 	list-remove.svg					\
 	media-eject-insensitive.svg			\
diff --git a/icons/scalable/actions/journal-reindex.svg b/icons/scalable/actions/journal-reindex.svg
new file mode 100644
index 0000000..b044557
--- /dev/null
+++ b/icons/scalable/actions/journal-reindex.svg
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="55"
+   height="55"
+   viewBox="0 0 55 55"
+   id="Layer_1"
+   xml:space="preserve"><defs
+   id="defs2928" />
+<g
+   transform="translate(-2.3305085,-1.1652542)"
+   id="document-save"
+   style="display:block">
+	<g
+   id="g2898">
+		<g
+   id="g2900">
+			<g
+   id="g2902">
+				<path
+   d="m 6.736,49.002 h 24.52 c 2.225,0 3.439,-1.447 3.439,-3.441 v -27.28 c 0,-1.73 -1.732,-3.441 -3.439,-3.441 h -4.389"
+   id="path2904"
+   style="fill:#ffffff;stroke:#010101;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round" />
+			</g>
+		</g>
+		<g
+   id="g2906">
+			<g
+   id="g2908">
+				<path
+   d="m 26.867,38.592 c 0,1.836 -1.345,3.201 -3.441,4.047 L 6.736,49.002 V 14.84 l 16.69,-8.599 c 2.228,-0.394 3.441,0.84 3.441,2.834 v 29.517 z"
+   id="path2910"
+   style="fill:#ffffff;stroke:#010101;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round" />
+			</g>
+		</g>
+		<path
+   d="m 9.424,42.607 c 0,0 -1.351,-0.543 -2.702,-0.543 -1.351,0 -2.703,0.543 -2.703,0.543"
+   id="path2912"
+   style="fill:none;stroke:#010101;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round" />
+		<path
+   d="m 9.424,32.006 c 0,0 -1.239,-0.543 -2.815,-0.543 -1.577,0 -2.59,0.543 -2.59,0.543"
+   id="path2914"
+   style="fill:none;stroke:#010101;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round" />
+		<path
+   d="m 9.424,21.678 c 0,0 -1.125,-0.544 -2.927,-0.544 -1.802,0 -2.478,0.544 -2.478,0.544"
+   id="path2916"
+   style="fill:none;stroke:#010101;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round" />
+		
+		<line
+   x1="13.209"
+   x2="13.209"
+   y1="46.533001"
+   y2="11.505"
+   id="line2918"
+   style="fill:none;stroke:#010101;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round" />
+		
+		<g
+   id="g2920">
+			<line
+   x1="41.169998"
+   x2="52.441002"
+   y1="16.188"
+   y2="4.9169998"
+   id="line2922"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round" />
+			<polyline
+   points="     51.562,15.306 41.17,16.188 42.053,5.794    "
+   id="polyline2924"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round" />
+		</g>
+	</g>
+</g>
+<g
+   transform="matrix(0.47175141,0,0,0.47175142,31.259324,-2.4589857)"
+   id="view-refresh"
+   style="display:block"><g
+     id="g3000"><path
+       d="m 27.6,4.943 c 12.429,0 22.5,10.076 22.5,22.498 0,12.426 -10.07,22.502 -22.5,22.502 C 15.172,49.943 5.1,39.865 5.1,27.441 5.101,15.019 15.173,4.943 27.6,4.943 z"
+       id="path3002"
+       style="fill:#ffffff" /><path
+       d="m 25.5,37.994 c -4.879,-0.975 -8.555,-5.281 -8.555,-10.445 0,-5.885 4.77,-10.656 10.652,-10.656 5.886,0 10.656,4.771 10.656,10.656 0,5.074 -3.551,9.322 -8.305,10.395"
+       id="path3004"
+       style="fill:none;stroke:#4c4d4f;stroke-width:3.5" /><polyline
+       style="fill:none;stroke:#4c4d4f;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
+       points="    22.936,31.578 25.5,37.994 18.746,39.439   "
+       id="polyline3006" /></g></g></svg>
\ No newline at end of file
diff --git a/icons/scalable/device/Makefile.am b/icons/scalable/device/Makefile.am
index e7accce..bca43f0 100644
--- a/icons/scalable/device/Makefile.am
+++ b/icons/scalable/device/Makefile.am
@@ -35,7 +35,6 @@ icon_DATA =				\
 	battery-charging-070.svg	\
 	battery-charging-080.svg	\
 	battery-charging-090.svg	\
-	battery-charging-100.svg	\
 	camera-external.svg		\
 	camera.svg			\
 	touchpad-capacitive.svg		\
@@ -56,6 +55,12 @@ icon_DATA =				\
 	network-gsm.svg			\
 	network-mesh.svg		\
 	network-mesh.icon		\
+	network-adhoc-1-connected.svg	\
+	network-adhoc-1.svg		\
+	network-adhoc-6-connected.svg	\
+	network-adhoc-6.svg		\
+	network-adhoc-11-connected.svg	\
+	network-adhoc-11.svg		\
 	network-wired.svg		\
 	network-wireless-000.svg	\
 	network-wireless-000.icon	\
@@ -91,7 +96,8 @@ icon_DATA =				\
 	speaker-muted-000.svg		\
 	speaker-muted-033.svg		\
 	speaker-muted-066.svg		\
-	speaker-muted-100.svg		
+	speaker-muted-100.svg		\
+	virtualkeyboard.svg
 
 EXTRA_DIST = $(icon_DATA)
 
diff --git a/icons/scalable/device/network-adhoc-1-connected.svg b/icons/scalable/device/network-adhoc-1-connected.svg
new file mode 100644
index 0000000..8365879
--- /dev/null
+++ b/icons/scalable/device/network-adhoc-1-connected.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#ffffff">
+]>
+<svg enable-background="new 0 0 55 55" height="55px" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+   <g display="inline" id="network-adhoc-1-connected">
+     <circle cx="27.375" cy="27.5" fill="&fill_color;" r="19.0" stroke="&stroke_color;" stroke-width="4"/>
+     <circle cx="27.375" cy="27.5" fill="&stroke_color;" r="4"/>
+     <path d="M9.471,45.697    c-9.958-9.958-9.959-26.104,0-36.062" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-width="3.5"/>
+     <path d="M45.533,9.635    c9.959,9.958,9.958,26.104,0,36.062" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-width="3.5"/>
+   </g>
+</svg>
diff --git a/icons/scalable/device/network-adhoc-1.svg b/icons/scalable/device/network-adhoc-1.svg
new file mode 100644
index 0000000..0848527
--- /dev/null
+++ b/icons/scalable/device/network-adhoc-1.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#ffffff">
+]>
+<svg enable-background="new 0 0 55 55" height="55px" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+   <g display="inline" id="network-adhoc-1">
+     <circle cx="27.375" cy="27.5" fill="&fill_color;" r="19.0" stroke="&stroke_color;" stroke-width="4"/>
+     <circle cx="27.375" cy="27.5" fill="&stroke_color;" r="4"/>
+   </g>
+</svg>
diff --git a/icons/scalable/device/network-adhoc-11-connected.svg b/icons/scalable/device/network-adhoc-11-connected.svg
new file mode 100644
index 0000000..167ad02
--- /dev/null
+++ b/icons/scalable/device/network-adhoc-11-connected.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#ffffff">
+]>
+<svg enable-background="new 0 0 55 55" height="55px" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+   <g display="inline" id="network-adhoc-11-connected">
+     <circle cx="27.375" cy="27.5" fill="&fill_color;" r="19.0" stroke="&stroke_color;" stroke-width="4"/>
+     <circle cx="27.375" cy="20.5" fill="&stroke_color;" r="4"/>
+     <rect height="4" width="12" x="21.375" y="26.5" fill="&stroke_color;"/>
+     <rect height="4" width="12" x="21.375" y="32.5" fill="&stroke_color;"/>
+     <path d="M9.471,45.697    c-9.958-9.958-9.959-26.104,0-36.062" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-width="3.5"/>
+     <path d="M45.533,9.635    c9.959,9.958,9.958,26.104,0,36.062" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-width="3.5"/>
+   </g>
+</svg>
diff --git a/icons/scalable/device/network-adhoc-11.svg b/icons/scalable/device/network-adhoc-11.svg
new file mode 100644
index 0000000..762bea0
--- /dev/null
+++ b/icons/scalable/device/network-adhoc-11.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#ffffff">
+]>
+<svg enable-background="new 0 0 55 55" height="55px" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+   <g display="inline" id="network-adhoc-11">
+     <circle cx="27.375" cy="27.5" fill="&fill_color;" r="19.0" stroke="&stroke_color;" stroke-width="4"/>
+     <circle cx="27.375" cy="20.5" fill="&stroke_color;" r="4"/>
+     <rect height="4" width="12" x="21.375" y="26.5" fill="&stroke_color;"/>
+     <rect height="4" width="12" x="21.375" y="32.5" fill="&stroke_color;"/>
+   </g>
+</svg>
diff --git a/icons/scalable/device/network-adhoc-6-connected.svg b/icons/scalable/device/network-adhoc-6-connected.svg
new file mode 100644
index 0000000..56b0934
--- /dev/null
+++ b/icons/scalable/device/network-adhoc-6-connected.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#ffffff">
+]>
+<svg enable-background="new 0 0 55 55" height="55px" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+   <g display="inline" id="network-adhoc-6-connected">
+     <circle cx="27.375" cy="27.5" fill="&fill_color;" r="19.0" stroke="&stroke_color;" stroke-width="4"/>
+     <circle cx="27.375" cy="24.5" fill="&stroke_color;" r="4"/>
+     <rect height="4" width="12" x="21.375" y="30.5" fill="&stroke_color;"/>
+     <path d="M9.471,45.697    c-9.958-9.958-9.959-26.104,0-36.062" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-width="3.5"/>
+     <path d="M45.533,9.635    c9.959,9.958,9.958,26.104,0,36.062" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-width="3.5"/>
+   </g>
+</svg>
diff --git a/icons/scalable/device/network-adhoc-6.svg b/icons/scalable/device/network-adhoc-6.svg
new file mode 100644
index 0000000..18df8fb
--- /dev/null
+++ b/icons/scalable/device/network-adhoc-6.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#ffffff">
+]>
+<svg enable-background="new 0 0 55 55" height="55px" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+   <g display="inline" id="network-adhoc-6">
+     <circle cx="27.375" cy="27.5" fill="&fill_color;" r="19.0" stroke="&stroke_color;" stroke-width="4"/>
+     <circle cx="27.375" cy="24.5" fill="&stroke_color;" r="4"/>
+     <rect height="4" width="12" x="21.375" y="30.5" fill="&stroke_color;"/>
+   </g>
+</svg>
diff --git a/icons/scalable/device/virtualkeyboard.svg b/icons/scalable/device/virtualkeyboard.svg
new file mode 100644
index 0000000..6d35000
--- /dev/null
+++ b/icons/scalable/device/virtualkeyboard.svg
@@ -0,0 +1,140 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#FFFFFF">
+]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+  <rect fill="&fill_color;" stroke="&stroke_color;"
+     height="18.11911"
+     id="rect806"
+     rx="1.6"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;fill-rule:evenodd;stroke-width:2.50000000000000000;stroke-linejoin:round;stroke-opacity:1;fill-opacity:0"
+     width="43.363712"
+     x="5.7767382"
+     y="19.446568" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 6.4892878,24.027243 42.1421992,0"
+     id="path807"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 6.4892878,28.506124 42.7529552,0"
+     id="path808"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 6.5910805,32.985005 41.6332355,0"
+     id="path809"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 12.596852,23.925451 0,4.377088"
+     id="path811"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 14.021951,28.302539 0,4.682466"
+     id="path812"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 10.764583,20.362704 0,3.460954"
+     id="path813"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 20.231309,28.200746 0,4.886052"
+     id="path815"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 17.991868,24.129036 0,4.07171"
+     id="path816"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 24.303019,24.332621 0,3.969918"
+     id="path817"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 26.746045,28.200746 0,4.682466"
+     id="path818"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 30.817755,24.434414 0,4.173503"
+     id="path819"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 33.057196,28.302539 0,4.580673"
+     id="path820"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 37.739662,24.332621 0,4.07171"
+     id="path821"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 39.87731,28.200746 0,4.682466"
+     id="path822"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 11.37534,33.290383 0,3.66454"
+     id="path823"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 16.872148,33.188591 0,3.969917"
+     id="path824"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 36.212771,33.188591 0,3.460953"
+     id="path825"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 42.422128,33.188591 0,3.562746"
+     id="path826"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 15.345257,20.56629 0,3.562746"
+     id="path827"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 20.027724,20.159119 0,3.868124"
+     id="path828"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 25.015568,20.464497 0,3.155575"
+     id="path829"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 29.698035,20.260911 0,3.460954"
+     id="path830"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 34.584087,20.260911 0,3.359161"
+     id="path831"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 39.470139,20.464497 0,3.359161"
+     id="path832"
+     sodipodi:nodetypes="cc"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+  <path fill="&fill_color;" stroke="&stroke_color;"
+     d="m 44.152605,20.057326 0,3.562746"
+     id="path833"
+     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
+     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
+</svg>