From: Julia Baudier <jbaudier@argeo.org>
Date: Wed, 6 Dec 2017 07:43:27 +0000 (+0100)
Subject: Merge branch 'master' of https://code.argeo.org/git/gpl/argeo-suite.git
X-Git-Tag: argeo-suite-0.1.12~11
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=39294b07f7b4c4b92acec003a11ac201347c0146;hp=70484bdd4698ebc8a8eb74d25302ef48b61faa5a

Merge branch 'master' of https://code.argeo.org/git/gpl/argeo-suite.git
---

diff --git a/org.argeo.suite.theme.argeo2/build.properties b/org.argeo.suite.theme.argeo2/build.properties
index a9787af..a1548de 100644
--- a/org.argeo.suite.theme.argeo2/build.properties
+++ b/org.argeo.suite.theme.argeo2/build.properties
@@ -2,7 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               theme-old/,\
-               plugin.xml,\
-               icons/,\
-               img/
+                icons/,\
+               img/,\
+               theme.css
diff --git a/org.argeo.suite.theme.argeo2/theme.css b/org.argeo.suite.theme.argeo2/theme.css
index 5a56991..37516f7 100644
--- a/org.argeo.suite.theme.argeo2/theme.css
+++ b/org.argeo.suite.theme.argeo2/theme.css
@@ -27,6 +27,19 @@ Label {
 	color: #555555;
 }
 
+/** In order to fix the default color */
+Shell-Titlebar {
+  font: 12px Verdana, "Lucida Sans", Arial, Helvetica, sans-serif;
+  background-color: #204a87;
+  padding: 0 10px 0 10px;
+  margin: 0px;
+  height: 38px;
+  border: none;
+  border-radius: 0;
+  text-shadow: none;
+}
+
+/* WIDGETS */
 Text, Combo-Field, DateTime-Field {
 	padding: 2px 8px 2px 8px;
 }
diff --git a/org.argeo.suite.workbench.rap/plugin.xml b/org.argeo.suite.workbench.rap/plugin.xml
index 590481e..cbe401a 100644
--- a/org.argeo.suite.workbench.rap/plugin.xml
+++ b/org.argeo.suite.workbench.rap/plugin.xml
@@ -19,7 +19,7 @@
 			class="org.argeo.eclipse.spring.SpringExtensionFactory"
 			id="org.argeo.suite.workbench.rap.quickSearchView"
 			name="Search"
-			restorable="true">
+			restorable="false">
 		</view>
 		
 	</extension>
diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java
index 7ec4188..3064e27 100644
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java
@@ -71,11 +71,11 @@ public class QuickSearchView extends ViewPart implements Refreshable {
 	@Override
 	public void init(IViewSite site) throws PartInitException {
 		super.init(site);
-		setTitleImage(ConnectImages.SEARCH);
 	}
 
 	@Override
 	public void createPartControl(Composite parent) {
+		setTitleImage(ConnectImages.SEARCH);
 		session = ConnectJcrUtils.login(repository);
 		// MainLayout
 		parent.setLayout(new GridLayout());