From: Mateusz Półrola Date: Mon, 13 Sep 2010 11:13:31 +0000 (+0200) Subject: Add new style for meego X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=b7c47dfb8d5ed1db8ec4b9a5555482a0895427d2;p=mdictionary Add new style for meego --- diff --git a/data/css/images/header-background.png b/data/css/images/header-background.png deleted file mode 100644 index 6209dc5..0000000 Binary files a/data/css/images/header-background.png and /dev/null differ diff --git a/data/css/images/header-background.xcf b/data/css/images/header-background.xcf deleted file mode 100644 index 158d845..0000000 Binary files a/data/css/images/header-background.xcf and /dev/null differ diff --git a/data/css/images/header-border.png b/data/css/images/header-border.png deleted file mode 100644 index dfb92f2..0000000 Binary files a/data/css/images/header-border.png and /dev/null differ diff --git a/data/css/images/header-border.xcf b/data/css/images/header-border.xcf deleted file mode 100644 index 5515f28..0000000 Binary files a/data/css/images/header-border.xcf and /dev/null differ diff --git a/data/css/images/key-background.png b/data/css/images/key-background.png deleted file mode 100644 index 79b5921..0000000 Binary files a/data/css/images/key-background.png and /dev/null differ diff --git a/data/css/images/key-background.xcf b/data/css/images/key-background.xcf deleted file mode 100644 index 7264399..0000000 Binary files a/data/css/images/key-background.xcf and /dev/null differ diff --git a/data/css/images/shadow-grey-bg.png b/data/css/images/shadow-grey-bg.png deleted file mode 100644 index 062aba7..0000000 Binary files a/data/css/images/shadow-grey-bg.png and /dev/null differ diff --git a/data/css/images/shadow-grey-bg.xcf b/data/css/images/shadow-grey-bg.xcf deleted file mode 100644 index 2de7518..0000000 Binary files a/data/css/images/shadow-grey-bg.xcf and /dev/null differ diff --git a/data/css/images/shadow-white-bg.png b/data/css/images/shadow-white-bg.png deleted file mode 100644 index a2d3b53..0000000 Binary files a/data/css/images/shadow-white-bg.png and /dev/null differ diff --git a/data/css/images/shadow-white-bg.xcf b/data/css/images/shadow-white-bg.xcf deleted file mode 100644 index 8e8a72c..0000000 Binary files a/data/css/images/shadow-white-bg.xcf and /dev/null differ diff --git a/data/css/images/tab-background.png b/data/css/images/tab-background.png deleted file mode 100644 index 8a65250..0000000 Binary files a/data/css/images/tab-background.png and /dev/null differ diff --git a/data/css/images/tab-background.xcf b/data/css/images/tab-background.xcf deleted file mode 100644 index fc8c10a..0000000 Binary files a/data/css/images/tab-background.xcf and /dev/null differ diff --git a/data/css/style.css b/data/css/style.css deleted file mode 100644 index d67bd43..0000000 --- a/data/css/style.css +++ /dev/null @@ -1,92 +0,0 @@ -body, html, body *, html * { - margin : 0px; - padding : 0px; - color : #eee; - font-size : 14pt; - font-family : Tahoma, Helvetica, Arial, Arial, sans-serif; -} -body { - background-color : black; -} - - - -div.tab { - display : block; - margin : 4px; - margin-top : 8px; - padding : 2px; - padding-bottom : 0px; - background-color : #333; - border-radius : 5px; - border : 1px solid #555; - background-image : url("images/tab-background.png"); - background-repeat : repeat-y; - -webkit-box-reflect : below 5px -webkit-gradient(linear, 0% 0%, 0% 150%, 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-grey-bg.png") 13 13 13 13; -} - -div.info { - font-weight : bold; - text-align : center; - padding : 3px; - background-color : #444; - color : #dcbba0; - - 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; - vertical-align : middle; -} - -img.icon { - vertical-align : middle; - float : left; - height : 16px; - padding : 5px; -} - - -div.key { - text-align : center; - color : #9c9; - - background-image : url("images/key-background.png"); - background-repeat : no-repeat; - background-size : 100% auto; - background-position : center; - - border-radius : 10px 10px 40px 40px; - border-width : 1px 1px 1px 1px; - border-style : solid; - border-color : #1f1f1f; - - margin-top : 5px; -} - -div.cell { - padding : 0px 0px 0px 10px; -} - -span.i { - font-style : italic; -} -span.b { - font-weight : bold; -} -span.u { - text-decoration : underline; -} diff --git a/data/css_maemo/images/header-background.png b/data/css_maemo/images/header-background.png new file mode 100644 index 0000000..6209dc5 Binary files /dev/null and b/data/css_maemo/images/header-background.png differ diff --git a/data/css_maemo/images/header-background.xcf b/data/css_maemo/images/header-background.xcf new file mode 100644 index 0000000..158d845 Binary files /dev/null and b/data/css_maemo/images/header-background.xcf differ diff --git a/data/css_maemo/images/header-border.png b/data/css_maemo/images/header-border.png new file mode 100644 index 0000000..dfb92f2 Binary files /dev/null and b/data/css_maemo/images/header-border.png differ diff --git a/data/css_maemo/images/header-border.xcf b/data/css_maemo/images/header-border.xcf new file mode 100644 index 0000000..5515f28 Binary files /dev/null and b/data/css_maemo/images/header-border.xcf differ diff --git a/data/css_maemo/images/key-background.png b/data/css_maemo/images/key-background.png new file mode 100644 index 0000000..79b5921 Binary files /dev/null and b/data/css_maemo/images/key-background.png differ diff --git a/data/css_maemo/images/key-background.xcf b/data/css_maemo/images/key-background.xcf new file mode 100644 index 0000000..7264399 Binary files /dev/null and b/data/css_maemo/images/key-background.xcf differ diff --git a/data/css_maemo/images/shadow-grey-bg.png b/data/css_maemo/images/shadow-grey-bg.png new file mode 100644 index 0000000..062aba7 Binary files /dev/null and b/data/css_maemo/images/shadow-grey-bg.png differ diff --git a/data/css_maemo/images/shadow-grey-bg.xcf b/data/css_maemo/images/shadow-grey-bg.xcf new file mode 100644 index 0000000..2de7518 Binary files /dev/null and b/data/css_maemo/images/shadow-grey-bg.xcf differ diff --git a/data/css_maemo/images/shadow-white-bg.png b/data/css_maemo/images/shadow-white-bg.png new file mode 100644 index 0000000..a2d3b53 Binary files /dev/null and b/data/css_maemo/images/shadow-white-bg.png differ diff --git a/data/css_maemo/images/shadow-white-bg.xcf b/data/css_maemo/images/shadow-white-bg.xcf new file mode 100644 index 0000000..8e8a72c Binary files /dev/null and b/data/css_maemo/images/shadow-white-bg.xcf differ diff --git a/data/css_maemo/images/tab-background.png b/data/css_maemo/images/tab-background.png new file mode 100644 index 0000000..8a65250 Binary files /dev/null and b/data/css_maemo/images/tab-background.png differ diff --git a/data/css_maemo/images/tab-background.xcf b/data/css_maemo/images/tab-background.xcf new file mode 100644 index 0000000..fc8c10a Binary files /dev/null and b/data/css_maemo/images/tab-background.xcf differ diff --git a/data/css_maemo/style.css b/data/css_maemo/style.css new file mode 100644 index 0000000..d67bd43 --- /dev/null +++ b/data/css_maemo/style.css @@ -0,0 +1,92 @@ +body, html, body *, html * { + margin : 0px; + padding : 0px; + color : #eee; + font-size : 14pt; + font-family : Tahoma, Helvetica, Arial, Arial, sans-serif; +} +body { + background-color : black; +} + + + +div.tab { + display : block; + margin : 4px; + margin-top : 8px; + padding : 2px; + padding-bottom : 0px; + background-color : #333; + border-radius : 5px; + border : 1px solid #555; + background-image : url("images/tab-background.png"); + background-repeat : repeat-y; + -webkit-box-reflect : below 5px -webkit-gradient(linear, 0% 0%, 0% 150%, 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-grey-bg.png") 13 13 13 13; +} + +div.info { + font-weight : bold; + text-align : center; + padding : 3px; + background-color : #444; + color : #dcbba0; + + 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; + vertical-align : middle; +} + +img.icon { + vertical-align : middle; + float : left; + height : 16px; + padding : 5px; +} + + +div.key { + text-align : center; + color : #9c9; + + background-image : url("images/key-background.png"); + background-repeat : no-repeat; + background-size : 100% auto; + background-position : center; + + border-radius : 10px 10px 40px 40px; + border-width : 1px 1px 1px 1px; + border-style : solid; + border-color : #1f1f1f; + + margin-top : 5px; +} + +div.cell { + padding : 0px 0px 0px 10px; +} + +span.i { + font-style : italic; +} +span.b { + font-weight : bold; +} +span.u { + text-decoration : underline; +} diff --git a/data/css_meego/images/avatar_icon.png b/data/css_meego/images/avatar_icon.png new file mode 100755 index 0000000..92d039a Binary files /dev/null and b/data/css_meego/images/avatar_icon.png differ diff --git a/data/css_meego/images/avatar_icon2.png b/data/css_meego/images/avatar_icon2.png new file mode 100755 index 0000000..34d186f Binary files /dev/null and b/data/css_meego/images/avatar_icon2.png differ diff --git a/data/css_meego/images/cat.png b/data/css_meego/images/cat.png new file mode 100755 index 0000000..38dfc0a Binary files /dev/null and b/data/css_meego/images/cat.png differ diff --git a/data/css_meego/images/header-background.png b/data/css_meego/images/header-background.png new file mode 100755 index 0000000..159a15d Binary files /dev/null and b/data/css_meego/images/header-background.png differ diff --git a/data/css_meego/images/header-background.xcf b/data/css_meego/images/header-background.xcf new file mode 100755 index 0000000..0c60bfa Binary files /dev/null and b/data/css_meego/images/header-background.xcf differ diff --git a/data/css_meego/images/header-border.png b/data/css_meego/images/header-border.png new file mode 100755 index 0000000..e9b17ed Binary files /dev/null and b/data/css_meego/images/header-border.png differ diff --git a/data/css_meego/images/header-border.xcf b/data/css_meego/images/header-border.xcf new file mode 100755 index 0000000..7108d0d Binary files /dev/null and b/data/css_meego/images/header-border.xcf differ diff --git a/data/css_meego/images/intro-video-thumbnail.png b/data/css_meego/images/intro-video-thumbnail.png new file mode 100755 index 0000000..70eff47 Binary files /dev/null and b/data/css_meego/images/intro-video-thumbnail.png differ diff --git a/data/css_meego/images/key-background.png b/data/css_meego/images/key-background.png new file mode 100755 index 0000000..0679f31 Binary files /dev/null and b/data/css_meego/images/key-background.png differ diff --git a/data/css_meego/images/key-background.xcf b/data/css_meego/images/key-background.xcf new file mode 100755 index 0000000..ee7930e Binary files /dev/null and b/data/css_meego/images/key-background.xcf differ diff --git a/data/css_meego/images/linux_foundation_color.png b/data/css_meego/images/linux_foundation_color.png new file mode 100755 index 0000000..344010d Binary files /dev/null and b/data/css_meego/images/linux_foundation_color.png differ diff --git a/data/css_meego/images/meego-logo.png b/data/css_meego/images/meego-logo.png new file mode 100755 index 0000000..37d5de4 Binary files /dev/null and b/data/css_meego/images/meego-logo.png differ diff --git a/data/css_meego/images/meego-peep.png b/data/css_meego/images/meego-peep.png new file mode 100755 index 0000000..6591da2 Binary files /dev/null and b/data/css_meego/images/meego-peep.png differ diff --git a/data/css_meego/images/people.png b/data/css_meego/images/people.png new file mode 100755 index 0000000..2f2f581 Binary files /dev/null and b/data/css_meego/images/people.png differ diff --git a/data/css_meego/images/shadow-grey-bg.png b/data/css_meego/images/shadow-grey-bg.png new file mode 100755 index 0000000..062aba7 Binary files /dev/null and b/data/css_meego/images/shadow-grey-bg.png differ diff --git a/data/css_meego/images/shadow-grey-bg.xcf b/data/css_meego/images/shadow-grey-bg.xcf new file mode 100755 index 0000000..2de7518 Binary files /dev/null and b/data/css_meego/images/shadow-grey-bg.xcf differ diff --git a/data/css_meego/images/shadow-transparent-bg.png b/data/css_meego/images/shadow-transparent-bg.png new file mode 100755 index 0000000..26aeadd Binary files /dev/null and b/data/css_meego/images/shadow-transparent-bg.png differ diff --git a/data/css_meego/images/shadow-transparent-bg.xcf b/data/css_meego/images/shadow-transparent-bg.xcf new file mode 100755 index 0000000..214bcba Binary files /dev/null and b/data/css_meego/images/shadow-transparent-bg.xcf differ diff --git a/data/css_meego/images/shadow-white-bg.png b/data/css_meego/images/shadow-white-bg.png new file mode 100755 index 0000000..a2d3b53 Binary files /dev/null and b/data/css_meego/images/shadow-white-bg.png differ diff --git a/data/css_meego/images/shadow-white-bg.xcf b/data/css_meego/images/shadow-white-bg.xcf new file mode 100755 index 0000000..8e8a72c Binary files /dev/null and b/data/css_meego/images/shadow-white-bg.xcf differ diff --git a/data/css_meego/images/shutdown-1024x600.png b/data/css_meego/images/shutdown-1024x600.png new file mode 100755 index 0000000..50db205 Binary files /dev/null and b/data/css_meego/images/shutdown-1024x600.png differ diff --git a/data/css_meego/images/shutdown-1366x768.png b/data/css_meego/images/shutdown-1366x768.png new file mode 100755 index 0000000..d6913a5 Binary files /dev/null and b/data/css_meego/images/shutdown-1366x768.png differ diff --git a/data/css_meego/images/splash.png b/data/css_meego/images/splash.png new file mode 100755 index 0000000..0800e86 Binary files /dev/null and b/data/css_meego/images/splash.png differ diff --git a/data/css_meego/images/splash2 (kopia).png b/data/css_meego/images/splash2 (kopia).png new file mode 100755 index 0000000..7f915fa Binary files /dev/null and b/data/css_meego/images/splash2 (kopia).png differ diff --git a/data/css_meego/images/splash2.png b/data/css_meego/images/splash2.png new file mode 100755 index 0000000..edd2a47 Binary files /dev/null and b/data/css_meego/images/splash2.png differ diff --git a/data/css_meego/images/tab-background.png b/data/css_meego/images/tab-background.png new file mode 100755 index 0000000..8a65250 Binary files /dev/null and b/data/css_meego/images/tab-background.png differ diff --git a/data/css_meego/images/tab-background.xcf b/data/css_meego/images/tab-background.xcf new file mode 100755 index 0000000..fc8c10a Binary files /dev/null and b/data/css_meego/images/tab-background.xcf differ diff --git a/data/css_meego/strona.html b/data/css_meego/strona.html new file mode 100755 index 0000000..3ea73bf --- /dev/null +++ b/data/css_meego/strona.html @@ -0,0 +1,27 @@ + + + + + +
+
+
[English-Polish]
+
cat
+
kot
+ (rzeczownik) +: kot, kotka, kociątko, złośliwa kobieta
+ (czasownik) +: podnieść
+ +
CAT
+
+CAT - firma produkująca ciężki sprzęt budowlany
+
+
+
+Basic Thai Language [ENG-THA]
+
cat
+
maeow
+
+
+ diff --git a/data/css_meego/style.css b/data/css_meego/style.css new file mode 100755 index 0000000..d29502a --- /dev/null +++ b/data/css_meego/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-image : url("images/people.png"); + background-repeat : no-repeat; + background-size : contain; + background-position : center bottom; + display : block; + margin : 4px; + margin-top : 8px; + padding : 2px; + padding-bottom : 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/debian/mdictionary.install b/debian/mdictionary.install index 9dc5e8a..b67ebf1 100644 --- a/debian/mdictionary.install +++ b/debian/mdictionary.install @@ -6,5 +6,5 @@ usr/lib/mdictionary/plugins/libxdxf.so usr/lib/mdictionary/plugins/eng-us.xdxf usr/lib/mdictionary/plugins/eng-thai.xdxf usr/share/mdictionary/xdxf.png -usr/share/applications/hildon/mdictionary.desktop usr/share/mdictionary/css/ +usr/share/applications/hildon/mdictionary.desktop diff --git a/src/mdictionary/mdictionary.pro b/src/mdictionary/mdictionary.pro index 096f288..8e3195b 100644 --- a/src/mdictionary/mdictionary.pro +++ b/src/mdictionary/mdictionary.pro @@ -13,6 +13,8 @@ QT = core \ maemo5:QT += maemo5 +message($$CONFIG) + SOURCES += gui/main.cpp \ backbone/ConfigGenerator.cpp \ gui/MainWindow.cpp \ @@ -93,19 +95,34 @@ unix { shared.files += ../../data/icons/16x16/staron.png shared.files += ../../data/xsl/mask.png - css.path = $$DATA_DIR/css - css.files += ../../data/css/style.css - - css_images.path = $$DATA_DIR/css/images - css_images.files += ../../data/css/images/header-background.png - css_images.files += ../../data/css/images/header-border.png - css_images.files += ../../data/css/images/shadow-grey-bg.png - css_images.files += ../../data/css/images/shadow-white-bg.png - css_images.files += ../../data/css/images/tab-background.png - css_images.files += ../../data/css/images/key-background.png - - service.path = $$SHARE_DIR/dbus-1/services - service.files += ../../data/other/com.comarch.mdictionary.service + meego { + css.path = $$DATA_DIR/css + css.files += ../../data/css_meego/style.css + + 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 + css_images.files += ../../data/css_meego/images/shadow-grey-bg.png + 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/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 + } + service.path = $$SHARE_DIR/dbus-1/services + service.files += ../../data/other/com.comarch.mdictionary.service INSTALLS += desktop icon64 shared service css css_images }