Added css for desktop

diff --git a/data/css_desktop/images/header-background.png b/data/css_desktop/images/header-background.png
new file mode 100755 (executable)
index 0000000..1bf831c
Binary files /dev/null and b/data/css_desktop/images/header-background.png differ

diff --git a/data/css_desktop/images/header-background.xcf b/data/css_desktop/images/header-background.xcf
new file mode 100755 (executable)
index 0000000..0a845bf
Binary files /dev/null and b/data/css_desktop/images/header-background.xcf differ

diff --git a/data/css_desktop/images/header-border.png b/data/css_desktop/images/header-border.png
new file mode 100755 (executable)
index 0000000..e9b17ed
Binary files /dev/null and b/data/css_desktop/images/header-border.png differ

diff --git a/data/css_desktop/images/header-border.xcf b/data/css_desktop/images/header-border.xcf
new file mode 100755 (executable)
index 0000000..7108d0d
Binary files /dev/null and b/data/css_desktop/images/header-border.xcf differ

diff --git a/data/css_desktop/images/key-background.png b/data/css_desktop/images/key-background.png
new file mode 100755 (executable)
index 0000000..7a01218
Binary files /dev/null and b/data/css_desktop/images/key-background.png differ

diff --git a/data/css_desktop/images/key-background.xcf b/data/css_desktop/images/key-background.xcf
new file mode 100755 (executable)
index 0000000..ee7930e
Binary files /dev/null and b/data/css_desktop/images/key-background.xcf differ

diff --git a/data/css_desktop/images/shadow-grey-bg.png b/data/css_desktop/images/shadow-grey-bg.png
new file mode 100755 (executable)
index 0000000..062aba7
Binary files /dev/null and b/data/css_desktop/images/shadow-grey-bg.png differ

diff --git a/data/css_desktop/images/shadow-grey-bg.xcf b/data/css_desktop/images/shadow-grey-bg.xcf
new file mode 100755 (executable)
index 0000000..2de7518
Binary files /dev/null and b/data/css_desktop/images/shadow-grey-bg.xcf differ

diff --git a/data/css_desktop/images/shadow-transparent-bg.png b/data/css_desktop/images/shadow-transparent-bg.png
new file mode 100755 (executable)
index 0000000..26aeadd
Binary files /dev/null and b/data/css_desktop/images/shadow-transparent-bg.png differ

diff --git a/data/css_desktop/images/shadow-transparent-bg.xcf b/data/css_desktop/images/shadow-transparent-bg.xcf
new file mode 100755 (executable)
index 0000000..214bcba
Binary files /dev/null and b/data/css_desktop/images/shadow-transparent-bg.xcf differ

diff --git a/data/css_desktop/images/shadow-white-bg.png b/data/css_desktop/images/shadow-white-bg.png
new file mode 100755 (executable)
index 0000000..a2d3b53
Binary files /dev/null and b/data/css_desktop/images/shadow-white-bg.png differ

diff --git a/data/css_desktop/images/shadow-white-bg.xcf b/data/css_desktop/images/shadow-white-bg.xcf
new file mode 100755 (executable)
index 0000000..8e8a72c
Binary files /dev/null and b/data/css_desktop/images/shadow-white-bg.xcf differ

diff --git a/data/css_desktop/images/tab-background.png b/data/css_desktop/images/tab-background.png
new file mode 100755 (executable)
index 0000000..8a65250
Binary files /dev/null and b/data/css_desktop/images/tab-background.png differ

diff --git a/data/css_desktop/images/tab-background.xcf b/data/css_desktop/images/tab-background.xcf
new file mode 100755 (executable)
index 0000000..fc8c10a
Binary files /dev/null and b/data/css_desktop/images/tab-background.xcf differ

diff --git a/data/css_desktop/style.css b/data/css_desktop/style.css
new file mode 100755 (executable)
index 0000000..43e823e
--- /dev/null
+++ b/data/css_desktop/style.css
@@ -0,0 +1,97 @@
+body, html, body *, html * {
+       margin                  : 0px;
+       padding         : 0px;
+       color                   : #777185;
+       font-size               : 10pt;
+       font-family             : Tahoma, Helvetica, Arial, Arial, sans-serif;
+} 
+body {
+       background-color        : #eeecec; 
+}
+
+img.icon {
+       vertical-align          : middle;
+       float                   : left;
+       height                  : 16px;
+       padding                 : 5px;
+}
+
+
+div.tab {
+       background-attachment: scroll; 
+       background-color        : transparent;
+       background-repeat       : no-repeat;
+       background-size : contain;
+       background-position     : right bottom; 
+       display         : block;
+       margin                  : 4px;
+       margin-top              : 8px;
+       padding         : 2px;
+       padding-bottom  : 0px;
+        padding-right   : 0px;
+       
+        -webkit-box-reflect    : below 5px -webkit-gradient(linear, 0% 0%, 0% 120%, from(transparent), color-stop(0.3, transparent), to(white));
+}
+
+div.dict {
+       margin                  : 0px 0px 5px 5px;
+       padding                 : 0px;
+       background-color        : transparent;
+
+       border                  : solid transparent;
+       border-width            : 13px 13px 13px 13px;
+       -webkit-border-image    : url("images/shadow-transparent-bg.png") 13 13 13 13;
+}
+
+div.info {
+       font-weight             : bold;
+       text-align              : center;
+       padding                 : 3px;
+       background-color        : transparent;
+       color                   : #000000;
+
+       border                  : solid transparent;
+       border-width            : 5px 5px 5px 5px;
+       -webkit-border-image    : url("images/header-border.png") 5 5 5 5;
+
+       background-image        : url("images/header-background.png");
+       background-repeat       : repeat-y;
+       background-position     : -3 0;
+}
+
+
+div.key {
+       text-align              : center;
+       font-weight             : bold;
+       color                   : #000000;
+
+       background-image        : url("images/key-background.png");
+       background-repeat       : no-repeat;
+       background-position     : center;
+
+       border                  : solid transparent;
+       border-radius           : 15px 15px 15px 15px;
+       border-width            : 1px 1px 1px 1px;
+       border-style            : solid;
+       border-color            : #777185;
+
+       margin-top              : 5px;
+}
+
+div.cell {
+       color                   : #3e3b46; 
+       padding         : 0px 0px 0px 10px;
+}
+
+span.i {
+       color                   : #3e3b46;
+       font-style              : italic;
+}
+span.b {
+       color                   : #3e3b46;
+       font-weight             : bold;
+}
+span.u {
+       color                   : #3e3b46;
+       text-decoration : underline;
+}

diff --git a/src/mdictionary/gui/DBusAdapter.cpp b/src/mdictionary/gui/DBusAdapter.cpp
index cf4dd44..198ba56 100644 (file)
--- a/src/mdictionary/gui/DBusAdapter.cpp
+++ b/src/mdictionary/gui/DBusAdapter.cpp
@@ -32,8 +32,9 @@ DBusAdapter::DBusAdapter(MainWindow *w):
 }
 
 void DBusAdapter::search(QString word) {
-    showApplication();
+
     mainWindow->search(word);
+    showApplication();
 }
 
 void DBusAdapter::showApplication() {

diff --git a/src/mdictionary/gui/MainWindow.cpp b/src/mdictionary/gui/MainWindow.cpp
index 4cade09..9d2ae5a 100644 (file)
--- a/src/mdictionary/gui/MainWindow.cpp
+++ b/src/mdictionary/gui/MainWindow.cpp
@@ -292,6 +292,12 @@ QHash<CommonDictInterface*, bool> MainWindow::getDictionaries() {
 void MainWindow::search(QString word) {
     setExactSearch(false);
     searchBarWidget->search(word);
+    #ifdef Q_WS_MAEMO_5
+    if(translationWidget->isVisible()) {
+            translationWidget->hide();
+            update();
+        }
+    #endif
 }
 
 void MainWindow::searchExact(QString word) {

diff --git a/src/mdictionary/mdictionary.pro b/src/mdictionary/mdictionary.pro
index 0025ded..3cc8467 100644 (file)
--- a/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@ -96,9 +96,19 @@ unix {
     shared.files += ../../data/xsl/mask.png
 
     meego {
-       css.path = $$DATA_DIR/css
-       css.files += ../../data/css_meego/style.css
+        css.path = $$DATA_DIR/css
+        css.files += ../../data/css_meego/style.css
+    }
+    else:maemo5 {
+        css.path = $$DATA_DIR/css
+        css.files += ../../data/css_maemo/style.css
+    }
+    else {
+        css.path = $$DATA_DIR/css
+        css.files += ../../data/css_desktop/style.css
+    }
 
+    meego {
        css_images.path = $$DATA_DIR/css/images
         css_images.files += ../../data/css_meego/images/header-background.png
         css_images.files += ../../data/css_meego/images/header-border.png
@@ -106,21 +116,34 @@ unix {
         css_images.files += ../../data/css_meego/images/shadow-white-bg.png
         css_images.files += ../../data/css_meego/images/tab-background.png
         css_images.files += ../../data/css_meego/images/key-background.png
-       css_images.files += ../../data/css_meego/images/shadow-transparent-bg.png
+    css_images.files += ../../data/css_meego/images/shadow-transparent-bg. png
        css_images.files += ../../data/css_meego/images/splash2.png
     }
-    !meego {   
-       css.path = $$DATA_DIR/css
-       css.files += ../../data/css_maemo/style.css
-
-       css_images.path = $$DATA_DIR/css/images
-       css_images.files += ../../data/css_maemo/images/header-background.png
-       css_images.files += ../../data/css_maemo/images/header-border.png
-       css_images.files += ../../data/css_maemo/images/shadow-grey-bg.png
-       css_images.files += ../../data/css_maemo/images/shadow-white-bg.png
-       css_images.files += ../../data/css_maemo/images/tab-background.png
-       css_images.files += ../../data/css_maemo/images/key-background.png
+    else:maemo5 {
+        css.path = $$DATA_DIR/css
+        css.files += ../../data/css_maemo/style.css
+
+        css_images.path = $$DATA_DIR/css/images
+        css_images.files += ../../data/css_maemo/images/header-background.png
+        css_images.files += ../../data/css_maemo/images/header-border.png
+        css_images.files += ../../data/css_maemo/images/shadow-grey-bg.png
+        css_images.files += ../../data/css_maemo/images/shadow-white-bg.png
+        css_images.files += ../../data/css_maemo/images/tab-background.png
+        css_images.files += ../../data/css_maemo/images/key-background.png
+    }
+    else {
+        css.path = $$DATA_DIR/css
+        css.files += ../../data/css_desktop/style.css
+
+        css_images.path = $$DATA_DIR/css/images
+        css_images.files += ../../data/css_desktop/images/header-background.png
+        css_images.files += ../../data/css_desktop/images/header-border.png
+        css_images.files += ../../data/css_desktop/images/shadow-grey-bg.png
+        css_images.files += ../../data/css_desktop/images/shadow-white-bg.png
+        css_images.files += ../../data/css_desktop/images/tab-background.png
+        css_images.files += ../../data/css_desktop/images/key-background.png
     }
+
     service.path = $$SHARE_DIR/dbus-1/services
     service.files += ../../data/other/com.comarch.mdictionary.service