Updated NSIS installer script + translation

bin/themes/linux/main.css

@@ -84,7 +84,6 @@
 /*LocationBar*/
 #locationbar
 {
-    background: transparent;
     border-width:4;
     color:black;
     padding-left: 22px;
@@ -151,7 +150,6 @@
 /*WebSearchBar*/
 #websearchbar
 {
-    background: transparent;
     border-width:4;
     color:black;
     padding-left: 30px;

src/app/mainapplication.cpp

@@ -173,7 +173,13 @@ void MainApplication::loadSettings()
 {
     QSettings settings(m_activeProfil+"settings.ini", QSettings::IniFormat);
     settings.beginGroup("Themes");
-    QString activeTheme = settings.value("activeTheme", "default").toString();
+    QString activeTheme = settings.value("activeTheme",
+#ifdef Q_WS_X11
+                                         "linux"
+#else
+                                         "windows"
+#endif
+                                         ).toString();
     settings.endGroup();
     m_activeThemePath = THEMESDIR + activeTheme + "/";
     QFile cssFile(m_activeThemePath + "main.css");

windows/installer.nsi

@@ -1,9 +1,9 @@
 RequestExecutionLevel admin
-!include "FileAssociation.nsh"
+!include "wininstall\FileAssociation.nsh"
 SetCompressor /SOLID /FINAL lzma
 
 !define PRODUCT_NAME "QupZilla"
-!define /date PRODUCT_VERSION "0.9.9"
+!define /date PRODUCT_VERSION "1.0.0-b4"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\qupzilla.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
@@ -64,8 +64,8 @@ Section !$(TITLE_SecMain) SecMain
   File "qupzilla.exe"
   File "libeay32.dll"
   File "ssleay32.dll"
-  File "msvcp90.dll"
+  File "msvcp100.dll"
-  File "msvcr90.dll"
+  File "msvcr100.dll"
   File "phonon4.dll"
   File "QtCore4.dll"
   File "QtGui4.dll"
@@ -94,6 +94,38 @@ Section !$(TITLE_SecMain) SecMain
 
 SectionEnd
 
+SectionGroup $(TITLE_SecThemes) SecThemes
+  Section Default SecDefault
+  SectionIn RO  
+  SetOutPath "$INSTDIR\themes\windows"
+  File "themes\windows\*"  
+  SetOutPath "$INSTDIR\themes\windows\images"
+  File "themes\windows\images\*"
+  SectionEnd
+
+  Section Chrome SecChrome
+  SetOutPath "$INSTDIR\themes\chrome"
+  File "themes\chrome\*"
+  SetOutPath "$INSTDIR\themes\chrome\images"
+  File "themes\chrome\images\*"
+  SectionEnd
+  
+  Section Mac SecMac
+  SetOutPath "$INSTDIR\themes\mac"
+  File "themes\mac\*"
+  SetOutPath "$INSTDIR\themes\mac\images"
+  File "themes\mac\images\*"
+  SectionEnd
+
+  Section Old SecOld
+  SetOutPath "$INSTDIR\themes\default"
+  File "themes\default\*"
+  SetOutPath "$INSTDIR\themes\default\images"
+  File "themes\default\images\*"
+  SectionEnd
+
+SectionGroupEnd
+
 SectionGroup $(TITLE_SecTranslations) SecTranslations
   Section $(TITLE_SecEnglish) SecEnglish
   SectionIn RO  
@@ -123,8 +155,8 @@ SectionGroupEnd
 
 Section $(TITLE_SecExtensions) SecExtensions
   SetOutPath "$INSTDIR"
-  ${registerExtension} "$INSTDIR\qupzilla.exe" ".htm" "HTM File"
+  ${registerExtension} "$INSTDIR\qupzilla.exe" ".htm" $(FILE_Htm)
-  ${registerExtension} "$INSTDIR\qupzilla.exe" ".html" "HTML File"
+  ${registerExtension} "$INSTDIR\qupzilla.exe" ".html" $(FILE_Html)
 SectionEnd
 
 Section "-StartMenu"
@@ -151,6 +183,7 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SecExamplePlugin} $(DESC_SecExamplePlugin)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktop} $(DESC_SecDesktop)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecExtensions} $(DESC_SecExtensions)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecThemes} $(DESC_SecThemes)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 Section "-Uninstaller"

windows/languages.nsh

@@ -8,6 +8,7 @@ LangString TITLE_SecPlugins ${LANG_ENGLISH} "Plugins"
 LangString TITLE_SecExamplePlugin ${LANG_ENGLISH} "Example Plugin"
 LangString TITLE_SecDesktop ${LANG_ENGLISH} "Desktop Icon"
 LangString TITLE_SecExtensions ${LANG_ENGLISH} "File Associations"
+LangString TITLE_SecThemes ${LANG_ENGLISH} "Themes"
 
 LangString FILE_Htm ${LANG_ENGLISH} "HTM File"
 LangString FILE_Html ${LANG_ENGLISH} "HTML File"
@@ -16,23 +17,24 @@ LangString DESC_SecMain ${LANG_ENGLISH} "Main components of application."
 LangString DESC_SecTranslations ${LANG_ENGLISH} "Other translations available to install. Default is English."
 LangString DESC_SecEnglish ${LANG_ENGLISH} "English translation"
 LangString DESC_SecCzech ${LANG_ENGLISH} "Czech translation"
-LangString DESC_SecCzech ${LANG_CZECH} "Èeský pøeklad"
 LangString DESC_SecSlovak ${LANG_ENGLISH} "Slovak translation"
 LangString DESC_SecPlugins ${LANG_ENGLISH} "Other plugins available to install."
 LangString DESC_SecExamplePlugin ${LANG_ENGLISH} "Useless example plugin."
 LangString DESC_SecDesktop ${LANG_ENGLISH} "Add launcher to desktop."
 LangString DESC_SecExtensions ${LANG_ENGLISH} "Associate QupZilla with .htm and .html files"
+LangString DESC_SecThemes ${LANG_ENGLISH} "Additional themes for QupZilla"
 
 ;;;;Czech
 LangString TITLE_SecMain ${LANG_CZECH} "Hlavní komponenty"
 LangString TITLE_SecTranslations ${LANG_CZECH} "Pøeklady"
 LangString TITLE_SecEnglish ${LANG_CZECH} "Angliètina"
-LangString TITLE_SecCzech ${LANG_CZECH} "Èe¹tina"
+LangString TITLE_SecCzech ${LANG_CZECH} "Èeština"
-LangString TITLE_SecSlovak ${LANG_CZECH} "Sloven¹tina"
+LangString TITLE_SecSlovak ${LANG_CZECH} "Slovenština"
 LangString TITLE_SecPlugins ${LANG_CZECH} "Doplòky"
 LangString TITLE_SecExamplePlugin ${LANG_CZECH} "Ukázkový doplnìk"
-LangString TITLE_SecDesktop ${LANG_CZECH} "Zástupce na plo¹e"
+LangString TITLE_SecDesktop ${LANG_CZECH} "Zástupce na ploše"
 LangString TITLE_SecExtensions ${LANG_CZECH} "Asociace souborù"
+LangString TITLE_SecThemes ${LANG_CZECH} "Témata"
 
 LangString FILE_Htm ${LANG_CZECH} "Soubor HTM"
 LangString FILE_Html ${LANG_CZECH} "Soubor HTML"
@@ -40,22 +42,25 @@ LangString FILE_Html ${LANG_CZECH} "Soubor HTML"
 LangString DESC_SecMain ${LANG_CZECH} "Hlavní komponenty aplikace."
 LangString DESC_SecTranslations ${LANG_CZECH} "Ostatní pøeklady dostupné k instalaci. Angliètina je defaultní."
 LangString DESC_SecEnglish ${LANG_CZECH} "Anglický pøeklad"
+LangString DESC_SecCzech ${LANG_CZECH} "Èeský pøeklad"
 LangString DESC_SecSlovak ${LANG_CZECH} "Slovenský pøeklad"
 LangString DESC_SecPlugins ${LANG_CZECH} "Ostatní doplòky dostupné k instalaci."
 LangString DESC_SecExamplePlugin ${LANG_CZECH} "Pouze ukázkový nic nedìlající doplnìk."
 LangString DESC_SecDesktop ${LANG_CZECH} "Pøidat zástupce na plochu."
-LangString DESC_SecExtensions ${LANG_CZECH} "Associovat QupZillu s .htm and .html soubory"
+LangString DESC_SecExtensions ${LANG_CZECH} "Associovat QupZillu s .htm a .html soubory"
+LangString DESC_SecThemes ${LANG_CZECH} "Dodateèná témata pro QupZillu"
 
 ;;;;Slovak
 LangString TITLE_SecMain ${LANG_SLOVAK} "Hlavné komponenty"
 LangString TITLE_SecTranslations ${LANG_SLOVAK} "Preklady"
 LangString TITLE_SecEnglish ${LANG_SLOVAK} "Angliètina"
-LangString TITLE_SecCzech ${LANG_SLOVAK} "Èe¹tina"
+LangString TITLE_SecCzech ${LANG_SLOVAK} "Èeština"
 LangString TITLE_SecSlovak ${LANG_SLOVAK} "Slovenèina"
 LangString TITLE_SecPlugins ${LANG_SLOVAK} "Doplnky"
 LangString TITLE_SecExamplePlugin ${LANG_SLOVAK} "Ukázkový doplnek"
 LangString TITLE_SecDesktop ${LANG_SLOVAK} "Zástupca na ploche"
 LangString TITLE_SecExtensions ${LANG_SLOVAK} "Asociácia souborù"
+LangString TITLE_SecThemes ${LANG_SLOVAK} "Témy"
 
 LangString FILE_Htm ${LANG_SLOVAK} "Súbor HTM"
 LangString FILE_Html ${LANG_SLOVAK} "Súbor HTML"
@@ -68,7 +73,8 @@ LangString DESC_SecSlovak ${LANG_SLOVAK} "Slovensk
 LangString DESC_SecPlugins ${LANG_SLOVAK} "Ostatné doplnky dustupne k in¹talácii"
 LangString DESC_SecExamplePlugin ${LANG_SLOVAK} "Pouze ukázkovy nic nerobiací doplnek."
 LangString DESC_SecDesktop ${LANG_SLOVAK} "Pridat zástupca na plochu."
-LangString DESC_SecExtensions ${LANG_SLOVAK} "Associovat QupZillu s .htm and .html súbory"
+LangString DESC_SecExtensions ${LANG_SLOVAK} "Associovat QupZillu s .htm a .html súbory"
+LangString DESC_SecThemes ${LANG_SLOVAK} "Dodateèné témy pre QupZillu"
 ;;;;;;;;;
 ;;;;;;;;;
 ; Unfinished translations
@@ -263,3 +269,22 @@ LangString FILE_Html ${LANG_SPANISH} "HTML File"
 LangString FILE_Html ${LANG_SWEDISH} "HTML File"
 LangString FILE_Html ${LANG_TRADCHINESE} "HTML File"
 LangString FILE_Html ${LANG_SIMPCHINESE} "HTML File"
+
+LangString TITLE_SecThemes ${LANG_DUTCH} "Themes"
+LangString TITLE_SecThemes ${LANG_FRENCH} "Themes"
+LangString TITLE_SecThemes ${LANG_GERMAN} "Themes"
+LangString TITLE_SecThemes ${LANG_KOREAN} "Themes"
+LangString TITLE_SecThemes ${LANG_RUSSIAN} "Themes"
+LangString TITLE_SecThemes ${LANG_SPANISH} "Themes"
+LangString TITLE_SecThemes ${LANG_SWEDISH} "Themes"
+LangString TITLE_SecThemes ${LANG_TRADCHINESE} "Themes"
+LangString TITLE_SecThemes ${LANG_SIMPCHINESE} "Themes"
+LangString DESC_SecThemes ${LANG_DUTCH} "Additional themes for QupZilla"
+LangString DESC_SecThemes ${LANG_FRENCH} "Additional themes for QupZilla"
+LangString DESC_SecThemes ${LANG_GERMAN} "Additional themes for QupZilla"
+LangString DESC_SecThemes ${LANG_KOREAN} "Additional themes for QupZilla"
+LangString DESC_SecThemes ${LANG_RUSSIAN} "Additional themes for QupZilla"
+LangString DESC_SecThemes ${LANG_SPANISH} "Additional themes for QupZilla"
+LangString DESC_SecThemes ${LANG_SWEDISH} "Additional themes for QupZilla"
+LangString DESC_SecThemes ${LANG_TRADCHINESE} "Additional themes for QupZilla"
+LangString DESC_SecThemes ${LANG_SIMPCHINESE} "Additional themes for QupZilla"