diff --git a/.gitignore b/.gitignore index 190c27892..8698d7ecb 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ license_template Makefile* TestPlugin-build search_* +src-* diff --git a/README b/README index b8ab36e62..bba20d1dc 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ ################################# ## QUPZILLA - WEB BROWSER ## ################################# -Version: 1.0.0-b3 +Version: 1.0.0-b4 QupZilla is new and very fast open source browser based on WebKit core http://www.webkit.org Written in Qt Framework http://qt.nokia.com diff --git a/bin/data/default/profiles/default/browsedata.db b/bin/data/default/profiles/default/browsedata.db index a720bb2c2..cb6a44b49 100644 Binary files a/bin/data/default/profiles/default/browsedata.db and b/bin/data/default/profiles/default/browsedata.db differ diff --git a/bin/locale/cs_CZ.qm b/bin/locale/cs_CZ.qm index d1d49c782..cce5bc191 100644 Binary files a/bin/locale/cs_CZ.qm and b/bin/locale/cs_CZ.qm differ diff --git a/bin/locale/sk_SK.qm b/bin/locale/sk_SK.qm index 7ab89ff10..e70173bd9 100644 Binary files a/bin/locale/sk_SK.qm and b/bin/locale/sk_SK.qm differ diff --git a/bin/themes/chrome/images/blankbutton-a.png b/bin/themes/chrome/images/blankbutton-a.png new file mode 100644 index 000000000..3e68c544a Binary files /dev/null and b/bin/themes/chrome/images/blankbutton-a.png differ diff --git a/bin/themes/chrome/images/blankbutton-h.png b/bin/themes/chrome/images/blankbutton-h.png new file mode 100644 index 000000000..d81e30b28 Binary files /dev/null and b/bin/themes/chrome/images/blankbutton-h.png differ diff --git a/bin/themes/chrome/images/flash.png b/bin/themes/chrome/images/flash.png new file mode 100644 index 000000000..590c561f3 Binary files /dev/null and b/bin/themes/chrome/images/flash.png differ diff --git a/bin/themes/chrome/images/flashstart.png b/bin/themes/chrome/images/flashstart.png new file mode 100644 index 000000000..c930ee7ae Binary files /dev/null and b/bin/themes/chrome/images/flashstart.png differ diff --git a/bin/themes/chrome/images/gotoaddress.png b/bin/themes/chrome/images/gotoaddress.png new file mode 100644 index 000000000..fdefe966b Binary files /dev/null and b/bin/themes/chrome/images/gotoaddress.png differ diff --git a/bin/themes/chrome/images/library-bg-left.png b/bin/themes/chrome/images/library-bg-left.png new file mode 100644 index 000000000..cce542d08 Binary files /dev/null and b/bin/themes/chrome/images/library-bg-left.png differ diff --git a/bin/themes/chrome/images/library-bg-top-right.png b/bin/themes/chrome/images/library-bg-top-right.png new file mode 100644 index 000000000..821f12dc1 Binary files /dev/null and b/bin/themes/chrome/images/library-bg-top-right.png differ diff --git a/bin/themes/chrome/images/library-bg-top.png b/bin/themes/chrome/images/library-bg-top.png new file mode 100644 index 000000000..ec16ad053 Binary files /dev/null and b/bin/themes/chrome/images/library-bg-top.png differ diff --git a/bin/themes/chrome/images/library-search-bg.png b/bin/themes/chrome/images/library-search-bg.png new file mode 100644 index 000000000..2f159b294 Binary files /dev/null and b/bin/themes/chrome/images/library-search-bg.png differ diff --git a/bin/themes/chrome/images/lineedit-bg.png b/bin/themes/chrome/images/lineedit-bg.png new file mode 100644 index 000000000..23bc2386f Binary files /dev/null and b/bin/themes/chrome/images/lineedit-bg.png differ diff --git a/bin/themes/chrome/images/navigation-addtab.png b/bin/themes/chrome/images/navigation-addtab.png new file mode 100644 index 000000000..b7d624580 Binary files /dev/null and b/bin/themes/chrome/images/navigation-addtab.png differ diff --git a/bin/themes/chrome/images/navigation-back.png b/bin/themes/chrome/images/navigation-back.png new file mode 100644 index 000000000..c91611b4a Binary files /dev/null and b/bin/themes/chrome/images/navigation-back.png differ diff --git a/bin/themes/chrome/images/navigation-dropdown.png b/bin/themes/chrome/images/navigation-dropdown.png new file mode 100644 index 000000000..0b9102fa8 Binary files /dev/null and b/bin/themes/chrome/images/navigation-dropdown.png differ diff --git a/bin/themes/chrome/images/navigation-forward.png b/bin/themes/chrome/images/navigation-forward.png new file mode 100644 index 000000000..6677d03b4 Binary files /dev/null and b/bin/themes/chrome/images/navigation-forward.png differ diff --git a/bin/themes/chrome/images/navigation-home.png b/bin/themes/chrome/images/navigation-home.png new file mode 100644 index 000000000..b9db2b118 Binary files /dev/null and b/bin/themes/chrome/images/navigation-home.png differ diff --git a/bin/themes/chrome/images/navigation-reload.png b/bin/themes/chrome/images/navigation-reload.png new file mode 100644 index 000000000..fbba27085 Binary files /dev/null and b/bin/themes/chrome/images/navigation-reload.png differ diff --git a/bin/themes/chrome/images/navigation-stop.png b/bin/themes/chrome/images/navigation-stop.png new file mode 100644 index 000000000..ae301d394 Binary files /dev/null and b/bin/themes/chrome/images/navigation-stop.png differ diff --git a/bin/themes/chrome/images/navigation-supermenu.png b/bin/themes/chrome/images/navigation-supermenu.png new file mode 100644 index 000000000..29dc5bafb Binary files /dev/null and b/bin/themes/chrome/images/navigation-supermenu.png differ diff --git a/bin/themes/chrome/images/rss.png b/bin/themes/chrome/images/rss.png new file mode 100644 index 000000000..d1705aa34 Binary files /dev/null and b/bin/themes/chrome/images/rss.png differ diff --git a/bin/themes/chrome/images/search-icon.png b/bin/themes/chrome/images/search-icon.png new file mode 100644 index 000000000..b0b6570e2 Binary files /dev/null and b/bin/themes/chrome/images/search-icon.png differ diff --git a/bin/themes/chrome/images/searchbar-provider-bg.png b/bin/themes/chrome/images/searchbar-provider-bg.png new file mode 100644 index 000000000..028351ab9 Binary files /dev/null and b/bin/themes/chrome/images/searchbar-provider-bg.png differ diff --git a/bin/themes/chrome/images/siteicon-bg.png b/bin/themes/chrome/images/siteicon-bg.png new file mode 100644 index 000000000..8acb87546 Binary files /dev/null and b/bin/themes/chrome/images/siteicon-bg.png differ diff --git a/bin/themes/chrome/images/siteicon-secure-bg.png b/bin/themes/chrome/images/siteicon-secure-bg.png new file mode 100644 index 000000000..b7341b093 Binary files /dev/null and b/bin/themes/chrome/images/siteicon-secure-bg.png differ diff --git a/bin/themes/chrome/images/star-a.png b/bin/themes/chrome/images/star-a.png new file mode 100644 index 000000000..aab4ff144 Binary files /dev/null and b/bin/themes/chrome/images/star-a.png differ diff --git a/bin/themes/chrome/images/star.png b/bin/themes/chrome/images/star.png new file mode 100644 index 000000000..446877249 Binary files /dev/null and b/bin/themes/chrome/images/star.png differ diff --git a/bin/themes/chrome/images/tabs-bg.png b/bin/themes/chrome/images/tabs-bg.png new file mode 100644 index 000000000..a092d832f Binary files /dev/null and b/bin/themes/chrome/images/tabs-bg.png differ diff --git a/bin/themes/chrome/images/tabs-list-button.png b/bin/themes/chrome/images/tabs-list-button.png new file mode 100644 index 000000000..d637be769 Binary files /dev/null and b/bin/themes/chrome/images/tabs-list-button.png differ diff --git a/bin/themes/chrome/images/toolbar-bg.png b/bin/themes/chrome/images/toolbar-bg.png new file mode 100644 index 000000000..7d7075275 Binary files /dev/null and b/bin/themes/chrome/images/toolbar-bg.png differ diff --git a/bin/themes/chrome/images/transp.png b/bin/themes/chrome/images/transp.png new file mode 100644 index 000000000..c55289094 Binary files /dev/null and b/bin/themes/chrome/images/transp.png differ diff --git a/bin/themes/chrome/linux.css b/bin/themes/chrome/linux.css new file mode 100644 index 000000000..fa679f67f --- /dev/null +++ b/bin/themes/chrome/linux.css @@ -0,0 +1,6 @@ +/*TabWidget*/ +#tabbar::tab +{ + max-width: 250px; + max-height: 26px; +} diff --git a/bin/themes/chrome/main.css b/bin/themes/chrome/main.css new file mode 100644 index 000000000..5de564b92 --- /dev/null +++ b/bin/themes/chrome/main.css @@ -0,0 +1,347 @@ +/************************************* + * Chrome Theme v0.1 * + * Author: nowrep * + * Based on: Firefox Chromifox Theme * + * Last updated: 08.09 2011 * + *************************************/ + +*[html-link-look="true"] +{ + color: blue; + text-decoration: underline; +} + +/*MainWindow*/ +#mainwindow +{ + background: #e4edf9 url(images/toolbar-bg.png) repeat-x; +} + +#mainwindow-menubar +{ + background-image:url(images/transp.png); + border:none; +} + +#mainwindow-menubar:item +{ + color: black; + spacing: 5px; + padding: 2px 6px; + background: transparent; +} + +#mainwindow-menubar::item:pressed +{ + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #a1c0e6, stop:1 #86abd9); + border: 1px solid #4b6e99; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + border-bottom: none; +} + +#mainwindow-statusbar +{ + background-color: #e4edf9; +} + +#mainwindow QToolBar +{ + background-image:url(images/transp.png); + border:none; +} + +#statusbar-ip-label +{ + padding-right: 5px; +} + +/*NavigationBar*/ +#navigationbar QSplitter::handle +{ + background-color:transparent; +} + +#navigation-button-back +{ + qproperty-multiIcon: url(images/navigation-back.png); +} + +#navigation-button-next +{ + qproperty-multiIcon: url(images/navigation-forward.png); +} + +#navigation-button-stop +{ + qproperty-multiIcon: url(images/navigation-stop.png); +} + +#navigation-button-reload +{ + qproperty-multiIcon: url(images/navigation-reload.png); +} + +#navigation-button-home +{ + qproperty-multiIcon: url(images/navigation-home.png); +} + +#navigation-button-addtab +{ + qproperty-multiIcon: url(images/navigation-addtab.png); +} + +#navigation-button-supermenu +{ + qproperty-multiIcon: url(images/navigation-supermenu.png); +} + +/*TabWidget*/ +#tabbar +{ + background-image: url(images/tabs-bg.png); + background-repeat: repeat-x; + height: 27px; +} + +#tabwidget::tab-bar +{ + right: 31px; +} + +#tabwidget-button-opentabs +{ + qproperty-multiIcon: url(images/tabs-list-button.png); +} + +/*LocationBar*/ +#locationbar +{ + background: transparent; + border-image: url(images/lineedit-bg.png); + border-width:4; + color:black; + padding-left: 28px; + qproperty-fixedheight: 27; +} + +#locationbar-bookmarkicon +{ + margin-bottom: 2px; + qproperty-pixmap: url(images/star.png); +} + +#locationbar-bookmarkicon[bookmarked="true"] +{ + qproperty-pixmap: url(images/star-a.png); +} + +#locationbar-siteicon +{ + border-image: url(images/siteicon-bg.png); + qproperty-fixedsize:30px 27px; + padding-left: 0px; +} + +#locationbar-siteicon[secured="true"] +{ + border-image: url(images/siteicon-secure-bg.png); +} + +#locationbar-rss-icon +{ + margin-bottom:2px; + qproperty-pixmap: url(images/rss.png); +} + +#locationbar-goicon +{ + margin-bottom:2px; + qproperty-pixmap: url(images/gotoaddress.png); +} + +#locationbar-down-icon +{ + margin-right: -4px; + margin-bottom: 1px; + qproperty-pixmap: url(images/navigation-dropdown.png); +} + +/*BookmarksToolbar*/ +#bookmarksbar QToolButton +{ + border-image: url(images/transp.png); + border-width: 1px; + padding-right: -5px; + height: 15px; +} + +#bookmarksbar QToolButton::menu-indicator +{ + background: url(images/transp.png); +} + +/*SideBar*/ +#sidebar +{ + background: transparent; +} + +/*WebSearchBar*/ +#websearchbar +{ + background: transparent; + border-image: url(images/lineedit-bg.png); + border-width:4; + color:black; + padding-left: 35px; + qproperty-fixedheight: 27; +} + +#websearchbar-searchbutton +{ + margin-bottom:2px; + margin-right: 2px; + qproperty-pixmap: url(images/search-icon.png); +} + +#websearchbar-searchprovider-comobobox +{ + border-image: url(images/searchbar-provider-bg.png); + padding-left:-8px; + qproperty-fixedsize: 37px 27px; +} + +#websearchbar-searchprovider-comobobox::menu-indicator +{ + background: url(images/transp.png); +} + +/*SourceViewer*/ +#sourceviewer-textedit +{ + border:none; +} + +/*SourceViewerSearch*/ +SourceViewerSearch #lineEdit[notfound="true"] +{ + background:#ff6666; +} + +/*SearchToolbar*/ +SearchToolBar #lineEdit[notfound="true"] +{ + background:#ff6666; +} + +/*Click2Flash*/ +#click2flash-frame +{ + border: 1px solid #e8e8e8; +} + +#click2flash-toolbutton +{ + background: url(images/flash.png) no-repeat; + background-position: center; + border: none; +} + +#click2flash-toolbutton:hover +{ + background: url(images/flashstart.png) no-repeat; + background-position: center; + border:none; +} + +/*RSSManager*/ +#rssmanager-frame +{ + background: white; +} + +RSSManager QTabBar::tab +{ + max-width:100px; +} + +/*AboutDialog*/ +AboutDialog #label +{ + background:white; +} + +AboutDialog #textBrowser +{ + border:none; +} + +/*DesktopNotification*/ +DesktopNotification +{ + background: transparent; +} +DesktopNotification #frame +{ + border: 2px solid darkblue; + border-radius: 20px; + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #e4ecf1, stop:1 #d3e5f1); +} + +DesktopNotification #heading +{ + font: bold; + font-size: 13pt; +} + +/*BrowsingLibrary*/ +BrowsingLibrary #tabs +{ + qproperty-bgPixmap: url(images/library-bg-left.png); +} + +BrowsingLibrary #frame +{ + background: url(images/library-bg-top.png) no-repeat; +} + +BrowsingLibrary #frame_2 +{ + background: url(images/library-bg-top-right.png); +} + +BrowsingLibrary #searchLine +{ + background: transparent; + border-image: url(images/library-search-bg.png); + border-width:4; + color:black; +} + +/*Downloads*/ +DownloadItem #fileName +{ + font-size: 13pt; +} + +DownloadManager #list +{ + border: none; +} + +/*JavaScript Dialogs*/ +QFrame[js-frame="true"] +{ + border: 1px solid black; + border-bottom: 0px; + background-color: white; +} + +QFrame[js-frame2="true"] +{ + border: 1px solid black; + border-top: 0px; + background-color: #f3f3f3; +} diff --git a/bin/themes/chrome/theme.info b/bin/themes/chrome/theme.info new file mode 100644 index 000000000..fb4776ed1 --- /dev/null +++ b/bin/themes/chrome/theme.info @@ -0,0 +1,4 @@ +Name: Chrome +Author: nowrep +Short Description: Chrome like theme +Long Description: Chrome like theme for QupZilla based on Firefox Chromifox theme diff --git a/bin/themes/chrome/theme.png b/bin/themes/chrome/theme.png new file mode 100644 index 000000000..033afecca Binary files /dev/null and b/bin/themes/chrome/theme.png differ diff --git a/bin/themes/chrome/windows.css b/bin/themes/chrome/windows.css new file mode 100644 index 000000000..238e7160f --- /dev/null +++ b/bin/themes/chrome/windows.css @@ -0,0 +1,6 @@ +/*TabWidget*/ +#tabbar::tab +{ + max-width: 250px; + height: 26px; +} diff --git a/bin/themes/default/images/arrow-down.gif b/bin/themes/default/images/arrow-down.gif new file mode 100644 index 000000000..e4588a9b5 Binary files /dev/null and b/bin/themes/default/images/arrow-down.gif differ diff --git a/bin/themes/default/images/background.png b/bin/themes/default/images/background.png new file mode 100644 index 000000000..5678d984a Binary files /dev/null and b/bin/themes/default/images/background.png differ diff --git a/bin/themes/default/images/flash.png b/bin/themes/default/images/flash.png new file mode 100644 index 000000000..590c561f3 Binary files /dev/null and b/bin/themes/default/images/flash.png differ diff --git a/bin/themes/default/images/flashstart.png b/bin/themes/default/images/flashstart.png new file mode 100644 index 000000000..c930ee7ae Binary files /dev/null and b/bin/themes/default/images/flashstart.png differ diff --git a/bin/themes/default/images/gotoaddress.png b/bin/themes/default/images/gotoaddress.png new file mode 100644 index 000000000..fdefe966b Binary files /dev/null and b/bin/themes/default/images/gotoaddress.png differ diff --git a/bin/themes/default/images/library-bg-left.png b/bin/themes/default/images/library-bg-left.png new file mode 100644 index 000000000..cce542d08 Binary files /dev/null and b/bin/themes/default/images/library-bg-left.png differ diff --git a/bin/themes/default/images/library-bg-top-right.png b/bin/themes/default/images/library-bg-top-right.png new file mode 100644 index 000000000..821f12dc1 Binary files /dev/null and b/bin/themes/default/images/library-bg-top-right.png differ diff --git a/bin/themes/default/images/library-bg-top.png b/bin/themes/default/images/library-bg-top.png new file mode 100644 index 000000000..ec16ad053 Binary files /dev/null and b/bin/themes/default/images/library-bg-top.png differ diff --git a/bin/themes/default/images/lineedit-bg.png b/bin/themes/default/images/lineedit-bg.png new file mode 100644 index 000000000..2f159b294 Binary files /dev/null and b/bin/themes/default/images/lineedit-bg.png differ diff --git a/bin/themes/default/images/navigation-addtab.png b/bin/themes/default/images/navigation-addtab.png new file mode 100644 index 000000000..61d25953c Binary files /dev/null and b/bin/themes/default/images/navigation-addtab.png differ diff --git a/bin/themes/default/images/navigation-back.png b/bin/themes/default/images/navigation-back.png new file mode 100644 index 000000000..d61837ffb Binary files /dev/null and b/bin/themes/default/images/navigation-back.png differ diff --git a/bin/themes/default/images/navigation-forward.png b/bin/themes/default/images/navigation-forward.png new file mode 100644 index 000000000..e42c86900 Binary files /dev/null and b/bin/themes/default/images/navigation-forward.png differ diff --git a/bin/themes/default/images/navigation-home.png b/bin/themes/default/images/navigation-home.png new file mode 100644 index 000000000..9d62109aa Binary files /dev/null and b/bin/themes/default/images/navigation-home.png differ diff --git a/bin/themes/default/images/navigation-reload.png b/bin/themes/default/images/navigation-reload.png new file mode 100644 index 000000000..318bb1839 Binary files /dev/null and b/bin/themes/default/images/navigation-reload.png differ diff --git a/bin/themes/default/images/navigation-stop.png b/bin/themes/default/images/navigation-stop.png new file mode 100644 index 000000000..dfc76e3af Binary files /dev/null and b/bin/themes/default/images/navigation-stop.png differ diff --git a/bin/themes/default/images/navigation-supmenu.png b/bin/themes/default/images/navigation-supmenu.png new file mode 100644 index 000000000..7ab68d53b Binary files /dev/null and b/bin/themes/default/images/navigation-supmenu.png differ diff --git a/bin/themes/default/images/rss.png b/bin/themes/default/images/rss.png new file mode 100644 index 000000000..d1705aa34 Binary files /dev/null and b/bin/themes/default/images/rss.png differ diff --git a/bin/themes/default/images/search.png b/bin/themes/default/images/search.png new file mode 100644 index 000000000..5365b6c6f Binary files /dev/null and b/bin/themes/default/images/search.png differ diff --git a/bin/themes/default/images/siteicon-bg-secure.png b/bin/themes/default/images/siteicon-bg-secure.png new file mode 100644 index 000000000..55f20311f Binary files /dev/null and b/bin/themes/default/images/siteicon-bg-secure.png differ diff --git a/bin/themes/default/images/siteicon-bg.png b/bin/themes/default/images/siteicon-bg.png new file mode 100644 index 000000000..8a53ff74c Binary files /dev/null and b/bin/themes/default/images/siteicon-bg.png differ diff --git a/bin/themes/default/images/star.png b/bin/themes/default/images/star.png new file mode 100644 index 000000000..c11a61445 Binary files /dev/null and b/bin/themes/default/images/star.png differ diff --git a/bin/themes/default/images/starg.png b/bin/themes/default/images/starg.png new file mode 100644 index 000000000..9f7a8db52 Binary files /dev/null and b/bin/themes/default/images/starg.png differ diff --git a/bin/themes/default/images/tabs-list-button.png b/bin/themes/default/images/tabs-list-button.png new file mode 100644 index 000000000..aa2bdfa0f Binary files /dev/null and b/bin/themes/default/images/tabs-list-button.png differ diff --git a/bin/themes/default/images/transp.png b/bin/themes/default/images/transp.png new file mode 100644 index 000000000..c55289094 Binary files /dev/null and b/bin/themes/default/images/transp.png differ diff --git a/bin/themes/default/main.css b/bin/themes/default/main.css new file mode 100644 index 000000000..7848f712b --- /dev/null +++ b/bin/themes/default/main.css @@ -0,0 +1,344 @@ +/**************************** + * Default Theme v0.1 * + * Author: nowrep * + * Last updated: 31.08 2011 * + ****************************/ + +*[html-link-look="true"] +{ + color: blue; + text-decoration: underline; +} + +/*MainWindow*/ +#mainwindow +{ + background-image: url(images/background.png); + background-position: top right; + background-repeat: no-repeat; + background-color: #e4eefa; +} + +#mainwindow-menubar +{ + background-image:url(images/transp.png); + border:none; +} + +#mainwindow-menubar:item +{ + color: black; + spacing: 5px; + padding: 2px 6px; + background: transparent; +} + +#mainwindow-menubar::item:pressed +{ + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 lightgray, stop:1 darkgray); + border: 1px solid darkgrey; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + border-bottom: none; +} + +#mainwindow-statusbar +{ + background-image:url(images/transp.png); + border:none; +} + +#statusbar-ip-label +{ + color:*USER-TEXT-COLOR*; + padding-right: 5px; +} + +/*NavigationBar*/ +#navigationbar QSplitter::handle +{ + background-color:transparent; +} + +#navigation-button-back +{ + qproperty-icon: url(images/navigation-back.png); +} + +#navigation-button-next +{ + qproperty-icon: url(images/navigation-forward.png); +} + +#navigation-button-stop +{ + qproperty-icon: url(images/navigation-stop.png); +} + +#navigation-button-reload +{ + qproperty-icon: url(images/navigation-reload.png); +} + +#navigation-button-home +{ + qproperty-icon: url(images/navigation-home.png); +} + +#navigation-button-addtab +{ + qproperty-icon: url(images/navigation-addtab.png); +} + +#navigation-button-supermenu +{ + qproperty-icon: url(images/navigation-supmenu.png); +} + +/*TabWidget*/ +#tabbar::tab +{ + max-width:250px; + max-height: 28px; +} + +#tabwidget-button-opentabs +{ + qproperty-icon: url(images/tabs-list-button.png); + qproperty-fixedsize: 20px 27px; +} + +#tabwidget-button-opentabs::menu-indicator +{ + background: url(images/transp.png); +} + +/*LocationBar*/ +#locationbar +{ + background: transparent; + border-image: url(images/lineedit-bg.png); + border-width:4; + color:black; + padding-left: 33px; + qproperty-fixedheight: 25; +} + +#locationbar-bookmarkicon +{ + margin-bottom: 2px; + qproperty-pixmap: url(images/starg.png); +} + +#locationbar-bookmarkicon[bookmarked="true"] +{ + qproperty-pixmap: url(images/star.png); +} + +#locationbar-siteicon +{ + border-image: url(images/siteicon-bg.png); + margin-left:2px; + qproperty-fixedsize:35px 25px; +} + +#locationbar-siteicon[secured="true"] +{ + border-image: url(images/siteicon-bg-secure.png); +} + +#locationbar-rss-icon +{ + margin-bottom:2px; + qproperty-pixmap: url(images/rss.png); +} + +#locationbar-goicon +{ + margin-bottom:2px; + qproperty-pixmap: url(images/gotoaddress.png); +} + +#locationbar-down-icon +{ + qproperty-pixmap: url(images/arrow-down.gif); +} + +/*WebSearchBar*/ +#websearchbar +{ + background: transparent; + border-image: url(images/lineedit-bg.png); + border-width:4; + color:black; + padding-left: 33px; + qproperty-fixedheight: 25; +} + +#websearchbar-searchbutton +{ + margin-bottom:2px; + qproperty-pixmap: url(images/search.png); +} + +#websearchbar-searchprovider-comobobox +{ + border-image: url(images/siteicon-bg.png); + padding-left:-6px; + margin-left:2px; + qproperty-fixedsize: 35px 25px; +} + +#websearchbar-searchprovider-comobobox::menu-indicator +{ + background-image: url(images/arrow-down.gif); + background-repeat: no-repeat; +} + +/*BookmarksToolbar*/ +#bookmarksbar QToolButton +{ + border-image: url(images/transp.png); + border-width: 1px; + padding-right: -5px; + height: 15px; +} + +#bookmarksbar QToolButton::menu-indicator +{ + background: url(images/transp.png); +} + +/*SideBar*/ +#sidebar +{ + background: transparent; +} + +/*SourceViewer*/ +#sourceviewer-textedit +{ + border:none; +} + +/*SourceViewerSearch*/ +SourceViewerSearch #lineEdit[notfound="true"] +{ + background:#ff6666; +} + +/*SearchToolbar*/ +SearchToolBar #lineEdit[notfound="true"] +{ + background:#ff6666; +} + +/*Click2Flash*/ +#click2flash-frame +{ + border: 1px solid #e8e8e8; +} + +#click2flash-toolbutton +{ + background: url(images/flash.png) no-repeat; + background-position: center; + border: none; +} + +#click2flash-toolbutton:hover +{ + background: url(images/flashstart.png) no-repeat; + background-position: center; + border:none; +} + +/*RSSManager*/ +#rssmanager-frame +{ + background: white; +} + +RSSManager QTabBar::tab +{ + max-width:100px; +} + +/*AboutDialog*/ +AboutDialog #label +{ + background:white; +} + +AboutDialog #textBrowser +{ + border:none; +} + +/*DesktopNotification*/ +DesktopNotification +{ + background: transparent; +} +DesktopNotification #frame +{ + border: 2px solid darkblue; + border-radius: 20px; + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #e4ecf1, stop:1 #d3e5f1); +} + +DesktopNotification #heading +{ + font: bold; + font-size: 13pt; +} + +/*BrowsingLibrary*/ +BrowsingLibrary #tabs +{ + qproperty-bgPixmap: url(images/library-bg-left.png); +} + +BrowsingLibrary #frame +{ + background: url(images/library-bg-top.png) no-repeat; +} + +BrowsingLibrary #frame_2 +{ + background: url(images/library-bg-top-right.png); +} + +BrowsingLibrary #searchLine +{ + background: transparent; + border-image: url(images/lineedit-bg.png); + border-width:4; + color:black; +} + +/*Downloads*/ +DownloadItem #fileName +{ + font-size: 13pt; +} + +DownloadManager #list +{ + border: none; +} + +/*JavaScript Dialogs*/ +QFrame[js-frame="true"] +{ + border: 1px solid black; + border-bottom: 0px; + background-color: white; +} + +QFrame[js-frame2="true"] +{ + border: 1px solid black; + border-top: 0px; + background-color: #f3f3f3; +} diff --git a/bin/themes/default/theme.info b/bin/themes/default/theme.info new file mode 100644 index 000000000..e0f33f8bc --- /dev/null +++ b/bin/themes/default/theme.info @@ -0,0 +1,4 @@ +Name: Old Default +Author: nowrep +Short Description: Old standard theme +Long Description: This theme was the only theme available in QupZilla until 1.0.0-beta4 diff --git a/bin/themes/default/theme.png b/bin/themes/default/theme.png new file mode 100644 index 000000000..abc47217f Binary files /dev/null and b/bin/themes/default/theme.png differ diff --git a/bin/themes/default2/images/flash.png b/bin/themes/default2/images/flash.png new file mode 100644 index 000000000..590c561f3 Binary files /dev/null and b/bin/themes/default2/images/flash.png differ diff --git a/bin/themes/default2/images/flashstart.png b/bin/themes/default2/images/flashstart.png new file mode 100644 index 000000000..c930ee7ae Binary files /dev/null and b/bin/themes/default2/images/flashstart.png differ diff --git a/bin/themes/default2/images/gotoaddress.png b/bin/themes/default2/images/gotoaddress.png new file mode 100644 index 000000000..fdefe966b Binary files /dev/null and b/bin/themes/default2/images/gotoaddress.png differ diff --git a/bin/themes/default2/images/library-bg-top-right.png b/bin/themes/default2/images/library-bg-top-right.png new file mode 100644 index 000000000..821f12dc1 Binary files /dev/null and b/bin/themes/default2/images/library-bg-top-right.png differ diff --git a/bin/themes/default2/images/library-bg-top.png b/bin/themes/default2/images/library-bg-top.png new file mode 100644 index 000000000..ec16ad053 Binary files /dev/null and b/bin/themes/default2/images/library-bg-top.png differ diff --git a/bin/themes/default2/images/library-search-bg.png b/bin/themes/default2/images/library-search-bg.png new file mode 100644 index 000000000..2f159b294 Binary files /dev/null and b/bin/themes/default2/images/library-search-bg.png differ diff --git a/bin/themes/default2/images/navigation-dropdown.png b/bin/themes/default2/images/navigation-dropdown.png new file mode 100644 index 000000000..0b9102fa8 Binary files /dev/null and b/bin/themes/default2/images/navigation-dropdown.png differ diff --git a/bin/themes/default2/images/rss.png b/bin/themes/default2/images/rss.png new file mode 100644 index 000000000..d1705aa34 Binary files /dev/null and b/bin/themes/default2/images/rss.png differ diff --git a/bin/themes/default2/images/search-icon.png b/bin/themes/default2/images/search-icon.png new file mode 100644 index 000000000..b0b6570e2 Binary files /dev/null and b/bin/themes/default2/images/search-icon.png differ diff --git a/bin/themes/default2/images/star-a.png b/bin/themes/default2/images/star-a.png new file mode 100644 index 000000000..aab4ff144 Binary files /dev/null and b/bin/themes/default2/images/star-a.png differ diff --git a/bin/themes/default2/images/star.png b/bin/themes/default2/images/star.png new file mode 100644 index 000000000..446877249 Binary files /dev/null and b/bin/themes/default2/images/star.png differ diff --git a/bin/themes/default2/images/tabs-list-button.png b/bin/themes/default2/images/tabs-list-button.png new file mode 100644 index 000000000..aa2bdfa0f Binary files /dev/null and b/bin/themes/default2/images/tabs-list-button.png differ diff --git a/bin/themes/default2/images/transp.png b/bin/themes/default2/images/transp.png new file mode 100644 index 000000000..c55289094 Binary files /dev/null and b/bin/themes/default2/images/transp.png differ diff --git a/bin/themes/default2/main.css b/bin/themes/default2/main.css new file mode 100644 index 000000000..8e1d8547a --- /dev/null +++ b/bin/themes/default2/main.css @@ -0,0 +1,291 @@ +/************************************* + * Default Theme v0.1 * + * Author: nowrep * + * Based on: Firefox Chromifox Theme * + * Last updated: 08.09 2011 * + *************************************/ + +*[html-link-look="true"] +{ + color: blue; + text-decoration: underline; +} + +/*MainWindow*/ +#statusbar-ip-label +{ + padding-right: 5px; +} + +/*NavigationBar*/ +#navigation-button-back +{ + qproperty-themeIcon: "go-previous"; +} + +#navigation-button-next +{ + qproperty-themeIcon: "go-next"; +} + +#navigation-button-stop +{ + qproperty-themeIcon: "process-stop"; +} + +#navigation-button-reload +{ + qproperty-themeIcon: "view-refresh"; +} + +#navigation-button-home +{ + qproperty-themeIcon: "go-home"; +} + +#navigation-button-addtab +{ + qproperty-themeIcon: "list-add"; +} + +#navigation-button-supermenu +{ + qproperty-themeIcon: "preferences-desktop"; +} + +/*TabWidget*/ +#tabbar::tab +{ + max-width:250px; + height: 26px; +} + +#tabwidget::tab-bar +{ + right: 20px; +} + +#tabwidget-button-opentabs +{ + qproperty-icon: url(images/tabs-list-button.png); + qproperty-fixedsize: 20px 27px; +} + +#tabwidget-button-opentabs::menu-indicator +{ + background: url(images/transp.png); +} + +#tabbar +{ + min-height: 27px; + max-height: 27px; +} + +/*LocationBar*/ +#locationbar +{ + background: transparent; + border-width:4; + color:black; + padding-left: 22px; + qproperty-fixedheight: 27; +} + +#locationbar-bookmarkicon +{ + margin-bottom: 2px; + qproperty-pixmap: url(images/star.png); +} + +#locationbar-bookmarkicon[bookmarked="true"] +{ + qproperty-pixmap: url(images/star-a.png); +} + +#locationbar-siteicon +{ + border-image: url(images/transp.png); + qproperty-fixedsize:30px 27px; + padding-left: 0px; +} + +#locationbar-rss-icon +{ + margin-bottom:2px; + qproperty-pixmap: url(images/rss.png); +} + +#locationbar-goicon +{ + margin-bottom:2px; + qproperty-pixmap: url(images/gotoaddress.png); +} + +#locationbar-down-icon +{ + margin-right: -4px; + margin-bottom: 1px; + qproperty-pixmap: url(images/navigation-dropdown.png); +} + +/*BookmarksToolbar*/ +#bookmarksbar QToolButton +{ + border-image: url(images/transp.png); + border-width: 1px; + padding-right: -5px; + height: 15px; +} + +#bookmarksbar QToolButton::menu-indicator +{ + background: url(images/transp.png); +} + +/*WebSearchBar*/ +#websearchbar +{ + background: transparent; + border-width:4; + color:black; + padding-left: 30px; + qproperty-fixedheight: 27; +} + +#websearchbar-searchbutton +{ + margin-bottom:2px; + margin-right: 2px; + qproperty-pixmap: url(images/search-icon.png); +} + +#websearchbar-searchprovider-comobobox +{ + border-image: url(images/transp.png); + padding-left:-8px; + qproperty-fixedsize: 37px 27px; +} + +/*SourceViewer*/ +#sourceviewer-textedit +{ + border:none; +} + +/*SourceViewerSearch*/ +SourceViewerSearch #lineEdit[notfound="true"] +{ + background:#ff6666; +} + +/*SearchToolbar*/ +SearchToolBar #lineEdit[notfound="true"] +{ + background:#ff6666; +} + +/*Click2Flash*/ +#click2flash-frame +{ + border: 1px solid #e8e8e8; +} + +#click2flash-toolbutton +{ + background: url(images/flash.png) no-repeat; + background-position: center; + border: none; +} + +#click2flash-toolbutton:hover +{ + background: url(images/flashstart.png) no-repeat; + background-position: center; + border:none; +} + +/*RSSManager*/ +#rssmanager-frame +{ + background: white; +} + +RSSManager QTabBar::tab +{ + max-width:100px; +} + +/*AboutDialog*/ +AboutDialog #label +{ + background:white; +} + +AboutDialog #textBrowser +{ + border:none; +} + +/*DesktopNotification*/ +DesktopNotification +{ + background: transparent; +} +DesktopNotification #frame +{ + border: 2px solid darkblue; + border-radius: 20px; + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #e4ecf1, stop:1 #d3e5f1); +} + +DesktopNotification #heading +{ + font: bold; + font-size: 13pt; +} + +/*BrowsingLibrary*/ +BrowsingLibrary #frame +{ + background: url(images/library-bg-top.png) no-repeat; +} + +BrowsingLibrary #frame_2 +{ + background: url(images/library-bg-top-right.png); +} + +BrowsingLibrary #searchLine +{ + background: transparent; + border-image: url(images/library-search-bg.png); + border-width:4; + color:black; +} + +/*Downloads*/ +DownloadItem #fileName +{ + font-size: 13pt; +} + +DownloadManager #list +{ + border: none; +} + +/*JavaScript Dialogs*/ +QFrame[js-frame="true"] +{ + border: 1px solid black; + border-bottom: 0px; + background-color: white; +} + +QFrame[js-frame2="true"] +{ + border: 1px solid black; + border-top: 0px; + background-color: #f3f3f3; +} diff --git a/bin/themes/default2/theme.info b/bin/themes/default2/theme.info new file mode 100644 index 000000000..ca3e885bf --- /dev/null +++ b/bin/themes/default2/theme.info @@ -0,0 +1,4 @@ +Name: Gnome Default +Author: nowrep +Short Description: Default theme +Long Description: Default theme for Gnome Desktop diff --git a/bin/themes/default2/theme.png b/bin/themes/default2/theme.png new file mode 100644 index 000000000..8f01da48f Binary files /dev/null and b/bin/themes/default2/theme.png differ diff --git a/bin/themes/linux/images/flash.png b/bin/themes/linux/images/flash.png new file mode 100644 index 000000000..590c561f3 Binary files /dev/null and b/bin/themes/linux/images/flash.png differ diff --git a/bin/themes/linux/images/flashstart.png b/bin/themes/linux/images/flashstart.png new file mode 100644 index 000000000..c930ee7ae Binary files /dev/null and b/bin/themes/linux/images/flashstart.png differ diff --git a/bin/themes/linux/images/gotoaddress.png b/bin/themes/linux/images/gotoaddress.png new file mode 100644 index 000000000..fdefe966b Binary files /dev/null and b/bin/themes/linux/images/gotoaddress.png differ diff --git a/bin/themes/linux/images/library-bg-left.png b/bin/themes/linux/images/library-bg-left.png new file mode 100644 index 000000000..cce542d08 Binary files /dev/null and b/bin/themes/linux/images/library-bg-left.png differ diff --git a/bin/themes/linux/images/library-bg-top-right.png b/bin/themes/linux/images/library-bg-top-right.png new file mode 100644 index 000000000..821f12dc1 Binary files /dev/null and b/bin/themes/linux/images/library-bg-top-right.png differ diff --git a/bin/themes/linux/images/library-bg-top.png b/bin/themes/linux/images/library-bg-top.png new file mode 100644 index 000000000..ec16ad053 Binary files /dev/null and b/bin/themes/linux/images/library-bg-top.png differ diff --git a/bin/themes/linux/images/library-search-bg.png b/bin/themes/linux/images/library-search-bg.png new file mode 100644 index 000000000..2f159b294 Binary files /dev/null and b/bin/themes/linux/images/library-search-bg.png differ diff --git a/bin/themes/linux/images/navigation-dropdown.png b/bin/themes/linux/images/navigation-dropdown.png new file mode 100644 index 000000000..0b9102fa8 Binary files /dev/null and b/bin/themes/linux/images/navigation-dropdown.png differ diff --git a/bin/themes/linux/images/rss.png b/bin/themes/linux/images/rss.png new file mode 100644 index 000000000..d1705aa34 Binary files /dev/null and b/bin/themes/linux/images/rss.png differ diff --git a/bin/themes/linux/images/search-icon.png b/bin/themes/linux/images/search-icon.png new file mode 100644 index 000000000..b0b6570e2 Binary files /dev/null and b/bin/themes/linux/images/search-icon.png differ diff --git a/bin/themes/linux/images/star-a.png b/bin/themes/linux/images/star-a.png new file mode 100644 index 000000000..aab4ff144 Binary files /dev/null and b/bin/themes/linux/images/star-a.png differ diff --git a/bin/themes/linux/images/star.png b/bin/themes/linux/images/star.png new file mode 100644 index 000000000..446877249 Binary files /dev/null and b/bin/themes/linux/images/star.png differ diff --git a/bin/themes/linux/images/tabs-list-button.png b/bin/themes/linux/images/tabs-list-button.png new file mode 100644 index 000000000..aa2bdfa0f Binary files /dev/null and b/bin/themes/linux/images/tabs-list-button.png differ diff --git a/bin/themes/linux/images/transp.png b/bin/themes/linux/images/transp.png new file mode 100644 index 000000000..c55289094 Binary files /dev/null and b/bin/themes/linux/images/transp.png differ diff --git a/bin/themes/linux/main.css b/bin/themes/linux/main.css new file mode 100644 index 000000000..1d47801c8 --- /dev/null +++ b/bin/themes/linux/main.css @@ -0,0 +1,306 @@ +/************************************* + * Default Theme v0.1 * + * Author: nowrep * + * Based on: Firefox Chromifox Theme * + * Last updated: 08.09 2011 * + *************************************/ + +*[html-link-look="true"] +{ + color: blue; + text-decoration: underline; +} + +/*MainWindow*/ +#mainwindow-menubar:item +{ + color: black; +} + +#statusbar-ip-label +{ + padding-right: 5px; +} + +/*NavigationBar*/ +#navigation-button-back +{ + qproperty-themeIcon: "go-previous"; +} + +#navigation-button-next +{ + qproperty-themeIcon: "go-next"; +} + +#navigation-button-stop +{ + qproperty-themeIcon: "process-stop"; +} + +#navigation-button-reload +{ + qproperty-themeIcon: "view-refresh"; +} + +#navigation-button-home +{ + qproperty-themeIcon: "go-home"; +} + +#navigation-button-addtab +{ + qproperty-themeIcon: "list-add"; +} + +#navigation-button-supermenu +{ + qproperty-themeIcon: "preferences-desktop"; +} + +/*TabWidget*/ +#tabbar::tab +{ + max-width:250px; + max-height: 26px; +} + +#tabwidget::tab-bar +{ + right: 20px; +} + +#tabwidget-button-opentabs +{ + qproperty-icon: url(images/tabs-list-button.png); + qproperty-fixedsize: 20px 27px; +} + +#tabwidget-button-opentabs::menu-indicator +{ + background: url(images/transp.png); +} + +#tabbar +{ + height: 27px; +} + +/*LocationBar*/ +#locationbar +{ + background: transparent; + border-width:4; + color:black; + padding-left: 22px; + qproperty-fixedheight: 27; +} + +#locationbar-bookmarkicon +{ + margin-bottom: 2px; + qproperty-pixmap: url(images/star.png); +} + +#locationbar-bookmarkicon[bookmarked="true"] +{ + qproperty-pixmap: url(images/star-a.png); +} + +#locationbar-siteicon +{ + border-image: url(images/transp.png); + qproperty-fixedsize:30px 27px; + padding-left: 0px; +} + +#locationbar-rss-icon +{ + margin-bottom:2px; + qproperty-pixmap: url(images/rss.png); +} + +#locationbar-goicon +{ + margin-bottom:2px; + qproperty-pixmap: url(images/gotoaddress.png); +} + +#locationbar-down-icon +{ + margin-right: -4px; + margin-bottom: 1px; + qproperty-pixmap: url(images/navigation-dropdown.png); +} + +/*BookmarksToolbar*/ +#bookmarksbar QToolButton +{ + border-image: url(images/transp.png); + border-width: 1px; + padding-right: -5px; + height: 15px; +} + +#bookmarksbar QToolButton::menu-indicator +{ + background: url(images/transp.png); +} + +/*SideBar*/ +#sidebar +{ + background: transparent; +} + +/*WebSearchBar*/ +#websearchbar +{ + background: transparent; + border-width:4; + color:black; + padding-left: 30px; + qproperty-fixedheight: 27; +} + +#websearchbar-searchbutton +{ + margin-bottom:2px; + margin-right: 2px; + qproperty-pixmap: url(images/search-icon.png); +} + +#websearchbar-searchprovider-comobobox +{ + border-image: url(images/transp.png); + padding-left:-8px; + qproperty-fixedsize: 37px 27px; +} + +/*SourceViewer*/ +#sourceviewer-textedit +{ + border:none; +} + +/*SourceViewerSearch*/ +SourceViewerSearch #lineEdit[notfound="true"] +{ + background:#ff6666; +} + +/*SearchToolbar*/ +SearchToolBar #lineEdit[notfound="true"] +{ + background:#ff6666; +} + +/*Click2Flash*/ +#click2flash-frame +{ + border: 1px solid #e8e8e8; +} + +#click2flash-toolbutton +{ + background: url(images/flash.png) no-repeat; + background-position: center; + border: none; +} + +#click2flash-toolbutton:hover +{ + background: url(images/flashstart.png) no-repeat; + background-position: center; + border:none; +} + +/*RSSManager*/ +#rssmanager-frame +{ + background: white; +} + +RSSManager QTabBar::tab +{ + max-width:100px; +} + +/*AboutDialog*/ +AboutDialog #label +{ + background:white; +} + +AboutDialog #textBrowser +{ + border:none; +} + +/*DesktopNotification*/ +DesktopNotification +{ + background: transparent; +} +DesktopNotification #frame +{ + border: 2px solid darkblue; + border-radius: 20px; + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #e4ecf1, stop:1 #d3e5f1); +} + +DesktopNotification #heading +{ + font: bold; + font-size: 13pt; +} + +/*BrowsingLibrary*/ +BrowsingLibrary #tabs +{ + qproperty-bgPixmap: url(images/library-bg-left.png); +} + +BrowsingLibrary #frame +{ + background: url(images/library-bg-top.png) no-repeat; +} + +BrowsingLibrary #frame_2 +{ + background: url(images/library-bg-top-right.png); +} + +BrowsingLibrary #searchLine +{ + background: transparent; + border-image: url(images/library-search-bg.png); + border-width:4; + color:black; +} + +/*Downloads*/ +DownloadItem #fileName +{ + font-size: 13pt; +} + +DownloadManager #list +{ + border: none; +} + +/*JavaScript Dialogs*/ +QFrame[js-frame="true"] +{ + border: 1px solid black; + border-bottom: 0px; + background-color: white; +} + +QFrame[js-frame2="true"] +{ + border: 1px solid black; + border-top: 0px; + background-color: #f3f3f3; +} diff --git a/bin/themes/linux/theme.info b/bin/themes/linux/theme.info new file mode 100644 index 000000000..9a69e9461 --- /dev/null +++ b/bin/themes/linux/theme.info @@ -0,0 +1,4 @@ +Name: Linux Default +Author: nowrep +Short Description: Linux theme +Long Description: Default simple theme for Linux using native widget style and some basic icons from desktop icon set diff --git a/bin/themes/linux/theme.png b/bin/themes/linux/theme.png new file mode 100644 index 000000000..9c8eeb84a Binary files /dev/null and b/bin/themes/linux/theme.png differ diff --git a/bin/themes/mac/images/feed-icon.png b/bin/themes/mac/images/feed-icon.png new file mode 100644 index 000000000..ec787ac3a Binary files /dev/null and b/bin/themes/mac/images/feed-icon.png differ diff --git a/bin/themes/mac/images/flash.png b/bin/themes/mac/images/flash.png new file mode 100644 index 000000000..590c561f3 Binary files /dev/null and b/bin/themes/mac/images/flash.png differ diff --git a/bin/themes/mac/images/flashstart.png b/bin/themes/mac/images/flashstart.png new file mode 100644 index 000000000..c930ee7ae Binary files /dev/null and b/bin/themes/mac/images/flashstart.png differ diff --git a/bin/themes/mac/images/gotoaddress.png b/bin/themes/mac/images/gotoaddress.png new file mode 100644 index 000000000..fdefe966b Binary files /dev/null and b/bin/themes/mac/images/gotoaddress.png differ diff --git a/bin/themes/mac/images/library-bg-left.png b/bin/themes/mac/images/library-bg-left.png new file mode 100644 index 000000000..cce542d08 Binary files /dev/null and b/bin/themes/mac/images/library-bg-left.png differ diff --git a/bin/themes/mac/images/library-bg-top-right.png b/bin/themes/mac/images/library-bg-top-right.png new file mode 100644 index 000000000..821f12dc1 Binary files /dev/null and b/bin/themes/mac/images/library-bg-top-right.png differ diff --git a/bin/themes/mac/images/library-bg-top.png b/bin/themes/mac/images/library-bg-top.png new file mode 100644 index 000000000..ec16ad053 Binary files /dev/null and b/bin/themes/mac/images/library-bg-top.png differ diff --git a/bin/themes/mac/images/library-search-bg.png b/bin/themes/mac/images/library-search-bg.png new file mode 100644 index 000000000..2f159b294 Binary files /dev/null and b/bin/themes/mac/images/library-search-bg.png differ diff --git a/bin/themes/mac/images/lineedit-bg.png b/bin/themes/mac/images/lineedit-bg.png new file mode 100644 index 000000000..7236277ef Binary files /dev/null and b/bin/themes/mac/images/lineedit-bg.png differ diff --git a/bin/themes/mac/images/navigation-addtab.png b/bin/themes/mac/images/navigation-addtab.png new file mode 100644 index 000000000..74ebd9000 Binary files /dev/null and b/bin/themes/mac/images/navigation-addtab.png differ diff --git a/bin/themes/mac/images/navigation-back.png b/bin/themes/mac/images/navigation-back.png new file mode 100644 index 000000000..dae844820 Binary files /dev/null and b/bin/themes/mac/images/navigation-back.png differ diff --git a/bin/themes/mac/images/navigation-dropdown.png b/bin/themes/mac/images/navigation-dropdown.png new file mode 100644 index 000000000..89674fa3b Binary files /dev/null and b/bin/themes/mac/images/navigation-dropdown.png differ diff --git a/bin/themes/mac/images/navigation-forward.png b/bin/themes/mac/images/navigation-forward.png new file mode 100644 index 000000000..dd3d5a2e9 Binary files /dev/null and b/bin/themes/mac/images/navigation-forward.png differ diff --git a/bin/themes/mac/images/navigation-home.png b/bin/themes/mac/images/navigation-home.png new file mode 100644 index 000000000..f423f2287 Binary files /dev/null and b/bin/themes/mac/images/navigation-home.png differ diff --git a/bin/themes/mac/images/navigation-reload.png b/bin/themes/mac/images/navigation-reload.png new file mode 100644 index 000000000..ba39eda86 Binary files /dev/null and b/bin/themes/mac/images/navigation-reload.png differ diff --git a/bin/themes/mac/images/navigation-stop.png b/bin/themes/mac/images/navigation-stop.png new file mode 100644 index 000000000..1ad5807e7 Binary files /dev/null and b/bin/themes/mac/images/navigation-stop.png differ diff --git a/bin/themes/mac/images/navigation-supermenu.png b/bin/themes/mac/images/navigation-supermenu.png new file mode 100644 index 000000000..c8a323870 Binary files /dev/null and b/bin/themes/mac/images/navigation-supermenu.png differ diff --git a/bin/themes/mac/images/search-icon.png b/bin/themes/mac/images/search-icon.png new file mode 100644 index 000000000..d32ef3d14 Binary files /dev/null and b/bin/themes/mac/images/search-icon.png differ diff --git a/bin/themes/mac/images/searchbar-provider-bg.png b/bin/themes/mac/images/searchbar-provider-bg.png new file mode 100644 index 000000000..93ff0611a Binary files /dev/null and b/bin/themes/mac/images/searchbar-provider-bg.png differ diff --git a/bin/themes/mac/images/siteicon-bg.png b/bin/themes/mac/images/siteicon-bg.png new file mode 100644 index 000000000..5f689a965 Binary files /dev/null and b/bin/themes/mac/images/siteicon-bg.png differ diff --git a/bin/themes/mac/images/siteicon-secure-bg.png b/bin/themes/mac/images/siteicon-secure-bg.png new file mode 100644 index 000000000..e7b09b46b Binary files /dev/null and b/bin/themes/mac/images/siteicon-secure-bg.png differ diff --git a/bin/themes/mac/images/splitter.png b/bin/themes/mac/images/splitter.png new file mode 100644 index 000000000..4d0b91bfe Binary files /dev/null and b/bin/themes/mac/images/splitter.png differ diff --git a/bin/themes/mac/images/star-a.png b/bin/themes/mac/images/star-a.png new file mode 100644 index 000000000..a7bc1c565 Binary files /dev/null and b/bin/themes/mac/images/star-a.png differ diff --git a/bin/themes/mac/images/star.png b/bin/themes/mac/images/star.png new file mode 100644 index 000000000..65ef97f73 Binary files /dev/null and b/bin/themes/mac/images/star.png differ diff --git a/bin/themes/mac/images/tabs-bg.png b/bin/themes/mac/images/tabs-bg.png new file mode 100644 index 000000000..3a35bdfff Binary files /dev/null and b/bin/themes/mac/images/tabs-bg.png differ diff --git a/bin/themes/mac/images/tabs-list-button.png b/bin/themes/mac/images/tabs-list-button.png new file mode 100644 index 000000000..8fa525ded Binary files /dev/null and b/bin/themes/mac/images/tabs-list-button.png differ diff --git a/bin/themes/mac/images/toolbar-bg.png b/bin/themes/mac/images/toolbar-bg.png new file mode 100644 index 000000000..16f7a3f01 Binary files /dev/null and b/bin/themes/mac/images/toolbar-bg.png differ diff --git a/bin/themes/mac/images/tools-a.png b/bin/themes/mac/images/tools-a.png new file mode 100644 index 000000000..dcd136c18 Binary files /dev/null and b/bin/themes/mac/images/tools-a.png differ diff --git a/bin/themes/mac/images/tools-h.png b/bin/themes/mac/images/tools-h.png new file mode 100644 index 000000000..58e47b04f Binary files /dev/null and b/bin/themes/mac/images/tools-h.png differ diff --git a/bin/themes/mac/images/tools.png b/bin/themes/mac/images/tools.png new file mode 100644 index 000000000..26267effd Binary files /dev/null and b/bin/themes/mac/images/tools.png differ diff --git a/bin/themes/mac/images/transp.png b/bin/themes/mac/images/transp.png new file mode 100644 index 000000000..c55289094 Binary files /dev/null and b/bin/themes/mac/images/transp.png differ diff --git a/bin/themes/mac/linux.css b/bin/themes/mac/linux.css new file mode 100644 index 000000000..fa679f67f --- /dev/null +++ b/bin/themes/mac/linux.css @@ -0,0 +1,6 @@ +/*TabWidget*/ +#tabbar::tab +{ + max-width: 250px; + max-height: 26px; +} diff --git a/bin/themes/mac/main.css b/bin/themes/mac/main.css new file mode 100644 index 000000000..173a91aff --- /dev/null +++ b/bin/themes/mac/main.css @@ -0,0 +1,344 @@ +/************************************* + * Mac Theme v0.1 * + * Author: nowrep * + * Based on: Firefox Mac OS X Theme * + * Last updated: 01.09 2011 * + *************************************/ + +*[html-link-look="true"] +{ + color: blue; + text-decoration: underline; +} + +/*MainWindow*/ +#mainwindow +{ + background-color: #b2b2b2; +} + +#mainwindow-menubar +{ + background-image:url(images/transp.png); + border:none; +} + +#mainwindow-menubar:item +{ + color: black; + spacing: 5px; + padding: 2px 6px; + background: transparent; +} + +#mainwindow-menubar::item:pressed +{ + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #a5a5a5, stop:1 #9a9a9a); + border: 1px solid #373737; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + border-bottom: none; +} + +#mainwindow-statusbar +{ + background-color: #b5b5b5; +} + +#statusbar-ip-label +{ + padding-right: 5px; +} + +/*NavigationBar*/ +#navigationbar QSplitter::handle +{ + height: 8px; + image: url(images/splitter.png); +} + +#navigation-button-back +{ + qproperty-multiIcon: url(images/navigation-back.png); +} + +#navigation-button-next +{ + qproperty-multiIcon: url(images/navigation-forward.png); +} + +#navigation-button-stop +{ + qproperty-multiIcon: url(images/navigation-stop.png); +} + +#navigation-button-reload +{ + qproperty-multiIcon: url(images/navigation-reload.png); +} + +#navigation-button-home +{ + qproperty-multiIcon: url(images/navigation-home.png); +} + +#navigation-button-addtab +{ + qproperty-multiIcon: url(images/navigation-addtab.png); +} + +#navigation-button-supermenu +{ + qproperty-multiIcon: url(images/navigation-supermenu.png); +} + +/*TabWidget*/ +#tabbar +{ + background-image: url(images/tabs-bg.png); + background-repeat: repeat-x; + height: 27px; +} + +#tabwidget::tab-bar +{ + right: 26px; +} + +#tabwidget-button-opentabs +{ + qproperty-multiIcon: url(images/tabs-list-button.png); +} + +/*LocationBar*/ +#locationbar +{ + background: transparent; + border-image: url(images/lineedit-bg.png); + border-width:4; + color:black; + padding-left: 35px; + padding-bottom: 1px; + padding-top: 0px; + qproperty-fixedheight: 23; +} + +#locationbar-bookmarkicon +{ + margin-left: 2px; + qproperty-pixmap: url(images/star.png); +} + +#locationbar-bookmarkicon[bookmarked="true"] +{ + qproperty-pixmap: url(images/star-a.png); +} + +#locationbar-siteicon +{ + border-image: url(images/siteicon-bg.png); + qproperty-fixedsize:42px 23px; + padding-left: -3px; +} + +#locationbar-siteicon[secured="true"] +{ + border-image: url(images/siteicon-secure-bg.png); +} + +#locationbar-rss-icon +{ + margin-left: 2px; + qproperty-pixmap: url(images/feed-icon.png); +} + +#locationbar-goicon +{ + qproperty-pixmap: url(images/gotoaddress.png); +} + +#locationbar-down-icon +{ + margin-left: 3px; + margin-right: 2px; + qproperty-pixmap: url(images/navigation-dropdown.png); +} + +/*BookmarksToolbar*/ +#bookmarksbar QToolButton +{ + border-image: url(images/transp.png); + border-width: 1px; + padding-right: -5px; + height: 15px; +} + +#bookmarksbar QToolButton::menu-indicator +{ + background: url(images/transp.png); +} + +/*SideBar*/ +#sidebar +{ + background: transparent; +} + +/*WebSearchBar*/ +#websearchbar +{ + background: transparent; + border-image: url(images/lineedit-bg.png); + border-width: 4; + padding-left: 35px; + padding-bottom: 1px; + padding-top: 0px; + color:black; + qproperty-fixedheight: 23; +} + +#websearchbar-searchbutton +{ + margin-bottom: -1px; + qproperty-pixmap: url(images/search-icon.png); +} + +#websearchbar-searchprovider-comobobox +{ + border-image: url(images/searchbar-provider-bg.png); + padding-left:-11px; + qproperty-fixedsize: 42px 23px; +} + +#websearchbar-searchprovider-comobobox::menu-indicator +{ + background: url(images/transp.png); +} + +/*SourceViewer*/ +#sourceviewer-textedit +{ + border:none; +} + +/*SourceViewerSearch*/ +SourceViewerSearch #lineEdit[notfound="true"] +{ + background:#ff6666; +} + +/*SearchToolbar*/ +SearchToolBar #lineEdit[notfound="true"] +{ + background:#ff6666; +} + +/*Click2Flash*/ +#click2flash-frame +{ + border: 1px solid #e8e8e8; +} + +#click2flash-toolbutton +{ + background: url(images/flash.png) no-repeat; + background-position: center; + border: none; +} + +#click2flash-toolbutton:hover +{ + background: url(images/flashstart.png) no-repeat; + background-position: center; + border:none; +} + +/*RSSManager*/ +#rssmanager-frame +{ + background: white; +} + +RSSManager QTabBar::tab +{ + max-width:100px; +} + +/*AboutDialog*/ +AboutDialog #label +{ + background:white; +} + +AboutDialog #textBrowser +{ + border:none; +} + +/*DesktopNotification*/ +DesktopNotification +{ + background: transparent; +} +DesktopNotification #frame +{ + border: 2px solid darkblue; + border-radius: 20px; + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #e4ecf1, stop:1 #d3e5f1); +} + +DesktopNotification #heading +{ + font: bold; + font-size: 13pt; +} + +/*BrowsingLibrary*/ +BrowsingLibrary #tabs +{ + qproperty-bgPixmap: url(images/library-bg-left.png); +} + +BrowsingLibrary #frame +{ + background: url(images/library-bg-top.png) no-repeat; +} + +BrowsingLibrary #frame_2 +{ + background: url(images/library-bg-top-right.png); +} + +BrowsingLibrary #searchLine +{ + background: transparent; + border-image: url(images/library-search-bg.png); + border-width:4; + color:black; +} + +/*Downloads*/ +DownloadItem #fileName +{ + font-size: 13pt; +} + +DownloadManager #list +{ + border: none; +} + +/*JavaScript Dialogs*/ +QFrame[js-frame="true"] +{ + border: 1px solid black; + border-bottom: 0px; + background-color: white; +} + +QFrame[js-frame2="true"] +{ + border: 1px solid black; + border-top: 0px; + background-color: #f3f3f3; +} diff --git a/bin/themes/mac/theme.info b/bin/themes/mac/theme.info new file mode 100644 index 000000000..cad3fcd8f --- /dev/null +++ b/bin/themes/mac/theme.info @@ -0,0 +1,4 @@ +Name: Mac +Author: nowrep +Short Description: Mac like theme +Long Description: Mac like theme for QupZilla based on Firefox Mac OS X theme diff --git a/bin/themes/mac/theme.png b/bin/themes/mac/theme.png new file mode 100644 index 000000000..4f1ac3ff9 Binary files /dev/null and b/bin/themes/mac/theme.png differ diff --git a/bin/themes/mac/windows.css b/bin/themes/mac/windows.css new file mode 100644 index 000000000..238e7160f --- /dev/null +++ b/bin/themes/mac/windows.css @@ -0,0 +1,6 @@ +/*TabWidget*/ +#tabbar::tab +{ + max-width: 250px; + height: 26px; +} diff --git a/bin/themes/windows/images/flash.png b/bin/themes/windows/images/flash.png new file mode 100644 index 000000000..590c561f3 Binary files /dev/null and b/bin/themes/windows/images/flash.png differ diff --git a/bin/themes/windows/images/flashstart.png b/bin/themes/windows/images/flashstart.png new file mode 100644 index 000000000..c930ee7ae Binary files /dev/null and b/bin/themes/windows/images/flashstart.png differ diff --git a/bin/themes/windows/images/gotoaddress.png b/bin/themes/windows/images/gotoaddress.png new file mode 100644 index 000000000..fdefe966b Binary files /dev/null and b/bin/themes/windows/images/gotoaddress.png differ diff --git a/bin/themes/windows/images/library-bg-left.png b/bin/themes/windows/images/library-bg-left.png new file mode 100644 index 000000000..cce542d08 Binary files /dev/null and b/bin/themes/windows/images/library-bg-left.png differ diff --git a/bin/themes/windows/images/library-bg-top-right.png b/bin/themes/windows/images/library-bg-top-right.png new file mode 100644 index 000000000..821f12dc1 Binary files /dev/null and b/bin/themes/windows/images/library-bg-top-right.png differ diff --git a/bin/themes/windows/images/library-bg-top.png b/bin/themes/windows/images/library-bg-top.png new file mode 100644 index 000000000..ec16ad053 Binary files /dev/null and b/bin/themes/windows/images/library-bg-top.png differ diff --git a/bin/themes/windows/images/library-search-bg.png b/bin/themes/windows/images/library-search-bg.png new file mode 100644 index 000000000..2f159b294 Binary files /dev/null and b/bin/themes/windows/images/library-search-bg.png differ diff --git a/bin/themes/windows/images/lineedit-bg.png b/bin/themes/windows/images/lineedit-bg.png new file mode 100644 index 000000000..d8b0dba29 Binary files /dev/null and b/bin/themes/windows/images/lineedit-bg.png differ diff --git a/bin/themes/windows/images/navigation-addtab.png b/bin/themes/windows/images/navigation-addtab.png new file mode 100644 index 000000000..3d1003b09 Binary files /dev/null and b/bin/themes/windows/images/navigation-addtab.png differ diff --git a/bin/themes/windows/images/navigation-back.png b/bin/themes/windows/images/navigation-back.png new file mode 100644 index 000000000..6aa81f694 Binary files /dev/null and b/bin/themes/windows/images/navigation-back.png differ diff --git a/bin/themes/windows/images/navigation-dropdown.png b/bin/themes/windows/images/navigation-dropdown.png new file mode 100644 index 000000000..0b9102fa8 Binary files /dev/null and b/bin/themes/windows/images/navigation-dropdown.png differ diff --git a/bin/themes/windows/images/navigation-forward.png b/bin/themes/windows/images/navigation-forward.png new file mode 100644 index 000000000..56c39b1a3 Binary files /dev/null and b/bin/themes/windows/images/navigation-forward.png differ diff --git a/bin/themes/windows/images/navigation-home.png b/bin/themes/windows/images/navigation-home.png new file mode 100644 index 000000000..cca1aa0e0 Binary files /dev/null and b/bin/themes/windows/images/navigation-home.png differ diff --git a/bin/themes/windows/images/navigation-reload.png b/bin/themes/windows/images/navigation-reload.png new file mode 100644 index 000000000..318bb1839 Binary files /dev/null and b/bin/themes/windows/images/navigation-reload.png differ diff --git a/bin/themes/windows/images/navigation-stop.png b/bin/themes/windows/images/navigation-stop.png new file mode 100644 index 000000000..dfc76e3af Binary files /dev/null and b/bin/themes/windows/images/navigation-stop.png differ diff --git a/bin/themes/windows/images/navigation-supermenu.png b/bin/themes/windows/images/navigation-supermenu.png new file mode 100644 index 000000000..59b2b2e82 Binary files /dev/null and b/bin/themes/windows/images/navigation-supermenu.png differ diff --git a/bin/themes/windows/images/rss.png b/bin/themes/windows/images/rss.png new file mode 100644 index 000000000..7c3aceb66 Binary files /dev/null and b/bin/themes/windows/images/rss.png differ diff --git a/bin/themes/windows/images/search-icon.png b/bin/themes/windows/images/search-icon.png new file mode 100644 index 000000000..bfeef3f82 Binary files /dev/null and b/bin/themes/windows/images/search-icon.png differ diff --git a/bin/themes/windows/images/searchbar-provider-bg.png b/bin/themes/windows/images/searchbar-provider-bg.png new file mode 100644 index 000000000..e9ac2e3e1 Binary files /dev/null and b/bin/themes/windows/images/searchbar-provider-bg.png differ diff --git a/bin/themes/windows/images/siteicon-bg.png b/bin/themes/windows/images/siteicon-bg.png new file mode 100644 index 000000000..90dcfd96a Binary files /dev/null and b/bin/themes/windows/images/siteicon-bg.png differ diff --git a/bin/themes/windows/images/siteicon-secure-bg.png b/bin/themes/windows/images/siteicon-secure-bg.png new file mode 100644 index 000000000..98ea3c57f Binary files /dev/null and b/bin/themes/windows/images/siteicon-secure-bg.png differ diff --git a/bin/themes/windows/images/star-a.png b/bin/themes/windows/images/star-a.png new file mode 100644 index 000000000..36e4b0313 Binary files /dev/null and b/bin/themes/windows/images/star-a.png differ diff --git a/bin/themes/windows/images/star.png b/bin/themes/windows/images/star.png new file mode 100644 index 000000000..51c9fbc83 Binary files /dev/null and b/bin/themes/windows/images/star.png differ diff --git a/bin/themes/windows/images/tabs-bg.png b/bin/themes/windows/images/tabs-bg.png new file mode 100644 index 000000000..9b5f07541 Binary files /dev/null and b/bin/themes/windows/images/tabs-bg.png differ diff --git a/bin/themes/windows/images/tabs-list-button.png b/bin/themes/windows/images/tabs-list-button.png new file mode 100644 index 000000000..4b0bec6db Binary files /dev/null and b/bin/themes/windows/images/tabs-list-button.png differ diff --git a/bin/themes/windows/images/toolbar-bg.png b/bin/themes/windows/images/toolbar-bg.png new file mode 100644 index 000000000..1a0fbb557 Binary files /dev/null and b/bin/themes/windows/images/toolbar-bg.png differ diff --git a/bin/themes/windows/images/transp.png b/bin/themes/windows/images/transp.png new file mode 100644 index 000000000..c55289094 Binary files /dev/null and b/bin/themes/windows/images/transp.png differ diff --git a/bin/themes/windows/linux.css b/bin/themes/windows/linux.css new file mode 100644 index 000000000..fa679f67f --- /dev/null +++ b/bin/themes/windows/linux.css @@ -0,0 +1,6 @@ +/*TabWidget*/ +#tabbar::tab +{ + max-width: 250px; + max-height: 26px; +} diff --git a/bin/themes/windows/main.css b/bin/themes/windows/main.css new file mode 100644 index 000000000..8ae9e6b3a --- /dev/null +++ b/bin/themes/windows/main.css @@ -0,0 +1,350 @@ +/************************************* + * Windows Theme v0.1 * + * Author: nowrep * + * Based on: Firefox Strata Aero * + * Last updated: 07.09 2011 * + *************************************/ + +*[html-link-look="true"] +{ + color: blue; + text-decoration: underline; +} + +/*MainWindow*/ +#mainwindow +{ + background : #dee3f4 url(images/toolbar-bg.png) repeat-x; +} + +#mainwindow-menubar +{ + background-image:url(images/transp.png); + border:none; +} + +#mainwindow-menubar:item +{ + color: black; + spacing: 5px; + padding: 2px 6px; + background: transparent; +} + +#mainwindow-menubar::item:pressed +{ + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #a1c0e6, stop:1 #86abd9); + border: 1px solid #4b6e99; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + border-bottom: none; +} + +#mainwindow-statusbar +{ + background: transparent; +} + +#mainwindow QToolBar +{ + background-image:url(images/transp.png); + border:none; +} + +#statusbar-ip-label +{ + padding-right: 5px; +} + +/*NavigationBar*/ +#navigationbar QSplitter::handle +{ + background-color:transparent; +} + +#navigation-button-back +{ + qproperty-multiIcon: url(images/navigation-back.png); +} + +#navigation-button-next +{ + qproperty-multiIcon: url(images/navigation-forward.png); +} + +#navigation-button-stop +{ + qproperty-icon: url(images/navigation-stop.png); + qproperty-iconSize: 23px 22px; +} + +#navigation-button-reload +{ + qproperty-icon: url(images/navigation-reload.png); + qproperty-iconSize: 23px 22px; +} + +#navigation-button-home +{ + qproperty-icon: url(images/navigation-home.png); + qproperty-iconSize: 23px 22px; +} + +#navigation-button-addtab +{ + qproperty-icon: url(images/navigation-addtab.png); + qproperty-iconSize: 23px 22px; +} + +#navigation-button-supermenu +{ + qproperty-icon: url(images/navigation-supermenu.png); + qproperty-iconSize: 23px 22px; +} + +/*TabWidget*/ +#tabbar +{ + background-image: url(images/tabs-bg.png); + background-repeat: repeat-x; + height: 27px; +} + +#tabwidget::tab-bar +{ + right: 17px; +} + +#tabwidget-button-opentabs +{ + qproperty-multiIcon: url(images/tabs-list-button.png); +} + +/*LocationBar*/ +#locationbar +{ + background: transparent; + border-image: url(images/lineedit-bg.png); + border-width:4; + color:black; + padding-left: 28px; + qproperty-fixedheight: 22; +} + +#locationbar-bookmarkicon +{ + margin-left: 3px; + qproperty-pixmap: url(images/star.png); +} + +#locationbar-bookmarkicon[bookmarked="true"] +{ + qproperty-pixmap: url(images/star-a.png); +} + +#locationbar-siteicon +{ + border-image: url(images/siteicon-bg.png); + qproperty-fixedsize:28px 22px; + padding-left: 0px; +} + +#locationbar-siteicon[secured="true"] +{ + border-image: url(images/siteicon-secure-bg.png); +} + +#locationbar-rss-icon +{ + margin-left: 3px; + qproperty-pixmap: url(images/rss.png); +} + +#locationbar-goicon +{ + margin-left: 3px; + qproperty-pixmap: url(images/gotoaddress.png); +} + +#locationbar-down-icon +{ + margin-right: -4px; + margin-bottom: 1px; + qproperty-pixmap: url(images/navigation-dropdown.png); +} + +/*BookmarksToolbar*/ +#bookmarksbar QToolButton +{ + border-image: url(images/transp.png); + border-width: 1px; + padding-right: -5px; + height: 15px; +} + +#bookmarksbar QToolButton::menu-indicator +{ + background: url(images/transp.png); +} + +/*SideBar*/ +#sidebar +{ + background: transparent; +} + +/*WebSearchBar*/ +#websearchbar +{ + background: transparent; + border-image: url(images/lineedit-bg.png); + border-width:4; + color:black; + padding-left: 30px; + qproperty-fixedheight: 22; +} + +#websearchbar-searchbutton +{ + qproperty-pixmap: url(images/search-icon.png); +} + +#websearchbar-searchprovider-comobobox +{ + border-image: url(images/searchbar-provider-bg.png); + padding-left:-8px; + qproperty-fixedsize: 32px 22px; +} + +#websearchbar-searchprovider-comobobox::menu-indicator +{ + background: url(images/transp.png); +} + +/*SourceViewer*/ +#sourceviewer-textedit +{ + border:none; +} + +/*SourceViewerSearch*/ +SourceViewerSearch #lineEdit[notfound="true"] +{ + background:#ff6666; +} + +/*SearchToolbar*/ +SearchToolBar #lineEdit[notfound="true"] +{ + background:#ff6666; +} + +/*Click2Flash*/ +#click2flash-frame +{ + border: 1px solid #e8e8e8; +} + +#click2flash-toolbutton +{ + background: url(images/flash.png) no-repeat; + background-position: center; + border: none; +} + +#click2flash-toolbutton:hover +{ + background: url(images/flashstart.png) no-repeat; + background-position: center; + border:none; +} + +/*RSSManager*/ +#rssmanager-frame +{ + background: white; +} + +RSSManager QTabBar::tab +{ + max-width:100px; +} + +/*AboutDialog*/ +AboutDialog #label +{ + background:white; +} + +AboutDialog #textBrowser +{ + border:none; +} + +/*DesktopNotification*/ +DesktopNotification +{ + background: transparent; +} +DesktopNotification #frame +{ + border: 2px solid darkblue; + border-radius: 20px; + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #e4ecf1, stop:1 #d3e5f1); +} + +DesktopNotification #heading +{ + font: bold; + font-size: 13pt; +} + +/*BrowsingLibrary*/ +BrowsingLibrary #tabs +{ + qproperty-bgPixmap: url(images/library-bg-left.png); +} + +BrowsingLibrary #frame +{ + background: url(images/library-bg-top.png) no-repeat; +} + +BrowsingLibrary #frame_2 +{ + background: url(images/library-bg-top-right.png); +} + +BrowsingLibrary #searchLine +{ + background: transparent; + border-image: url(images/library-search-bg.png); + border-width:4; + color:black; +} + +/*Downloads*/ +DownloadItem #fileName +{ + font-size: 13pt; +} + +DownloadManager #list +{ + border: none; +} + +/*JavaScript Dialogs*/ +QFrame[js-frame="true"] +{ + border: 1px solid black; + border-bottom: 0px; + background-color: white; +} + +QFrame[js-frame2="true"] +{ + border: 1px solid black; + border-top: 0px; + background-color: #f3f3f3; +} diff --git a/bin/themes/windows/theme.info b/bin/themes/windows/theme.info new file mode 100644 index 000000000..0ae0d5b0c --- /dev/null +++ b/bin/themes/windows/theme.info @@ -0,0 +1,4 @@ +Name: Windows +Author: nowrep +Short Description: Windows default theme +Long Description: Windows default theme for QupZilla based on Firefox Strata Aero theme. This theme supports transparent background on Windows 7 diff --git a/bin/themes/windows/theme.png b/bin/themes/windows/theme.png new file mode 100644 index 000000000..ff4f21f9a Binary files /dev/null and b/bin/themes/windows/theme.png differ diff --git a/bin/themes/windows/windows.css b/bin/themes/windows/windows.css new file mode 100644 index 000000000..238e7160f --- /dev/null +++ b/bin/themes/windows/windows.css @@ -0,0 +1,6 @@ +/*TabWidget*/ +#tabbar::tab +{ + max-width: 250px; + height: 26px; +} diff --git a/src/3rdparty/fancytabwidget.h b/src/3rdparty/fancytabwidget.h index 1971841e8..67059778a 100644 --- a/src/3rdparty/fancytabwidget.h +++ b/src/3rdparty/fancytabwidget.h @@ -139,7 +139,9 @@ private: }; class FancyTabWidget : public QWidget { - Q_OBJECT + Q_OBJECT + + Q_PROPERTY(QPixmap bgPixmap READ bgPixmap WRITE SetBackgroundPixmap) public: FancyTabWidget(QWidget* parent = 0); @@ -179,6 +181,7 @@ public: int current_index() const; Mode mode() const { return mode_; } + QPixmap bgPixmap() { return background_pixmap_; } public slots: void SetCurrentIndex(int index); diff --git a/src/QupZilla.pro b/src/QupZilla.pro index ea4a4115f..0c1967bc7 100644 --- a/src/QupZilla.pro +++ b/src/QupZilla.pro @@ -7,7 +7,7 @@ QT += core gui webkit sql network TARGET = qupzilla TEMPLATE = app -VERSION = 1.00.b3 +VERSION = 1.00.b4 TRANSLATIONS +=cs_CZ.ts\ sk_SK.ts @@ -127,7 +127,11 @@ SOURCES += main.cpp\ other/browsinglibrary.cpp \ 3rdparty/stylehelper.cpp \ 3rdparty/fancytabwidget.cpp \ - history/webhistoryinterface.cpp + history/webhistoryinterface.cpp \ + tools/toolbutton.cpp \ + navigation/navigationbar.cpp \ + navigation/reloadstopbutton.cpp \ + preferences/thememanager.cpp HEADERS += \ 3rdparty/qtwin.h \ @@ -215,7 +219,11 @@ HEADERS += \ other/browsinglibrary.h \ 3rdparty/stylehelper.h \ 3rdparty/fancytabwidget.h \ - history/webhistoryinterface.h + history/webhistoryinterface.h \ + tools/toolbutton.h \ + navigation/navigationbar.h \ + navigation/reloadstopbutton.h \ + preferences/thememanager.h FORMS += \ preferences/autofillmanager.ui \ @@ -248,14 +256,16 @@ FORMS += \ webview/jsalert.ui \ webview/jsprompt.ui \ other/browsinglibrary.ui \ - webview/searchtoolbar.ui + webview/searchtoolbar.ui \ + preferences/thememanager.ui RESOURCES += \ data/icons.qrc \ data/html.qrc OTHER_FILES += \ - appicon.rc + appicon.rc \ + themes/default/main.css include(3rdparty/qtsingleapplication.pri) @@ -263,3 +273,6 @@ unix:QT += dbus win32:DEFINES += W7API win32:RC_FILE = appicon.rc win32:LIBS += User32.lib Ole32.lib Shell32.lib ShlWapi.lib Gdi32.lib ComCtl32.lib + + + diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp index ba86b0085..fbe9c285c 100644 --- a/src/adblock/adblockmanager.cpp +++ b/src/adblock/adblockmanager.cpp @@ -100,7 +100,7 @@ void AdBlockManager::load() return; m_loaded = true; - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("AdBlock"); m_enabled = settings.value("enabled", m_enabled).toBool(); settings.endGroup(); @@ -116,7 +116,7 @@ void AdBlockManager::save() return; m_subscription->saveRules(); - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup(QLatin1String("AdBlock")); settings.setValue(QLatin1String("enabled"), m_enabled); settings.endGroup(); diff --git a/src/adblock/adblocksubscription.cpp b/src/adblock/adblocksubscription.cpp index 86262efe2..6d0159e94 100644 --- a/src/adblock/adblocksubscription.cpp +++ b/src/adblock/adblocksubscription.cpp @@ -56,7 +56,7 @@ AdBlockSubscription::AdBlockSubscription(QObject* parent) void AdBlockSubscription::loadRules() { - QString fileName = mApp->getActiveProfil()+"adblocklist.txt"; + QString fileName = mApp->getActiveProfilPath()+"adblocklist.txt"; QFile file(fileName); if (file.exists()) { @@ -109,7 +109,7 @@ void AdBlockSubscription::rulesDownloaded() if (response.isEmpty()) return; - QString fileName = mApp->getActiveProfil()+"adblocklist.txt"; + QString fileName = mApp->getActiveProfilPath()+"adblocklist.txt"; QFile file(fileName); if (!file.open(QFile::WriteOnly)) { qWarning() << "AdBlockSubscription::" << __FUNCTION__ << "Unable to open adblock file for writing:" << fileName; @@ -139,7 +139,7 @@ void AdBlockSubscription::rulesDownloaded() void AdBlockSubscription::saveRules() { - QString fileName = mApp->getActiveProfil()+"adblocklist.txt"; + QString fileName = mApp->getActiveProfilPath()+"adblocklist.txt"; QFile file(fileName); if (!file.open(QFile::ReadWrite | QIODevice::Truncate)) { diff --git a/src/app/mainapplication.cpp b/src/app/mainapplication.cpp index ccd84ad11..eab33a6c9 100644 --- a/src/app/mainapplication.cpp +++ b/src/app/mainapplication.cpp @@ -65,6 +65,10 @@ MainApplication::MainApplication(const QList &cm #else DATADIR = qApp->applicationDirPath()+"/"; #endif + PLUGINSDIR = DATADIR + "plugins/"; + TRANSLATIONSDIR = DATADIR + "locale/"; + THEMESDIR = DATADIR + "themes/"; + setWindowIcon(QIcon(":/icons/qupzilla.png")); bool noAddons = false; QUrl startUrl(""); @@ -168,6 +172,36 @@ MainApplication::MainApplication(const QList &cm void MainApplication::loadSettings() { QSettings settings(m_activeProfil+"settings.ini", QSettings::IniFormat); + settings.beginGroup("Themes"); + QString activeTheme = settings.value("activeTheme", "default").toString(); + settings.endGroup(); + m_activeThemePath = THEMESDIR + activeTheme + "/"; + QFile cssFile(m_activeThemePath + "main.css"); + cssFile.open(QFile::ReadOnly); + QString css = cssFile.readAll(); + cssFile.close(); +#ifdef Q_WS_X11 + if (QFile(m_activeThemePath + "linux.css").exists()) { + cssFile.setFileName(m_activeThemePath + "linux.css"); + cssFile.open(QFile::ReadOnly); + css.append(cssFile.readAll()); + cssFile.close(); + } +#endif +#ifdef Q_WS_WIN + if (QFile(m_activeThemePath + "windows.css").exists()) { + cssFile.setFileName(m_activeThemePath + "windows.css"); + cssFile.open(QFile::ReadOnly); + css.append(cssFile.readAll()); + cssFile.close(); + } +#endif + + QString relativePath = QDir::current().relativeFilePath(m_activeThemePath); + css.replace(QRegExp("url\\s*\\(\\s*([^\\*:\\);]+)\\s*\\)", Qt::CaseSensitive, QRegExp::RegExp2), + QString("url(%1\\1)").arg(relativePath + "/")); + setStyleSheet(css); + webSettings(); //Web browsing settings settings.beginGroup("Web-Browser-Settings"); @@ -322,15 +356,15 @@ void MainApplication::translateApp() QString file = settings.value("language",locale.name()+".qm").toString(); QString shortLoc = file.left(2); - if (file == "" || !QFile::exists(DATADIR+"locale/"+file) ) + if (file == "" || !QFile::exists(TRANSLATIONSDIR + file) ) return; QTranslator* app = new QTranslator(); app->load(DATADIR+"locale/"+file); QTranslator* sys = new QTranslator(); - if (QFile::exists(DATADIR+"locale/qt_"+shortLoc+".qm")) - sys->load(DATADIR+"locale/qt_"+shortLoc+".qm"); + if (QFile::exists(TRANSLATIONSDIR + "qt_" + shortLoc + ".qm")) + sys->load(TRANSLATIONSDIR + "qt_" + shortLoc + ".qm"); m_activeLanguage = file; @@ -366,7 +400,7 @@ void MainApplication::quitApplication() m_networkmanager->saveCertExceptions(); m_plugins->c2f_saveSettings(); AdBlockManager::instance()->save(); - QFile::remove(getActiveProfil() + "WebpageIcons.db"); + QFile::remove(getActiveProfilPath() + "WebpageIcons.db"); // qDebug() << "Quitting application..."; quit(); @@ -550,7 +584,6 @@ bool MainApplication::restoreStateSlot(QupZilla* window) window->restoreState(qMainWindowState); if (windowCount > 1) { - qDebug() << windowCount; for (int i = 1; i < windowCount; i++) { stream >> tabState; stream >> qMainWindowState; diff --git a/src/app/mainapplication.h b/src/app/mainapplication.h index 0c9f519cf..b420a19ab 100644 --- a/src/app/mainapplication.h +++ b/src/app/mainapplication.h @@ -52,6 +52,9 @@ class MainApplication : public QtSingleApplication public: QString DATADIR; + QString PLUGINSDIR; + QString TRANSLATIONSDIR; + QString THEMESDIR; explicit MainApplication(const QList &cmdActions, int &argc, char **argv); enum MessageType{ SetAdBlockIconEnabled, CheckPrivateBrowsing, ReloadSettings, HistoryStateChanged, BookmarksChanged }; @@ -65,7 +68,7 @@ public: bool isStateChanged(); inline static MainApplication* getInstance() { return static_cast(QCoreApplication::instance()); } - inline QString getActiveProfil() { return m_activeProfil; } + inline QString getActiveProfilPath() { return m_activeProfil; } inline QString getActiveLanguage() { return m_activeLanguage; } inline bool isClosing() { return m_isClosing; } inline bool isExited() { return m_isExited; } @@ -131,6 +134,7 @@ private: QString m_activeProfil; QString m_activeLanguage; + QString m_activeThemePath; bool m_isClosing; bool m_isStateChanged; diff --git a/src/app/qupzilla.cpp b/src/app/qupzilla.cpp index 10256378c..6b22e641a 100644 --- a/src/app/qupzilla.cpp +++ b/src/app/qupzilla.cpp @@ -54,8 +54,9 @@ #include "statusbarmessage.h" #include "locationbarsettings.h" #include "browsinglibrary.h" +#include "navigationbar.h" -const QString QupZilla::VERSION = "1.0.0-b3"; +const QString QupZilla::VERSION = "1.0.0-b4"; //const QString QupZilla::BUILDTIME = QLocale(QLocale::English).toDateTime(__DATE__" "__TIME__, "MMM d yyyy hh:mm:ss").toString("MM/dd/yyyy hh:ss"); const QString QupZilla::BUILDTIME = __DATE__" "__TIME__; const QString QupZilla::AUTHOR = "nowrep"; @@ -74,13 +75,14 @@ QupZilla::QupZilla(bool tryRestore, QUrl startUrl) : ,m_sideBar(0) ,m_statusBarMessage(new StatusBarMessage(this)) { + setObjectName("mainwindow"); setAttribute(Qt::WA_DeleteOnClose); this->resize(640,480); this->setWindowState(Qt::WindowMaximized); this->setWindowTitle("QupZilla"); setUpdatesEnabled(false); - m_activeProfil = mApp->getActiveProfil(); + m_activeProfil = mApp->getActiveProfilPath(); m_activeLanguage = mApp->getActiveLanguage(); QDesktopServices::setUrlHandler("http", this, "loadAddress"); @@ -150,74 +152,24 @@ void QupZilla::postLaunch() void QupZilla::setupUi() { QWidget* widget = new QWidget(this); + setCentralWidget(widget); + m_mainLayout = new QVBoxLayout(widget); m_mainLayout->setContentsMargins(0,0,0,0); m_mainLayout->setSpacing(0); - setCentralWidget(widget); + m_mainSplitter = new QSplitter(this); + m_mainSplitter->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); m_tabWidget = new TabWidget(this); - m_mainLayout->addWidget(m_tabWidget); - - m_navigation = new QToolBar(this); - m_navigation->setWindowTitle(tr("Navigation")); - m_navigation->setObjectName("Navigation bar"); - addToolBar(m_navigation); - m_navigation->setMovable(false); - m_navigation->setStyleSheet("QToolBar{background-image:url(:icons/transp.png); border:none;}"); - - m_buttonBack = new QAction(QIcon(":/icons/navigation/zpet.png"),tr("Back"),this); - m_buttonBack->setEnabled(false); - m_buttonNext = new QAction(QIcon(":/icons/navigation/vpred.png"),tr("Forward"),this); - m_buttonNext->setEnabled(false); - m_buttonStop = new QAction(QIcon(":/icons/navigation/stop.png"),tr("Stop"),this); - m_buttonReload = new QAction(QIcon(":/icons/navigation/reload.png"),tr("Reload"),this); - m_buttonReload->setShortcut(QKeySequence("F5")); - m_buttonHome = new QAction(QIcon(":/icons/navigation/home.png"),tr("Home"),this); - - m_menuBack = new QMenu(); - m_buttonBack->setMenu(m_menuBack); - connect(m_menuBack, SIGNAL(aboutToShow()),this, SLOT(aboutToShowHistoryBackMenu())); - - m_menuForward = new QMenu(); - m_buttonNext->setMenu(m_menuForward); - connect(m_menuForward, SIGNAL(aboutToShow()),this, SLOT(aboutToShowHistoryNextMenu())); - - m_supMenu = new QToolButton(this); - m_supMenu->setPopupMode(QToolButton::InstantPopup); - m_supMenu->setIcon(QIcon(":/icons/qupzilla.png")); - m_supMenu->setToolTip(tr("Main Menu")); m_superMenu = new QMenu(this); - m_supMenu->setMenu(m_superMenu); - - m_navigation->addAction(m_buttonBack); - m_navigation->addAction(m_buttonNext); - m_navigation->addAction(m_buttonReload); - m_navigation->addAction(m_buttonStop); - m_navigation->addAction(m_buttonHome); - - m_searchLine = new WebSearchBar(this); - - m_navigationSplitter = new QSplitter(m_navigation); - m_navigationSplitter->addWidget(m_tabWidget->locationBars()); - m_navigationSplitter->addWidget(m_searchLine); - - m_navigationSplitter->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum); - m_navigationSplitter->setCollapsible(0, false); - - m_navigation->addWidget(m_navigationSplitter); - int splitterWidth = m_navigationSplitter->width(); - QList sizes; - sizes << (int)((double)splitterWidth * .75) << (int)((double)splitterWidth * .25); - m_navigationSplitter->setSizes(sizes); - - m_actionExitFullscreen = new QAction(tr("Exit Fullscreen"),this); - m_actionExitFullscreen->setVisible(false); - QWidget* _spacer = new QWidget(); - _spacer->setMinimumWidth(4); - m_navigation->addWidget(_spacer); //Elegant spacer -,- - m_navigation->addAction(m_actionExitFullscreen); - m_navigation->addWidget(m_supMenu); - m_navigation->setContextMenuPolicy(Qt::CustomContextMenu); + m_navigationBar = new NavigationBar(this); + m_bookmarksToolbar = new BookmarksToolbar(this); + m_mainSplitter->addWidget(m_tabWidget); + m_mainLayout->addWidget(m_navigationBar); + m_mainLayout->addWidget(m_bookmarksToolbar); + m_mainLayout->addWidget(m_mainSplitter); + m_mainSplitter->setCollapsible(0, false); + statusBar()->setObjectName("mainwindow-statusbar"); m_progressBar = new ProgressBar(statusBar()); m_privateBrowsing = new QLabel(this); m_privateBrowsing->setPixmap(QPixmap(":/icons/locationbar/privatebrowsing.png")); @@ -225,21 +177,18 @@ void QupZilla::setupUi() m_privateBrowsing->setToolTip(tr("Private Browsing Enabled")); m_adblockIcon = new AdBlockIcon(this); m_ipLabel = new QLabel(this); - m_ipLabel->setStyleSheet("padding-right: 5px;"); + m_ipLabel->setObjectName("statusbar-ip-label"); m_ipLabel->setToolTip(tr("IP Address of current page")); statusBar()->insertPermanentWidget(0, m_progressBar); statusBar()->insertPermanentWidget(1, m_ipLabel); statusBar()->insertPermanentWidget(2, m_privateBrowsing); statusBar()->insertPermanentWidget(3, m_adblockIcon); - - m_bookmarksToolbar = new BookmarksToolbar(this); - addToolBar(m_bookmarksToolbar); - insertToolBarBreak(m_bookmarksToolbar); } void QupZilla::setupMenu() { + menuBar()->setObjectName("mainwindow-menubar"); m_menuTools = new QMenu(tr("Tools")); m_menuHelp = new QMenu(tr("Help")); m_menuBookmarks = new QMenu(tr("Bookmarks")); @@ -312,7 +261,7 @@ void QupZilla::setupMenu() #endif , tr("&Reload"), this); connect(m_actionReload, SIGNAL(triggered()), this, SLOT(reload())); - m_actionReload->setShortcut(QKeySequence("Ctrl+R")); + m_actionReload->setShortcut(QKeySequence("F5")); QAction* actionEncoding = new QAction(tr("Character &Encoding"), this); m_menuEncoding = new QMenu(this); actionEncoding->setMenu(m_menuEncoding); @@ -370,13 +319,6 @@ void QupZilla::setupMenu() aboutToShowToolsMenu(); aboutToShowHelpMenu(); - connect(m_buttonBack, SIGNAL(triggered()), this, SLOT(goBack())); - connect(m_buttonNext, SIGNAL(triggered()), this, SLOT(goNext())); - connect(m_buttonStop, SIGNAL(triggered()), this, SLOT(stop())); - connect(m_buttonReload, SIGNAL(triggered()), this, SLOT(reload())); - connect(m_buttonHome, SIGNAL(triggered()), this, SLOT(goHome())); - connect(m_actionExitFullscreen, SIGNAL(triggered(bool)), this, SLOT(fullScreen(bool))); - m_actionRestoreTab = new QAction(QIcon::fromTheme("user-trash"),tr("Restore &Closed Tab"), this); m_actionRestoreTab->setShortcut(QKeySequence("Ctrl+Shift+T")); connect(m_actionRestoreTab, SIGNAL(triggered()), m_tabWidget, SLOT(restoreClosedTab())); @@ -404,18 +346,6 @@ void QupZilla::setupMenu() m_superMenu->addMenu(m_menuHelp); } -void QupZilla::setBackground(QColor textColor) -{ - QString color = textColor.name(); - setStyleSheet("QMainWindow { background-image: url("+m_activeProfil+"background.png); background-position: top right; } QToolBar{background-image:url(:icons/transp.png); border:none;}" - "QMenuBar{color:"+color+";background-image:url(:icons/transp.png); border:none;} QStatusBar{background-image:url(:icons/transp.png); border:none; color:"+color+";}" - "QMenuBar:item{spacing: 5px; padding: 2px 6px;background: transparent;}" - "QMenuBar::item:pressed { background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 lightgray, stop:1 darkgray); border: 1px solid darkgrey; border-top-left-radius: 4px;border-top-right-radius: 4px; border-bottom: none;}" - ); - m_navigation->setStyleSheet("QSplitter::handle{background-color:transparent;}"); - -} - void QupZilla::loadSettings() { QSettings settings(m_activeProfil+"settings.ini", QSettings::IniFormat); @@ -432,15 +362,13 @@ void QupZilla::loadSettings() //Browser Window settings settings.beginGroup("Browser-View-Settings"); m_menuTextColor = settings.value("menuTextColor", QColor(Qt::black)).value(); - setBackground(m_menuTextColor); - m_bookmarksToolbar->setColor(m_menuTextColor); - m_ipLabel->setStyleSheet("QLabel {color: "+m_menuTextColor.name()+";}"); bool showStatusBar = settings.value("showStatusBar",true).toBool(); bool showHomeIcon = settings.value("showHomeButton",true).toBool(); bool showBackForwardIcons = settings.value("showBackForwardButtons",true).toBool(); bool showBookmarksToolbar = settings.value("showBookmarksToolbar",true).toBool(); bool showNavigationToolbar = settings.value("showNavigationToolbar",true).toBool(); bool showMenuBar = settings.value("showMenubar",true).toBool(); + bool showAddTab = settings.value("showAddTabButton", true).toBool(); bool makeTransparent = settings.value("useTransparentBackground",false).toBool(); QString activeSideBar = settings.value("SideBar", "None").toString(); settings.endGroup(); @@ -450,13 +378,14 @@ void QupZilla::loadSettings() statusBar()->setVisible(showStatusBar); m_bookmarksToolbar->setVisible(showBookmarksToolbar); - m_navigation->setVisible(showNavigationToolbar); + m_navigationBar->setVisible(showNavigationToolbar); menuBar()->setVisible(showMenuBar); - m_navigation->actions().at(m_navigation->actions().count() - 1)->setVisible(!showMenuBar); - m_buttonHome->setVisible(showHomeIcon); - m_buttonBack->setVisible(showBackForwardIcons); - m_buttonNext->setVisible(showBackForwardIcons); + m_navigationBar->buttonSuperMenu()->setVisible(!showMenuBar); + m_navigationBar->buttonHome()->setVisible(showHomeIcon); + m_navigationBar->buttonBack()->setVisible(showBackForwardIcons); + m_navigationBar->buttonNext()->setVisible(showBackForwardIcons); + m_navigationBar->buttonAddTab()->setVisible(showAddTab); if (activeSideBar != "None") { if (activeSideBar == "Bookmarks") @@ -523,76 +452,6 @@ void QupZilla::receiveMessage(MainApplication::MessageType mes, bool state) } } -void QupZilla::refreshHistory() -{ - if (mApp->isClosing()) - return; - - QWebHistory* history = weView()->page()->history(); - m_buttonBack->setEnabled(history->canGoBack()); - m_buttonNext->setEnabled(history->canGoForward()); -} - -void QupZilla::goAtHistoryIndex() -{ - if (QAction* action = qobject_cast(sender())) { - weView()->page()->history()->goToItem(weView()->page()->history()->itemAt(action->data().toInt())); - } - refreshHistory(); -} - -void QupZilla::aboutToShowHistoryBackMenu() -{ - if (!m_menuBack || !weView()) - return; - m_menuBack->clear(); - QWebHistory* history = weView()->history(); - int curindex = history->currentItemIndex(); - int count = 0; - - for (int i = curindex-1; i >= 0; i--) { - QWebHistoryItem item = history->itemAt(i); - if (item.isValid()) { - QString title = item.title(); - if (title.length() > 40) { - title.truncate(40); - title += ".."; - } - QAction* action = m_menuBack->addAction(_iconForUrl(item.url()),title, this, SLOT(goAtHistoryIndex())); - action->setData(i); - count++; - } - if (count == 20) - break; - } -} - -void QupZilla::aboutToShowHistoryNextMenu() -{ - if (!m_menuForward || !weView()) - return; - m_menuForward->clear(); - QWebHistory* history = weView()->history(); - int curindex = history->currentItemIndex(); - int count = 0; - - for (int i = curindex+1; i < history->count(); i++) { - QWebHistoryItem item = history->itemAt(i); - if (item.isValid()) { - QString title = item.title(); - if (title.length() > 40) { - title.truncate(40); - title += ".."; - } - QAction* action = m_menuForward->addAction(_iconForUrl(item.url()),title, this, SLOT(goAtHistoryIndex())); - action->setData(i); - count++; - } - if (count == 20) - break; - } -} - void QupZilla::aboutToShowBookmarksMenu() { if (!m_bookmarksMenuChanged) @@ -779,7 +638,7 @@ void QupZilla::aboutToShowViewMenu() else m_actionStop->setEnabled(false); - m_actionShowToolbar->setChecked(m_navigation->isVisible()); + m_actionShowToolbar->setChecked(m_navigationBar->isVisible()); m_actionShowMenubar->setChecked(menuBar()->isVisible()); m_actionShowStatusbar->setChecked(statusBar()->isVisible()); m_actionShowBookmarksToolbar->setChecked(m_bookmarksToolbar->isVisible()); @@ -953,28 +812,33 @@ void QupZilla::showBookmarksToolbar() void QupZilla::showBookmarksSideBar() { - if (!m_sideBar) { - m_sideBar = new SideBar(this); - addDockWidget(Qt::LeftDockWidgetArea, m_sideBar); + addSideBar(); + + if (m_sideBar->activeWidget() != SideBar::Bookmarks) m_sideBar->showBookmarks(); - } else if (m_actionShowBookmarksSideBar->isChecked()){ - m_sideBar->showBookmarks(); - } else { + else m_sideBar->close(); - } } void QupZilla::showHistorySideBar() { - if (!m_sideBar) { - m_sideBar = new SideBar(this); - addDockWidget(Qt::LeftDockWidgetArea, m_sideBar); + addSideBar(); + + if (m_sideBar->activeWidget() != SideBar::History) m_sideBar->showHistory(); - } else if (m_actionShowHistorySideBar->isChecked()) { - m_sideBar->showHistory(); - } else { + else m_sideBar->close(); - } +} + +void QupZilla::addSideBar() +{ + if (m_sideBar) + return; + + m_sideBar = new SideBar(this); + + m_mainSplitter->insertWidget(0, m_sideBar); + m_mainSplitter->setCollapsible(0, false); } void QupZilla::showNavigationToolbar() @@ -982,8 +846,8 @@ void QupZilla::showNavigationToolbar() if (!menuBar()->isVisible() && !m_actionShowToolbar->isChecked()) showMenubar(); - bool status = m_navigation->isVisible(); - m_navigation->setVisible(!status); + bool status = m_navigationBar->isVisible(); + m_navigationBar->setVisible(!status); QSettings settings(activeProfil()+"settings.ini", QSettings::IniFormat); settings.setValue("Browser-View-Settings/showNavigationToolbar", !status); @@ -991,11 +855,11 @@ void QupZilla::showNavigationToolbar() void QupZilla::showMenubar() { - if (!m_navigation->isVisible() && !m_actionShowMenubar->isChecked()) + if (!m_navigationBar->isVisible() && !m_actionShowMenubar->isChecked()) showNavigationToolbar(); menuBar()->setVisible(!menuBar()->isVisible()); - m_navigation->actions().at(m_navigation->actions().count() - 1)->setVisible(!menuBar()->isVisible()); + m_navigationBar->buttonSuperMenu()->setVisible(!menuBar()->isVisible()); QSettings settings(activeProfil()+"settings.ini", QSettings::IniFormat); settings.setValue("Browser-View-Settings/showMenubar", menuBar()->isVisible()); @@ -1038,23 +902,36 @@ void QupZilla::showInspector() } } +void QupZilla::refreshHistory() +{ + m_navigationBar->refreshHistory(); +} + void QupZilla::aboutQupZilla() { AboutDialog about(this); about.exec(); } +void QupZilla::webSearch() +{ + m_navigationBar->searchLine()->setFocus(); +} + void QupZilla::searchOnPage() { - if (m_mainLayout->count() == 2) { - SearchToolBar* search = qobject_cast( m_mainLayout->itemAt(1)->widget() ); + if (m_mainLayout->count() == 4) { + SearchToolBar* search = qobject_cast( m_mainLayout->itemAt(3)->widget() ); + if (!search) + return; + search->searchLine()->setFocus(); return; } SearchToolBar* search = new SearchToolBar(this); - m_mainLayout->insertWidget(1, search); + m_mainLayout->insertWidget(3, search); search->searchLine()->setFocus(); } @@ -1069,11 +946,11 @@ void QupZilla::showNavigationWithFullscreen() { bool state; if (m_navigationVisible) - state = !m_navigation->isVisible(); + state = !m_navigationBar->isVisible(); else state = !m_tabWidget->getTabBar()->isVisible(); if (m_navigationVisible) - m_navigation->setVisible(state); + m_navigationBar->setVisible(state); m_tabWidget->getTabBar()->setVisible(state); if (m_bookmarksToolBarVisible) m_bookmarksToolbar->setVisible(state); @@ -1084,22 +961,22 @@ void QupZilla::fullScreen(bool make) if (make) { m_menuBarVisible = menuBar()->isVisible(); m_statusBarVisible = statusBar()->isVisible(); - m_navigationVisible = m_navigation->isVisible(); + m_navigationVisible = m_navigationBar->isVisible(); m_bookmarksToolBarVisible = m_bookmarksToolbar->isVisible(); setWindowState(windowState() | Qt::WindowFullScreen); menuBar()->hide(); statusBar()->hide(); bookmarksToolbar()->hide(); - m_navigation->hide(); + m_navigationBar->hide(); } else { setWindowState(windowState() & ~Qt::WindowFullScreen); menuBar()->setVisible(m_menuBarVisible); statusBar()->setVisible(m_statusBarVisible); m_bookmarksToolbar->setVisible(m_bookmarksToolBarVisible); - m_navigation->setVisible(m_navigationVisible); + m_navigationBar->setVisible(m_navigationVisible); } m_actionShowFullScreen->setChecked(make); - m_actionExitFullscreen->setVisible(make); + m_navigationBar->buttonExitFullscreen()->setVisible(make); m_tabWidget->getTabBar()->setVisible(!make); emit setWebViewMouseTracking(make); } @@ -1190,20 +1067,10 @@ bool QupZilla::quitApp() QupZilla::~QupZilla() { delete m_tabWidget; + delete m_navigationBar; delete m_privateBrowsing; delete m_adblockIcon; - delete m_menuBack; - delete m_menuForward; - delete m_searchLine; delete m_bookmarksToolbar; - delete m_buttonBack; - delete m_buttonNext; - delete m_buttonHome; - delete m_buttonStop; - delete m_buttonReload; - delete m_actionExitFullscreen; - delete m_navigationSplitter; - delete m_navigation; delete m_progressBar; if (m_webInspectorDock) { diff --git a/src/app/qupzilla.h b/src/app/qupzilla.h index b7f39dcae..6082546a8 100644 --- a/src/app/qupzilla.h +++ b/src/app/qupzilla.h @@ -19,7 +19,7 @@ #define QUPZILLA_H //Comment for release building -//#define DEVELOPING +#define DEVELOPING #ifdef QT_NO_DEBUG #ifdef DEVELOPING @@ -55,16 +55,13 @@ #include "webtab.h" #include "webview.h" #include "tabwidget.h" -#include "locationbar.h" #include "mainapplication.h" -#include "websearchbar.h" +#include "locationbar.h" class TabWidget; class WebView; class LineEdit; -class LocationBar; class SearchToolBar; -class WebSearchBar; class BookmarksToolbar; class AutoFillModel; class MainApplication; @@ -73,6 +70,8 @@ class AdBlockIcon; class SideBar; class ProgressBar; class StatusBarMessage; +class NavigationBar; +class ClickableLabel; class QupZilla : public QMainWindow { Q_OBJECT @@ -93,7 +92,6 @@ public: void installTranslator(); void loadSettings(); void showInspector(); - void setBackground(QColor textColor); void showNavigationWithFullscreen(); inline WebView* weView() const { WebTab* webTab = qobject_cast(m_tabWidget->widget(m_tabWidget->currentIndex())); if (!webTab) return 0; return webTab->view(); } @@ -102,11 +100,9 @@ public: inline TabWidget* tabWidget() { return m_tabWidget; } inline BookmarksToolbar* bookmarksToolbar() { return m_bookmarksToolbar; } inline StatusBarMessage* statusBarMessage() { return m_statusBarMessage; } + inline NavigationBar* navigationBar() { return m_navigationBar; } - inline QAction* buttonStop(){ return m_buttonStop; } - inline QAction* buttonReload(){ return m_buttonReload; } inline ProgressBar* progressBar(){ return m_progressBar; } - inline QToolBar* navigationToolbar(){ return m_navigation; } inline QString activeProfil(){ return m_activeProfil; } inline QString activeLanguage(){ return m_activeLanguage; } inline QDockWidget* inspectorDock(){ return m_webInspectorDock; } @@ -114,6 +110,7 @@ public: inline QColor menuTextColor() { return m_menuTextColor; } inline QMenu* menuHelp() { return m_menuHelp; } inline QAction* actionRestoreTab() { return m_actionRestoreTab; } + inline QMenu* superMenu() { return m_superMenu; } signals: void loadHistory(); @@ -123,7 +120,6 @@ signals: public slots: void showBookmarksToolbar(); - void refreshHistory(); void loadActionUrl(); void bookmarkPage(); void loadAddress(const QUrl &url); @@ -133,7 +129,6 @@ public slots: private slots: void postLaunch(); - void goAtHistoryIndex(); void goNext() { weView()->forward(); } void goBack() { weView()->back(); } void goHome() { loadAddress(m_homepage); } @@ -145,8 +140,6 @@ private slots: void addTab() { m_tabWidget->addView(QUrl(), tr("New tab"), TabWidget::NewTab, true); } void printPage(); - void aboutToShowHistoryBackMenu(); - void aboutToShowHistoryNextMenu(); void aboutToShowHistoryMenu(); void aboutToShowClosedTabsMenu(); void aboutToShowBookmarksMenu(); @@ -169,6 +162,7 @@ private slots: void showClearPrivateData(); void showPreferences(); + void refreshHistory(); void bookmarkAllTabs(); void newWindow() { mApp->makeNewWindow(false); } @@ -176,7 +170,7 @@ private slots: void openFile(); void savePage(); void sendLink() { QDesktopServices::openUrl(QUrl("mailto:?body="+weView()->url().toString())); } - void webSearch() { m_searchLine->setFocus(); } + void webSearch(); void copy() { QApplication::clipboard()->setText(weView()->selectedText()); } void selectAll() { weView()->selectAll(); } @@ -197,6 +191,8 @@ private: void setupUi(); void setupMenu(); + void addSideBar(); + bool m_tryRestore; bool m_historyMenuChanged; bool m_bookmarksMenuChanged; @@ -205,7 +201,7 @@ private: QUrl m_homepage; QVBoxLayout* m_mainLayout; - QToolButton* m_supMenu; + QSplitter* m_mainSplitter; QMenu* m_superMenu; QMenu* m_menuFile; QMenu* m_menuEdit; @@ -215,8 +211,6 @@ private: QMenu* m_menuBookmarks; QMenu* m_menuHistory; QMenu* m_menuClosedTabs; - QMenu* m_menuBack; - QMenu* m_menuForward; QMenu* m_menuEncoding; QAction* m_actionShowToolbar; QAction* m_actionShowBookmarksToolbar; @@ -236,22 +230,14 @@ private: QPointer m_webInspector; QPointer m_webInspectorDock; - WebSearchBar* m_searchLine; BookmarksToolbar* m_bookmarksToolbar; TabWidget* m_tabWidget; QPointer m_sideBar; StatusBarMessage* m_statusBarMessage; + NavigationBar* m_navigationBar; - QSplitter* m_navigationSplitter; - QAction* m_buttonBack; - QAction* m_buttonNext; - QAction* m_buttonHome; - QAction* m_buttonStop; - QAction* m_buttonReload; - QAction* m_actionExitFullscreen; ProgressBar* m_progressBar; QLabel* m_ipLabel; - QToolBar* m_navigation; QString m_activeProfil; QString m_activeLanguage; diff --git a/src/appicon.rc b/src/appicon.rc index 60dabe303..8f9b0f6e0 100644 --- a/src/appicon.rc +++ b/src/appicon.rc @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "QupZilla Association" VALUE "FileDescription", "QupZilla Web Browser" - VALUE "FileVersion", "1.0.0.b3" + VALUE "FileVersion", "1.0.0.b4" VALUE "LegalCopyright", "Copyright (C) 2010-2011 nowrep" VALUE "InternalName", "qupzilla" VALUE "OriginalFilename", "qupzilla.exe" VALUE "ProductName", "QupZilla" - VALUE "ProductVersion", "1.0.0.b3" + VALUE "ProductVersion", "1.0.0.b4" END END BLOCK "VarFileInfo" diff --git a/src/autofill/autofillmodel.cpp b/src/autofill/autofillmodel.cpp index d28697d52..ec407ee0a 100644 --- a/src/autofill/autofillmodel.cpp +++ b/src/autofill/autofillmodel.cpp @@ -31,7 +31,7 @@ AutoFillModel::AutoFillModel(QupZilla* mainClass, QObject* parent) : void AutoFillModel::loadSettings() { - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("Web-Browser-Settings"); m_isStoring = settings.value("AutoFillForms",true).toBool(); settings.endGroup(); diff --git a/src/autofill/autofillnotification.cpp b/src/autofill/autofillnotification.cpp index 087d3c230..eefae6513 100644 --- a/src/autofill/autofillnotification.cpp +++ b/src/autofill/autofillnotification.cpp @@ -22,7 +22,7 @@ #include "animatedwidget.h" AutoFillNotification::AutoFillNotification(QUrl url, QByteArray data, QString pass, QWidget* parent) - :AnimatedWidget(AnimatedWidget::Down, parent) + :AnimatedWidget(AnimatedWidget::Down, 300, parent) ,ui(new Ui::AutoFillWidget) ,m_url(url) ,m_data(data) diff --git a/src/bookmarks/bookmarkicon.cpp b/src/bookmarks/bookmarkicon.cpp index 7c339e55c..93342abf8 100644 --- a/src/bookmarks/bookmarkicon.cpp +++ b/src/bookmarks/bookmarkicon.cpp @@ -9,9 +9,8 @@ BookmarkIcon::BookmarkIcon(QupZilla* mainClass, QWidget* parent) , p_QupZilla(mainClass) , m_bookmarksModel(0) { - setPixmap(QPixmap(":/icons/locationbar/starg.png")); + setObjectName("locationbar-bookmarkicon"); setCursor(Qt::PointingHandCursor); - setStyleSheet("margin-bottom: 2px;"); setToolTip(tr("Bookmark this Page")); setFocusPolicy(Qt::ClickFocus); @@ -56,3 +55,19 @@ void BookmarkIcon::bookmarkAdded(const BookmarksModel::Bookmark &bookmark) if (bookmark.url == m_lastUrl) setBookmarkSaved(); } + +void BookmarkIcon::setBookmarkSaved() +{ + setProperty("bookmarked", true); + style()->unpolish(this); + style()->polish(this); + setToolTip(tr("Edit this bookmark")); +} + +void BookmarkIcon::setBookmarkDisabled() +{ + setProperty("bookmarked", false); + style()->unpolish(this); + style()->polish(this); + setToolTip(tr("Bookmark this Page")); +} diff --git a/src/bookmarks/bookmarkicon.h b/src/bookmarks/bookmarkicon.h index 16abbd867..e302d336d 100644 --- a/src/bookmarks/bookmarkicon.h +++ b/src/bookmarks/bookmarkicon.h @@ -24,17 +24,9 @@ private slots: void bookmarkDeleted(const BookmarksModel::Bookmark &bookmark); private: - inline void setBookmarkSaved() - { - setPixmap(QPixmap(":/icons/locationbar/star.png")); - setToolTip(tr("Edit this bookmark")); - } + void setBookmarkSaved(); + void setBookmarkDisabled(); - inline void setBookmarkDisabled() - { - setPixmap(QPixmap(":/icons/locationbar/starg.png")); - setToolTip(tr("Bookmark this Page")); - } QupZilla* p_QupZilla; BookmarksModel* m_bookmarksModel; diff --git a/src/bookmarks/bookmarksmanager.ui b/src/bookmarks/bookmarksmanager.ui index 025f25138..a176a2899 100644 --- a/src/bookmarks/bookmarksmanager.ui +++ b/src/bookmarks/bookmarksmanager.ui @@ -76,13 +76,12 @@ PointingHandCursor - - color: blue; -text-decoration: underline; - Optimize Database + + true + diff --git a/src/bookmarks/bookmarksmodel.cpp b/src/bookmarks/bookmarksmodel.cpp index b94f4834d..65bd87721 100644 --- a/src/bookmarks/bookmarksmodel.cpp +++ b/src/bookmarks/bookmarksmodel.cpp @@ -33,7 +33,7 @@ BookmarksModel::BookmarksModel(QObject *parent) void BookmarksModel::loadSettings() { - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("Web-Browser-Settings"); m_showMostVisited = settings.value("showMostVisited",true).toBool(); settings.endGroup(); @@ -41,7 +41,7 @@ void BookmarksModel::loadSettings() void BookmarksModel::setShowingMostVisited(bool state) { - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("Web-Browser-Settings"); settings.setValue("showMostVisited",state); settings.endGroup(); diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp index 7eb78404a..2293c28a8 100644 --- a/src/bookmarks/bookmarkstoolbar.cpp +++ b/src/bookmarks/bookmarkstoolbar.cpp @@ -20,51 +20,40 @@ #include "bookmarksmodel.h" #include "iconprovider.h" #include "historymodel.h" +#include "toolbutton.h" BookmarksToolbar::BookmarksToolbar(QupZilla* mainClass, QWidget* parent) : - QToolBar(parent) + QWidget(parent) ,p_QupZilla(mainClass) ,m_bookmarksModel(mApp->bookmarksModel()) ,m_historyModel(mApp->history()) { - setObjectName("bookmarksToolbar"); - setWindowTitle(tr("Bookmarks")); - setStyleSheet("QToolBar{background-image:url(:icons/transp.png); border:none;}"); - setMovable(false); - setContextMenuPolicy(Qt::CustomContextMenu); + setObjectName("bookmarksbar"); + m_layout = new QHBoxLayout(); + m_layout->setContentsMargins(9, 3, 9, 3); + m_layout->setSpacing(0); + setLayout(m_layout); + setContextMenuPolicy(Qt::CustomContextMenu); connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(customContextMenuRequested(QPoint))); connect(m_bookmarksModel, SIGNAL(bookmarkAdded(BookmarksModel::Bookmark)), this, SLOT(addBookmark(BookmarksModel::Bookmark))); connect(m_bookmarksModel, SIGNAL(bookmarkDeleted(BookmarksModel::Bookmark)), this, SLOT(removeBookmark(BookmarksModel::Bookmark))); connect(m_bookmarksModel, SIGNAL(bookmarkEdited(BookmarksModel::Bookmark,BookmarksModel::Bookmark)), this, SLOT(bookmarkEdited(BookmarksModel::Bookmark,BookmarksModel::Bookmark))); - QTimer::singleShot(0, this, SLOT(refreshBookmarks())); -} - -void BookmarksToolbar::setColor(QColor color) -{ - setStyleSheet("QToolButton {color: "+color.name()+";}"); +// QTimer::singleShot(0, this, SLOT(refreshBookmarks())); + refreshBookmarks(); } void BookmarksToolbar::customContextMenuRequested(const QPoint &pos) { - if (actionAt(pos)) - return; + Q_UNUSED(pos) QMenu menu; menu.addAction(tr("&Bookmark Current Page"), p_QupZilla, SLOT(bookmarkPage())); menu.addAction(tr("Bookmark &All Tabs"), p_QupZilla, SLOT(bookmarkAllTabs())); menu.addAction(QIcon::fromTheme("user-bookmarks"), tr("&Organize Bookmarks"), p_QupZilla, SLOT(showBookmarksManager())); menu.addSeparator(); - menu.addAction( -#ifdef Q_WS_X11 - style()->standardIcon(QStyle::SP_BrowserReload) -#else - QIcon(":/icons/faenza/reload.png") -#endif - ,tr("&Reload Toolbar"), this, SLOT(refreshBookmarks())); - menu.addSeparator(); menu.addAction(m_bookmarksModel->isShowingMostVisited() ? tr("Hide Most &Visited") : tr("Show Most &Visited"), this, SLOT(showMostVisited())); menu.addAction(tr("&Hide Toolbar"), this, SLOT(hidePanel())); @@ -74,54 +63,57 @@ void BookmarksToolbar::customContextMenuRequested(const QPoint &pos) menu.exec(p); } +void BookmarksToolbar::hidePanel() +{ + p_QupZilla->showBookmarksToolbar(); +} + +void BookmarksToolbar::loadClickedBookmark() +{ + ToolButton* button = qobject_cast(sender()); + if (!button) + return; + + p_QupZilla->loadAddress(button->data().toUrl()); +} + void BookmarksToolbar::showMostVisited() { m_bookmarksModel->setShowingMostVisited(!m_bookmarksModel->isShowingMostVisited()); refreshBookmarks(); } -void BookmarksToolbar::hidePanel() -{ - p_QupZilla->showBookmarksToolbar(); -} - void BookmarksToolbar::addBookmark(const BookmarksModel::Bookmark &bookmark) { if (bookmark.folder != "bookmarksToolbar") return; - QAction* action = new QAction(this); QString title = bookmark.title; if (title.length()>15) { title.truncate(13); title+=".."; } - action->setText(title); - action->setData(bookmark.url); - action->setIcon(bookmark.icon); - QToolButton* button = new QToolButton(this); - button->setDefaultAction(action); + ToolButton* button = new ToolButton(this); + button->setText(title); + button->setData(bookmark.url); + button->setIcon(bookmark.icon); button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - button->setMaximumHeight(25); button->setToolTip(bookmark.url.toEncoded()); + button->setAutoRaise(true); button->setWhatsThis(bookmark.title); - connect(action, SIGNAL(triggered()), p_QupZilla, SLOT(loadActionUrl())); - insertWidget(actions().at(actions().count() - 1), button); + connect(button, SIGNAL(clicked()), this, SLOT(loadClickedBookmark())); + m_layout->insertWidget(m_layout->count() - 2, button); } void BookmarksToolbar::removeBookmark(const BookmarksModel::Bookmark &bookmark) { - foreach (QAction* act, actions()) { - QToolButton* button = qobject_cast(widgetForAction(act)); + for (int i = 0; i < m_layout->count(); i++) { + ToolButton* button = qobject_cast(m_layout->itemAt(i)->widget()); if (!button) continue; - QAction* action = button->actions().at(0); - if (!action) - continue; - - if (action->data().toUrl() == bookmark.url) { + if (button->data().toUrl() == bookmark.url) { delete button; return; } @@ -135,25 +127,21 @@ void BookmarksToolbar::bookmarkEdited(const BookmarksModel::Bookmark &before, co else if (before.folder != "bookmarksToolbar" && after.folder == "bookmarksToolbar") //Editing from other folder to toolbar folder -> Add bookmark addBookmark(after); else { //Editing bookmark already in toolbar - foreach (QAction* act, actions()) { - QToolButton* button = qobject_cast(widgetForAction(act)); + for (int i = 0; i < m_layout->count(); i++) { + ToolButton* button = qobject_cast(m_layout->itemAt(i)->widget()); if (!button) continue; - QAction* action = button->actions().at(0); - if (!action) - continue; - - if (action->data().toUrl() == before.url && button->whatsThis() == before.title) { + if (button->data().toUrl() == before.url && button->whatsThis() == before.title) { QString title = after.title; if (title.length()>15) { title.truncate(13); title+=".."; } - action->setText(title); - action->setData(after.url); - action->setIcon(after.icon); + button->setText(title); + button->setData(after.url); + button->setIcon(after.icon); button->setToolTip(after.url.toEncoded()); button->setWhatsThis(after.title); } @@ -163,7 +151,6 @@ void BookmarksToolbar::bookmarkEdited(const BookmarksModel::Bookmark &before, co void BookmarksToolbar::refreshBookmarks() { - clear(); QSqlQuery query; query.exec("SELECT title, url, icon FROM bookmarks WHERE folder='bookmarksToolbar'"); while(query.next()) { @@ -171,32 +158,31 @@ void BookmarksToolbar::refreshBookmarks() QUrl url = query.value(1).toUrl(); QIcon icon = IconProvider::iconFromBase64(query.value(2).toByteArray()); QString title_ = title; - QAction* action = new QAction(this); if (title.length()>15) { title.truncate(13); title+=".."; } - action->setText(title); - action->setData(url); - action->setIcon(icon); - QToolButton* button = new QToolButton(this); - button->setDefaultAction(action); + ToolButton* button = new ToolButton(this); + button->setText(title); + button->setData(url); + button->setIcon(icon); button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - button->setMaximumHeight(25); button->setToolTip(url.toEncoded()); button->setWhatsThis(title_); - connect(action, SIGNAL(triggered()), p_QupZilla, SLOT(loadActionUrl())); - addWidget(button); + button->setAutoRaise(true); + + connect(button, SIGNAL(clicked()), this, SLOT(loadClickedBookmark())); + m_layout->addWidget(button); + } if (!m_bookmarksModel->isShowingMostVisited()) return; - m_mostVis = new QToolButton(this); + m_mostVis = new ToolButton(this); m_mostVis->setPopupMode(QToolButton::InstantPopup); m_mostVis->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - m_mostVis->setMaximumHeight(25); m_mostVis->setIcon(style()->standardIcon(QStyle::SP_DirIcon)); m_mostVis->setText(tr("Most visited")); m_mostVis->setToolTip(tr("Sites You visited the most")); @@ -205,7 +191,8 @@ void BookmarksToolbar::refreshBookmarks() m_mostVis->setMenu(m_menuMostVisited); connect(m_menuMostVisited, SIGNAL(aboutToShow()), this, SLOT(refreshMostVisited())); - addWidget(m_mostVis); + m_layout->addWidget(m_mostVis); + m_layout->addStretch(); } void BookmarksToolbar::refreshMostVisited() diff --git a/src/bookmarks/bookmarkstoolbar.h b/src/bookmarks/bookmarkstoolbar.h index b6b9a5826..23f9dcd12 100644 --- a/src/bookmarks/bookmarkstoolbar.h +++ b/src/bookmarks/bookmarkstoolbar.h @@ -18,31 +18,32 @@ #ifndef BOOKMARKSTOOLBAR_H #define BOOKMARKSTOOLBAR_H -#include #include #include +#include #include "bookmarksmodel.h" class QupZilla; class BookmarksModel; class HistoryModel; -class BookmarksToolbar : public QToolBar +class ToolButton; +class BookmarksToolbar : public QWidget { Q_OBJECT public: explicit BookmarksToolbar(QupZilla* mainClass, QWidget* parent = 0); - void setColor(QColor color); signals: public slots: void refreshBookmarks(); void refreshMostVisited(); - void hidePanel(); void showMostVisited(); private slots: + void loadClickedBookmark(); + void hidePanel(); void addBookmark(const BookmarksModel::Bookmark &bookmark); void removeBookmark(const BookmarksModel::Bookmark &bookmark); void bookmarkEdited(const BookmarksModel::Bookmark &before, const BookmarksModel::Bookmark &after); @@ -53,7 +54,8 @@ private: BookmarksModel* m_bookmarksModel; HistoryModel* m_historyModel; QMenu* m_menuMostVisited; - QToolButton* m_mostVis; + ToolButton* m_mostVis; + QHBoxLayout* m_layout; }; diff --git a/src/cookies/cookiejar.cpp b/src/cookies/cookiejar.cpp index 7a6bb5144..14852593e 100644 --- a/src/cookies/cookiejar.cpp +++ b/src/cookies/cookiejar.cpp @@ -25,7 +25,7 @@ CookieJar::CookieJar(QupZilla* mainClass, QObject* parent) : ,p_QupZilla(mainClass) { loadSettings(); - m_activeProfil = mApp->getActiveProfil(); + m_activeProfil = mApp->getActiveProfilPath(); } void CookieJar::loadSettings() diff --git a/src/cookies/cookiemanager.ui b/src/cookies/cookiemanager.ui index 036afbee5..009cb8c62 100644 --- a/src/cookies/cookiemanager.ui +++ b/src/cookies/cookiemanager.ui @@ -209,7 +209,7 @@ Remove cookie - Del + Del diff --git a/src/data/icons.qrc b/src/data/icons.qrc index a7d5685ca..842c713f0 100644 --- a/src/data/icons.qrc +++ b/src/data/icons.qrc @@ -1,10 +1,5 @@ - icons/navigation/home.png - icons/navigation/reload.png - icons/navigation/stop.png - icons/navigation/vpred.png - icons/navigation/zpet.png icons/qupzilla.png icons/qupzillaupdate.png icons/preferences/applications-accessories.png @@ -26,19 +21,11 @@ icons/preferences/extension.png icons/faenza/settings.png qupzilla.png - icons/locationbar/arrow-down.gif - icons/locationbar/gotoaddress.png - icons/locationbar/lineedit.png icons/locationbar/privatebrowsing.png - icons/locationbar/safeline.png - icons/locationbar/search.png - icons/locationbar/searchchoose.png - icons/locationbar/secure.gif icons/locationbar/unknownpage.png icons/menu/bookmark_add.png icons/menu/book_open_mark.png icons/menu/bug_magnify.png - icons/menu/circle.png icons/menu/csfd.png icons/menu/cz_seznam.png icons/menu/flash.png @@ -53,28 +40,23 @@ icons/other/about.png icons/other/feed.png icons/other/progress.gif - icons/navigation/search.gif - icons/locationbar/star.png - icons/locationbar/starg.png icons/other/bigstar.png icons/other/unsortedbookmarks.png icons/locationbar/accept.png icons/locationbar/warning.png - icons/other/flash.png - icons/other/flashstart.png icons/other/keys.png icons/other/bigrss.png icons/preferences/applications-fonts.png icons/preferences/applications-graphics.png icons/preferences/document-properties.png icons/preferences/stock_keyring.png - icons/other/list-add.png icons/other/adblock.png icons/preferences/stock_dialog-question.png icons/notifications/download.png - icons/other/background.png icons/other/bighistory.png - icons/other/library-bg-top.png - icons/other/library-bg-top-right.png + icons/menu/dot.png + icons/preferences/appereance.png + icons/preferences/style-default.png + icons/other/background.png diff --git a/src/data/icons/menu/dot.png b/src/data/icons/menu/dot.png new file mode 100644 index 000000000..ffad72767 Binary files /dev/null and b/src/data/icons/menu/dot.png differ diff --git a/src/data/icons/other/background.png b/src/data/icons/other/background.png new file mode 100644 index 000000000..cce542d08 Binary files /dev/null and b/src/data/icons/other/background.png differ diff --git a/src/data/icons/other/bighistory.png b/src/data/icons/other/bighistory.png new file mode 100644 index 000000000..1304f0ebe Binary files /dev/null and b/src/data/icons/other/bighistory.png differ diff --git a/src/data/icons/other/semi-transparent.png b/src/data/icons/other/semi-transparent.png new file mode 100644 index 000000000..324216568 Binary files /dev/null and b/src/data/icons/other/semi-transparent.png differ diff --git a/src/data/icons/preferences/appereance.png b/src/data/icons/preferences/appereance.png new file mode 100644 index 000000000..ad4fe724d Binary files /dev/null and b/src/data/icons/preferences/appereance.png differ diff --git a/src/data/icons/preferences/style-default.png b/src/data/icons/preferences/style-default.png new file mode 100644 index 000000000..1300ab9c8 Binary files /dev/null and b/src/data/icons/preferences/style-default.png differ diff --git a/src/desktopnotifications/desktopnotification.cpp b/src/desktopnotifications/desktopnotification.cpp index 1316c0c03..482152f8d 100644 --- a/src/desktopnotifications/desktopnotification.cpp +++ b/src/desktopnotifications/desktopnotification.cpp @@ -26,7 +26,6 @@ DesktopNotification::DesktopNotification(bool setPosition) , m_timer(new QTimer(this)) { ui->setupUi(this); - setStyleSheet("background:transparent;"); setAttribute(Qt::WA_TranslucentBackground); setAttribute(Qt::WA_DeleteOnClose); Qt::WindowFlags flags = Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint; diff --git a/src/desktopnotifications/desktopnotification.ui b/src/desktopnotifications/desktopnotification.ui index 3466ff648..280a65f9b 100644 --- a/src/desktopnotifications/desktopnotification.ui +++ b/src/desktopnotifications/desktopnotification.ui @@ -13,22 +13,12 @@ - - - 0 - - #frame { -border: 2px solid darkblue; -border-radius: 20px; -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #e4ecf1, stop:1 #d3e5f1); -} - QFrame::StyledPanel @@ -75,12 +65,6 @@ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #e4ecf1, stop:1 0 - - QLabel { -font: bold; -font-size: 13pt; -} - diff --git a/src/desktopnotifications/desktopnotificationsfactory.cpp b/src/desktopnotifications/desktopnotificationsfactory.cpp index 4c450d446..34db41e50 100644 --- a/src/desktopnotifications/desktopnotificationsfactory.cpp +++ b/src/desktopnotifications/desktopnotificationsfactory.cpp @@ -28,7 +28,7 @@ DesktopNotificationsFactory::DesktopNotificationsFactory(QObject* parent) void DesktopNotificationsFactory::loadSettings() { - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("Notifications"); m_enabled = settings.value("Enabled", true).toBool(); m_timeout = settings.value("Timeout", 6000).toInt(); diff --git a/src/downloads/downloaditem.ui b/src/downloads/downloaditem.ui index b321a1f82..fa7f492a5 100644 --- a/src/downloads/downloaditem.ui +++ b/src/downloads/downloaditem.ui @@ -38,9 +38,6 @@ - - font-size: 13pt; - A Clockwork Orange.avi @@ -94,16 +91,16 @@ - - SqueezeLabelV2 - QLabel -
squeezelabelv2.h
- ClickableLabel QLabel
clickablelabel.h
 + + SqueezeLabelV2 + QLabel +
squeezelabelv2.h
+ diff --git a/src/downloads/downloadmanager.cpp b/src/downloads/downloadmanager.cpp index 0f319cf0f..6f1ed1dc4 100644 --- a/src/downloads/downloadmanager.cpp +++ b/src/downloads/downloadmanager.cpp @@ -57,7 +57,7 @@ DownloadManager::DownloadManager(QWidget* parent) : void DownloadManager::loadSettings() { - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("DownloadManager"); m_downloadPath = settings.value("defaultDownloadPath", "").toString(); m_lastDownloadPath = settings.value("lastDownloadPath",QDir::homePath()+"/").toString(); @@ -256,7 +256,7 @@ void DownloadManager::fileNameChoosed(const QString &name, bool fileNameAutoGene if (!m_hpath.contains(QDir::tempPath())) m_lastDownloadPath = m_hpath; - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("DownloadManager"); settings.setValue("lastDownloadPath",m_lastDownloadPath); settings.endGroup(); diff --git a/src/downloads/downloadmanager.ui b/src/downloads/downloadmanager.ui index 11373d389..cb183b3e1 100644 --- a/src/downloads/downloadmanager.ui +++ b/src/downloads/downloadmanager.ui @@ -41,9 +41,6 @@ - - border: none; - Qt::ScrollBarAlwaysOff diff --git a/src/history/historymanager.ui b/src/history/historymanager.ui index e306f00c1..ccd875d66 100644 --- a/src/history/historymanager.ui +++ b/src/history/historymanager.ui @@ -76,13 +76,12 @@ PointingHandCursor - - color: blue; -text-decoration: underline; - Optimize Database + + true + diff --git a/src/history/historymodel.cpp b/src/history/historymodel.cpp index 7cd66b5dc..8f5d6d4f1 100644 --- a/src/history/historymodel.cpp +++ b/src/history/historymodel.cpp @@ -30,7 +30,7 @@ HistoryModel::HistoryModel(QupZilla* mainClass, QObject* parent) void HistoryModel::loadSettings() { - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("Web-Browser-Settings"); m_isSaving = settings.value("allowHistory",true).toBool(); settings.endGroup(); diff --git a/src/navigation/locationbar.cpp b/src/navigation/locationbar.cpp index 62ebcd3f1..e87007c08 100644 --- a/src/navigation/locationbar.cpp +++ b/src/navigation/locationbar.cpp @@ -29,6 +29,7 @@ #include "progressbar.h" #include "statusbarmessage.h" #include "locationbarsettings.h" +#include "toolbutton.h" LocationBar::LocationBar(QupZilla* mainClass) : LineEdit() @@ -36,37 +37,30 @@ LocationBar::LocationBar(QupZilla* mainClass) ,m_webView(0) ,m_locationBarSettings(LocationBarSettings::instance()) { - m_siteIcon = new QToolButton(this); + setObjectName("locationbar"); + m_siteIcon = new ToolButton(this); + m_siteIcon->setObjectName("locationbar-siteicon"); m_siteIcon->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); m_siteIcon->setCursor(Qt::ArrowCursor); - m_siteIcon->setMaximumSize(35, 25); - m_siteIcon->setMinimumSize(35, 25); m_siteIcon->setToolTip(tr("Show informations about this page")); -#if QT_VERSION == 0x040800 - m_siteIcon->setStyleSheet("QToolButton{border-image: url(:/icons/locationbar/searchchoose.png); margin-left:2px; padding-left: 4px; }"); -#else - m_siteIcon->setStyleSheet("QToolButton{border-image: url(:/icons/locationbar/searchchoose.png); margin-left:2px;}"); -#endif m_siteIcon->setFocusPolicy(Qt::ClickFocus); m_rssIcon = new ClickableLabel(this); - m_rssIcon->setPixmap(QPixmap(":/icons/menu/rss.png")); + m_rssIcon->setObjectName("locationbar-rss-icon"); m_rssIcon->setCursor(Qt::PointingHandCursor); m_rssIcon->setToolTip(tr("Add RSS from this page...")); - m_rssIcon->setStyleSheet("margin-bottom:2px"); m_rssIcon->setFocusPolicy(Qt::ClickFocus); m_rssIcon->setVisible(false); m_goButton = new ClickableLabel(this); - m_goButton->setPixmap(QPixmap(":/icons/locationbar/gotoaddress.png")); + m_goButton->setObjectName("locationbar-goicon"); m_goButton->setCursor(Qt::PointingHandCursor); m_goButton->setHidden(true); - m_goButton->setStyleSheet("margin-bottom:2px;"); m_bookmarkIcon = new BookmarkIcon(p_QupZilla); ClickableLabel* down = new ClickableLabel(this); - down->setPixmap(QPixmap(":icons/locationbar/arrow-down.gif")); + down->setObjectName("locationbar-down-icon"); down->setCursor(Qt::ArrowCursor); addWidget(down, LineEdit::RightSide); @@ -77,8 +71,6 @@ LocationBar::LocationBar(QupZilla* mainClass) setPlaceholderText(tr("Enter URL address or search on Google.com")); setWidgetSpacing(0); - this->setMinimumHeight(25); - this->setMaximumHeight(25); m_locationCompleter = new LocationCompleter(); setCompleter(m_locationCompleter); @@ -93,10 +85,7 @@ LocationBar::LocationBar(QupZilla* mainClass) connect(m_goButton, SIGNAL(clicked(QPoint)), this, SLOT(urlEnter())); connect(m_rssIcon, SIGNAL(clicked(QPoint)), this, SLOT(rssIconClicked())); - setStyleSheet("QLineEdit { background: transparent; border-image: url(:/icons/locationbar/lineedit.png); border-width:4; color:black;}"); - setLeftMargin(33); clearIcon(); -// setLeftMargin(m_siteIcon->sizeHint().width()+1); } void LocationBar::urlEnter() @@ -138,9 +127,9 @@ void LocationBar::hideGoButton() void LocationBar::showPopup() { //TODO: Fix to next version - return; - emit textEdited(""); - m_locationCompleter->popup()->showNormal(); +// return; +// emit textEdited(""); +// m_locationCompleter->popup()->showNormal(); } void LocationBar::showSiteInfo() @@ -171,20 +160,6 @@ void LocationBar::showUrl(const QUrl &url, bool empty) setText(url.toEncoded()); setCursorPosition(0); } - -// if (m_webView->isLoading()) { -// p_QupZilla->ipLabel()->hide(); -// p_QupZilla->progressBar()->setVisible(true); -// p_QupZilla->progressBar()->setValue(m_webView->getLoading()); -// p_QupZilla->buttonStop()->setVisible(true); -// p_QupZilla->buttonReload()->setVisible(false); -// } else { -// p_QupZilla->progressBar()->setVisible(false); -// p_QupZilla->buttonStop()->setVisible(false); -// p_QupZilla->buttonReload()->setVisible(true); -// p_QupZilla->ipLabel()->show(); -// } - p_QupZilla->statusBarMessage()->clearMessage(); hideGoButton(); @@ -194,16 +169,11 @@ void LocationBar::showUrl(const QUrl &url, bool empty) void LocationBar::siteIconChanged() { -// const QPixmap* icon_ = 0; - QIcon icon_; -// if (!p_QupZilla->weView()->isLoading()) -// icon_ = p_QupZilla->weView()->animationLoading( p_QupZilla->tabWidget()->currentIndex(), false)->pixmap(); - icon_ = m_webView->siteIcon(); + QIcon icon_ = m_webView->siteIcon(); if (icon_.isNull()) { clearIcon(); } else { -// QIcon icon(*icon_); m_siteIcon->setIcon(QIcon(icon_.pixmap(16,16))); } } @@ -215,17 +185,9 @@ void LocationBar::clearIcon() void LocationBar::setPrivacy(bool state) { - QString img; - if (state) - img = "safeline.png"; - else - img = "searchchoose.png"; - -#if QT_VERSION == 0x040800 - m_siteIcon->setStyleSheet("QToolButton{border-image: url(:/icons/locationbar/"+img+"); margin-left:2px; padding-left: 4px; }"); -#else - m_siteIcon->setStyleSheet("QToolButton{border-image: url(:/icons/locationbar/"+img+"); margin-left:2px;}"); -#endif + m_siteIcon->setProperty("secured", state); + m_siteIcon->style()->unpolish(m_siteIcon); + m_siteIcon->style()->polish(m_siteIcon); } void LocationBar::focusOutEvent(QFocusEvent* e) diff --git a/src/navigation/locationbar.h b/src/navigation/locationbar.h index ef9042c19..76bc1c477 100644 --- a/src/navigation/locationbar.h +++ b/src/navigation/locationbar.h @@ -39,9 +39,14 @@ class ClickableLabel; class BookmarkIcon; class WebView; class LocationBarSettings; +class ToolButton; class LocationBar : public LineEdit { Q_OBJECT + Q_PROPERTY(QSize fixedsize READ size WRITE setFixedSize) + Q_PROPERTY(int fixedwidth READ width WRITE setFixedWidth) + Q_PROPERTY(int fixedheight READ height WRITE setFixedHeight) + public: explicit LocationBar(QupZilla* mainClass); ~LocationBar(); @@ -74,7 +79,7 @@ private: BookmarkIcon* m_bookmarkIcon; ClickableLabel* m_goButton; ClickableLabel* m_rssIcon; - QToolButton* m_siteIcon; + ToolButton* m_siteIcon; QupZilla* p_QupZilla; WebView* m_webView; diff --git a/src/navigation/locationbarsettings.cpp b/src/navigation/locationbarsettings.cpp index 808aa04d7..d55a91904 100644 --- a/src/navigation/locationbarsettings.cpp +++ b/src/navigation/locationbarsettings.cpp @@ -20,7 +20,7 @@ LocationBarSettings* LocationBarSettings::instance() void LocationBarSettings::loadSettings() { - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("AddressBar"); selectAllOnDoubleClick = settings.value("SelectAllTextOnDoubleClick",true).toBool(); addComWithCtrl = settings.value("AddComDomainWithCtrlKey",false).toBool(); diff --git a/src/navigation/navigationbar.cpp b/src/navigation/navigationbar.cpp new file mode 100644 index 000000000..76f422464 --- /dev/null +++ b/src/navigation/navigationbar.cpp @@ -0,0 +1,191 @@ +#include "navigationbar.h" +#include "toolbutton.h" +#include "qupzilla.h" +#include "iconprovider.h" +#include "websearchbar.h" +#include "reloadstopbutton.h" + +NavigationBar::NavigationBar(QupZilla *mainClass, QWidget *parent) + : QWidget(parent) + , p_QupZilla(mainClass) +{ + setObjectName("navigationbar"); + m_layout = new QHBoxLayout(this); + m_layout->setContentsMargins(9, 3, 9, 3); + setLayout(m_layout); + + m_buttonBack = new ToolButton(); + m_buttonBack->setObjectName("navigation-button-back"); + m_buttonBack->setToolTip(tr("Back")); + m_buttonBack->setToolButtonStyle(Qt::ToolButtonIconOnly); + m_buttonBack->setAutoRaise(true); + m_buttonBack->setEnabled(false); + + m_buttonNext = new ToolButton(); + m_buttonNext->setObjectName("navigation-button-next"); + m_buttonNext->setToolTip(tr("Forward")); + m_buttonNext->setToolButtonStyle(Qt::ToolButtonIconOnly); + m_buttonNext->setAutoRaise(true); + m_buttonNext->setEnabled(false); + + QHBoxLayout* backNextLayout = new QHBoxLayout(); + backNextLayout->setSpacing(0); + backNextLayout->addWidget(m_buttonBack); + backNextLayout->addWidget(m_buttonNext); + + m_reloadStop = new ReloadStopButton(); + + m_buttonHome = new ToolButton(); + m_buttonHome->setObjectName("navigation-button-home"); + m_buttonHome->setToolTip(tr("Home")); + m_buttonHome->setToolButtonStyle(Qt::ToolButtonIconOnly); + m_buttonHome->setAutoRaise(true); + + m_buttonAddTab = new ToolButton(); + m_buttonAddTab->setObjectName("navigation-button-addtab"); + m_buttonAddTab->setToolTip(tr("New Tab")); + m_buttonAddTab->setToolButtonStyle(Qt::ToolButtonIconOnly); + m_buttonAddTab->setAutoRaise(true); + + m_menuBack = new QMenu(); + m_buttonBack->setMenu(m_menuBack); + m_menuForward = new QMenu(); + m_buttonNext->setMenu(m_menuForward); + + m_supMenu = new ToolButton(this); + m_supMenu->setObjectName("navigation-button-supermenu"); + m_supMenu->setPopupMode(QToolButton::InstantPopup); + m_supMenu->setToolTip(tr("Main Menu")); + m_supMenu->setAutoRaise(true); +// m_supMenu->setVisible(false); + m_supMenu->setMenu(p_QupZilla->superMenu()); + + m_searchLine = new WebSearchBar(p_QupZilla); + + m_navigationSplitter = new QSplitter(this); + m_navigationSplitter->addWidget(p_QupZilla->tabWidget()->locationBars()); + m_navigationSplitter->addWidget(m_searchLine); + + m_navigationSplitter->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum); + m_navigationSplitter->setCollapsible(0, false); + + int splitterWidth = m_navigationSplitter->width(); + QList sizes; + sizes << (int)((double)splitterWidth * .75) << (int)((double)splitterWidth * .25); + m_navigationSplitter->setSizes(sizes); + + m_exitFullscreen = new ToolButton(); + m_exitFullscreen->setText(tr("Exit Fullscreen")); + m_exitFullscreen->setToolTip(tr("Exit Fullscreen")); + m_exitFullscreen->setAutoRaise(true); + m_exitFullscreen->setVisible(false); + + m_layout->addLayout(backNextLayout); + m_layout->addWidget(m_reloadStop); + m_layout->addWidget(m_buttonHome); + m_layout->addWidget(m_buttonAddTab); + m_layout->addWidget(m_navigationSplitter); + m_layout->addWidget(m_supMenu); + m_layout->addWidget(m_exitFullscreen); + + connect(m_menuBack, SIGNAL(aboutToShow()), this, SLOT(aboutToShowHistoryBackMenu())); + connect(m_menuForward, SIGNAL(aboutToShow()), this, SLOT(aboutToShowHistoryNextMenu())); + connect(m_buttonBack, SIGNAL(clicked()), p_QupZilla, SLOT(goBack())); + connect(m_buttonNext, SIGNAL(clicked()), p_QupZilla, SLOT(goNext())); + connect(m_reloadStop->buttonStop(), SIGNAL(clicked()), p_QupZilla, SLOT(stop())); + connect(m_reloadStop->buttonReload(), SIGNAL(clicked()), p_QupZilla, SLOT(reload())); + connect(m_buttonHome, SIGNAL(clicked()), p_QupZilla, SLOT(goHome())); + connect(m_buttonAddTab, SIGNAL(clicked()), p_QupZilla, SLOT(addTab())); + connect(m_exitFullscreen, SIGNAL(clicked(bool)), p_QupZilla, SLOT(fullScreen(bool))); +} + +void NavigationBar::showReloadButton() +{ + m_reloadStop->showReloadButton(); +} + +void NavigationBar::showStopButton() +{ + m_reloadStop->showStopButton(); +} + +void NavigationBar::aboutToShowHistoryBackMenu() +{ + if (!m_menuBack || !p_QupZilla->weView()) + return; + m_menuBack->clear(); + QWebHistory* history = p_QupZilla->weView()->history(); + int curindex = history->currentItemIndex(); + int count = 0; + + for (int i = curindex-1; i >= 0; i--) { + QWebHistoryItem item = history->itemAt(i); + if (item.isValid()) { + QString title = item.title(); + if (title.length() > 40) { + title.truncate(40); + title += ".."; + } + QAction* action = m_menuBack->addAction(_iconForUrl(item.url()),title, this, SLOT(goAtHistoryIndex())); + action->setData(i); + count++; + } + if (count == 20) + break; + } +} + +void NavigationBar::aboutToShowHistoryNextMenu() +{ + if (!m_menuForward || !p_QupZilla->weView()) + return; + m_menuForward->clear(); + QWebHistory* history = p_QupZilla->weView()->history(); + int curindex = history->currentItemIndex(); + int count = 0; + + for (int i = curindex+1; i < history->count(); i++) { + QWebHistoryItem item = history->itemAt(i); + if (item.isValid()) { + QString title = item.title(); + if (title.length() > 40) { + title.truncate(40); + title += ".."; + } + QAction* action = m_menuForward->addAction(_iconForUrl(item.url()),title, this, SLOT(goAtHistoryIndex())); + action->setData(i); + count++; + } + if (count == 20) + break; + } +} + +void NavigationBar::goAtHistoryIndex() +{ + if (QAction* action = qobject_cast(sender())) { + p_QupZilla->weView()->page()->history()->goToItem(p_QupZilla->weView()->page()->history()->itemAt(action->data().toInt())); + } + refreshHistory(); +} + +void NavigationBar::refreshHistory() +{ + if (mApp->isClosing()) + return; + + QWebHistory* history = p_QupZilla->weView()->page()->history(); + m_buttonBack->setEnabled(history->canGoBack()); + m_buttonNext->setEnabled(history->canGoForward()); +} + +NavigationBar::~NavigationBar() +{ + delete m_buttonBack; + delete m_buttonNext; + delete m_buttonHome; + delete m_reloadStop; + delete m_exitFullscreen; + delete m_searchLine; + delete m_navigationSplitter; +} diff --git a/src/navigation/navigationbar.h b/src/navigation/navigationbar.h new file mode 100644 index 000000000..a0af0b0cb --- /dev/null +++ b/src/navigation/navigationbar.h @@ -0,0 +1,61 @@ +#ifndef NAVIGATIONBAR_H +#define NAVIGATIONBAR_H + +#include +#include +#include +#include + +class ToolButton; +class WebSearchBar; +class QupZilla; +class ReloadStopButton; +class NavigationBar : public QWidget +{ + Q_OBJECT +public: + explicit NavigationBar(QupZilla* mainClass, QWidget *parent = 0); + ~NavigationBar(); + + void showReloadButton(); + void showStopButton(); + + inline ToolButton* buttonBack() { return m_buttonBack; } + inline ToolButton* buttonNext() { return m_buttonNext; } + inline ToolButton* buttonHome() { return m_buttonHome; } + inline ToolButton* buttonAddTab() { return m_buttonAddTab; } + inline ToolButton* buttonSuperMenu() { return m_supMenu; } + inline ToolButton* buttonExitFullscreen() { return m_exitFullscreen; } + inline WebSearchBar* searchLine() { return m_searchLine; } + +signals: + +public slots: + void refreshHistory(); + +private slots: + void aboutToShowHistoryNextMenu(); + void aboutToShowHistoryBackMenu(); + void goAtHistoryIndex(); + +private: + QupZilla* p_QupZilla; + + QHBoxLayout* m_layout; + QSplitter* m_navigationSplitter; + ToolButton* m_buttonBack; + ToolButton* m_buttonNext; + ToolButton* m_buttonHome; + ToolButton* m_buttonAddTab; + ToolButton* m_supMenu; + ToolButton* m_exitFullscreen; + ReloadStopButton* m_reloadStop; + + QMenu* m_menuBack; + QMenu* m_menuForward; + + WebSearchBar* m_searchLine; + +}; + +#endif // NAVIGATIONBAR_H diff --git a/src/navigation/reloadstopbutton.cpp b/src/navigation/reloadstopbutton.cpp new file mode 100644 index 000000000..25d0b2b97 --- /dev/null +++ b/src/navigation/reloadstopbutton.cpp @@ -0,0 +1,48 @@ +#include "reloadstopbutton.h" + +ReloadStopButton::ReloadStopButton(QWidget *parent) : + QWidget(parent) +{ + QHBoxLayout* lay = new QHBoxLayout(this); + setLayout(lay); + + m_buttonStop = new ToolButton(); + m_buttonStop->setObjectName("navigation-button-stop"); + m_buttonStop->setToolTip(tr("Stop")); + m_buttonStop->setToolButtonStyle(Qt::ToolButtonIconOnly); + m_buttonStop->setVisible(false); + m_buttonStop->setAutoRaise(true); + + m_buttonReload = new ToolButton(); + m_buttonReload->setObjectName("navigation-button-reload"); + m_buttonReload->setToolTip(tr("Reload")); + m_buttonReload->setToolButtonStyle(Qt::ToolButtonIconOnly); + m_buttonReload->setAutoRaise(true); + + lay->addWidget(m_buttonStop); + lay->addWidget(m_buttonReload); + lay->setContentsMargins(0, 0, 0, 0); + lay->setSpacing(0); +} + +void ReloadStopButton::showReloadButton() +{ + setUpdatesEnabled(false); + m_buttonStop->hide(); + m_buttonReload->show(); + setUpdatesEnabled(true); +} + +void ReloadStopButton::showStopButton() +{ + setUpdatesEnabled(false); + m_buttonReload->hide(); + m_buttonStop->show(); + setUpdatesEnabled(true); +} + +ReloadStopButton::~ReloadStopButton() +{ + delete m_buttonStop; + delete m_buttonReload; +} diff --git a/src/navigation/reloadstopbutton.h b/src/navigation/reloadstopbutton.h new file mode 100644 index 000000000..47b16fc61 --- /dev/null +++ b/src/navigation/reloadstopbutton.h @@ -0,0 +1,30 @@ +#ifndef RELOADSTOPBUTTON_H +#define RELOADSTOPBUTTON_H + +#include + +#include "toolbutton.h" + +class ReloadStopButton : public QWidget +{ + Q_OBJECT +public: + explicit ReloadStopButton(QWidget *parent = 0); + ~ReloadStopButton(); + + void showStopButton(); + void showReloadButton(); + + ToolButton* buttonStop() { return m_buttonStop; } + ToolButton* buttonReload() { return m_buttonReload; } + +signals: + +public slots: + +private: + ToolButton* m_buttonStop; + ToolButton* m_buttonReload; +}; + +#endif // RELOADSTOPBUTTON_H diff --git a/src/navigation/websearchbar.cpp b/src/navigation/websearchbar.cpp index 55a683b7d..7d61310cf 100644 --- a/src/navigation/websearchbar.cpp +++ b/src/navigation/websearchbar.cpp @@ -25,20 +25,14 @@ WebSearchBar::WebSearchBar(QupZilla* mainClass, QWidget* parent) :LineEdit(parent) ,p_QupZilla(mainClass) { + setObjectName("websearchbar"); m_buttonSearch = new ClickableLabel(this); - m_buttonSearch->setPixmap(QPixmap(":/icons/locationbar/search.png")); + m_buttonSearch->setObjectName("websearchbar-searchbutton"); m_buttonSearch->setCursor(QCursor(Qt::PointingHandCursor)); - m_buttonSearch->setStyleSheet("QLabel{margin-bottom:2px;}"); m_buttonSearch->setFocusPolicy(Qt::ClickFocus); m_boxSearchType = new ButtonWithMenu(this); - m_boxSearchType->setMaximumSize(35, 25); - m_boxSearchType->setMinimumSize(35, 25); - - this->setMinimumHeight(25); - this->setMaximumHeight(25); - m_boxSearchType->setStyleSheet("QToolButton{border-image: url(:/icons/locationbar/searchchoose.png); padding-left:-6px; margin-left:2px;}" - "QToolButton::menu-indicator {background-image: url(:icons/locationbar/arrow-down.gif); background-repeat: no-repeat;}"); + m_boxSearchType->setObjectName("websearchbar-searchprovider-comobobox"); addWidget(m_buttonSearch, LineEdit::RightSide); @@ -46,9 +40,6 @@ WebSearchBar::WebSearchBar(QupZilla* mainClass, QWidget* parent) connect(m_buttonSearch, SIGNAL(clicked(QPoint)), this, SLOT(search())); connect(m_boxSearchType, SIGNAL(activeItemChanged(ButtonWithMenu::Item)), this, SLOT(searchChanged(ButtonWithMenu::Item))); - setStyleSheet("QLineEdit { background: transparent; border-image: url(:/icons/locationbar/lineedit.png) ;border-width:4;color:black;}"); - - setLeftMargin(33); setWidgetSpacing(0); setupSearchTypes(); } diff --git a/src/navigation/websearchbar.h b/src/navigation/websearchbar.h index 34b9f7756..3d7cb7ab1 100644 --- a/src/navigation/websearchbar.h +++ b/src/navigation/websearchbar.h @@ -31,6 +31,10 @@ class ClickableLabel; class WebSearchBar : public LineEdit { Q_OBJECT + Q_PROPERTY(QSize fixedsize READ size WRITE setFixedSize) + Q_PROPERTY(int fixedwidth READ width WRITE setFixedWidth) + Q_PROPERTY(int fixedheight READ height WRITE setFixedHeight) + public: explicit WebSearchBar(QupZilla* mainClass, QWidget* parent = 0); diff --git a/src/network/networkmanager.cpp b/src/network/networkmanager.cpp index e915d7413..3307cf1d9 100644 --- a/src/network/networkmanager.cpp +++ b/src/network/networkmanager.cpp @@ -44,12 +44,12 @@ NetworkManager::NetworkManager(QupZilla* mainClass, QObject* parent) : void NetworkManager::loadSettings() { - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("Web-Browser-Settings"); if (settings.value("AllowLocalCache", true).toBool()) { m_diskCache = mApp->networkCache(); - m_diskCache->setCacheDirectory(mApp->getActiveProfil()+"/networkcache"); + m_diskCache->setCacheDirectory(mApp->getActiveProfilPath()+"/networkcache"); m_diskCache->setMaximumCacheSize(settings.value("MaximumCacheSize",50).toInt() * 1024*1024); //MegaBytes setCache(m_diskCache); } @@ -256,7 +256,7 @@ QNetworkReply* NetworkManager::createRequest(QNetworkAccessManager::Operation op void NetworkManager::saveCertExceptions() { - QFile file(mApp->getActiveProfil()+"sslexceptions.dat"); + QFile file(mApp->getActiveProfilPath()+"sslexceptions.dat"); file.open(QIODevice::WriteOnly); QDataStream stream(&file); @@ -272,7 +272,7 @@ void NetworkManager::saveCertExceptions() void NetworkManager::loadCertExceptions() { - QFile file(mApp->getActiveProfil()+"sslexceptions.dat"); + QFile file(mApp->getActiveProfilPath()+"sslexceptions.dat"); file.open(QIODevice::ReadOnly); QDataStream stream(&file); diff --git a/src/network/networkproxyfactory.cpp b/src/network/networkproxyfactory.cpp index e1768f5e1..6d9851b9b 100644 --- a/src/network/networkproxyfactory.cpp +++ b/src/network/networkproxyfactory.cpp @@ -25,7 +25,7 @@ NetworkProxyFactory::NetworkProxyFactory() : void NetworkProxyFactory::loadSettings() { - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("Web-Proxy"); m_proxyPreference = ProxyPreference(settings.value("UseProxy", SystemProxy).toInt()); m_proxyType = QNetworkProxy::ProxyType(settings.value("ProxyType", QNetworkProxy::HttpProxy).toInt()); diff --git a/src/other/aboutdialog.ui b/src/other/aboutdialog.ui index 3ae47f84b..dd0ca23ac 100644 --- a/src/other/aboutdialog.ui +++ b/src/other/aboutdialog.ui @@ -23,9 +23,6 @@ - - background:white; - @@ -39,9 +36,6 @@ - - QTextBrowser { border:none; } - Qt::ScrollBarAlwaysOff diff --git a/src/other/browsinglibrary.cpp b/src/other/browsinglibrary.cpp index d42c482ec..ed1a91ea1 100644 --- a/src/other/browsinglibrary.cpp +++ b/src/other/browsinglibrary.cpp @@ -34,7 +34,7 @@ BrowsingLibrary::BrowsingLibrary(QupZilla* mainClass, QWidget *parent) , m_rssLoaded(false) { ui->setupUi(this); - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("BrowsingLibrary"); resize(settings.value("size", QSize(760, 470)).toSize()); settings.endGroup(); @@ -49,7 +49,6 @@ BrowsingLibrary::BrowsingLibrary(QupZilla* mainClass, QWidget *parent) ui->tabs->AddTab(m_rssManager, QIcon(":/icons/other/bigrss.png"), tr("RSS")); ui->tabs->SetMode(FancyTabWidget::Mode_LargeSidebar); - ui->tabs->SetBackgroundPixmap(QPixmap(":icons/other/background.png")); ui->tabs->setFocus(); connect(ui->tabs, SIGNAL(CurrentChanged(int)), this, SLOT(currentIndexChanged(int))); @@ -137,7 +136,7 @@ void BrowsingLibrary::showRSS(QupZilla* mainClass) void BrowsingLibrary::optimizeDatabase() { mApp->setOverrideCursor(Qt::WaitCursor); - QString profilePath = mApp->getActiveProfil(); + QString profilePath = mApp->getActiveProfilPath(); QString sizeBefore = DownloadItem::fileSizeToString(QFileInfo(profilePath+"/browsedata.db").size()); mApp->history()->optimizeHistory(); QString sizeAfter = DownloadItem::fileSizeToString(QFileInfo(profilePath+"/browsedata.db").size()); @@ -147,7 +146,7 @@ void BrowsingLibrary::optimizeDatabase() void BrowsingLibrary::closeEvent(QCloseEvent *e) { - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("BrowsingLibrary"); settings.setValue("size", size()); settings.endGroup(); diff --git a/src/other/browsinglibrary.ui b/src/other/browsinglibrary.ui index 279e32962..87c3e0d01 100644 --- a/src/other/browsinglibrary.ui +++ b/src/other/browsinglibrary.ui @@ -41,9 +41,6 @@ 25 - - background: url(':icons/other/library-bg-top.png') no-repeat; - @@ -54,9 +51,6 @@ 25 - - background: url(':icons/other/library-bg-top-right.png') repeat; - 0 @@ -85,12 +79,6 @@ 23 - - QLineEdit -{ - background: transparent; border-image: url(:/icons/locationbar/lineedit.png); border-width:4; color:black; -} - Search... diff --git a/src/other/clearprivatedata.ui b/src/other/clearprivatedata.ui index 16c7e44e9..418f93c56 100644 --- a/src/other/clearprivatedata.ui +++ b/src/other/clearprivatedata.ui @@ -2,6 +2,14 @@ ClearPrivateData + + + 0 + 0 + 308 + 243 + + Clear Recent History @@ -59,12 +67,12 @@ PointingHandCursor - - color: blue; text-decoration: underline; - Clear cookies from Adobe Flash Player + + true + diff --git a/src/other/sourceviewer.cpp b/src/other/sourceviewer.cpp index 1b148e59a..7396f587c 100644 --- a/src/other/sourceviewer.cpp +++ b/src/other/sourceviewer.cpp @@ -28,6 +28,7 @@ SourceViewer::SourceViewer(QWebPage* page, const QString &selectedHtml) : setWindowTitle(tr("Source of ")+page->mainFrame()->url().toString()); m_layout = new QBoxLayout(QBoxLayout::TopToBottom, this); m_sourceEdit = new QTextEdit(this); + m_sourceEdit->setObjectName("sourceviewer-textedit"); m_statusBar = new QStatusBar(this); m_statusBar->showMessage(page->mainFrame()->url().toString()); @@ -45,7 +46,6 @@ SourceViewer::SourceViewer(QWebPage* page, const QString &selectedHtml) : this->resize(650, 600); m_sourceEdit->setReadOnly(true); m_sourceEdit->moveCursor(QTextCursor::Start); - m_sourceEdit->setStyleSheet("QTextEdit{border:none;}"); QFont font; font.setFamily("Tahoma"); diff --git a/src/other/sourceviewersearch.cpp b/src/other/sourceviewersearch.cpp index 4681e3a36..55a272d33 100644 --- a/src/other/sourceviewersearch.cpp +++ b/src/other/sourceviewersearch.cpp @@ -66,22 +66,26 @@ void SourceViewerSearch::activateLineEdit() void SourceViewerSearch::next() { - if (!find(0)) { - ui->lineEdit->setStyleSheet("QLineEdit {background:#ff6666;; }"); + bool found = find(0); + if (!found) m_sourceViewer->sourceEdit()->moveCursor(QTextCursor::Start); - } else { - ui->lineEdit->setStyleSheet(""); - } + + ui->lineEdit->setProperty("notfound", !found); + + ui->lineEdit->style()->unpolish(ui->lineEdit); + ui->lineEdit->style()->polish(ui->lineEdit); } void SourceViewerSearch::previous() { - if (!find(QTextDocument::FindBackward)) { - ui->lineEdit->setStyleSheet("QLineEdit {background:#ff6666;; }"); + bool found = find(QTextDocument::FindBackward); + if (!found) m_sourceViewer->sourceEdit()->moveCursor(QTextCursor::Start); - } else { - ui->lineEdit->setStyleSheet(""); - } + + ui->lineEdit->setProperty("notfound", !found); + + ui->lineEdit->style()->unpolish(ui->lineEdit); + ui->lineEdit->style()->polish(ui->lineEdit); } bool SourceViewerSearch::find(QTextDocument::FindFlags flags) diff --git a/src/plugins/clicktoflash.cpp b/src/plugins/clicktoflash.cpp index 169d96142..de02f5e64 100644 --- a/src/plugins/clicktoflash.cpp +++ b/src/plugins/clicktoflash.cpp @@ -58,10 +58,11 @@ ClickToFlash::ClickToFlash(const QUrl &pluginUrl, const QStringList &argumentNam horizontalLayout = new QHBoxLayout(this); frame = new QFrame(this); - frame->setStyleSheet("QFrame { border: 1px solid #e8e8e8; }"); + frame->setObjectName("click2flash-frame"); frame->setContentsMargins(0,0,0,0); horizontalLayout_2 = new QHBoxLayout(frame); toolButton = new QToolButton(this); + toolButton->setObjectName("click2flash-toolbutton"); //AdBlock AdBlockManager* manager = AdBlockManager::instance(); @@ -75,10 +76,6 @@ ClickToFlash::ClickToFlash(const QUrl &pluginUrl, const QStringList &argumentNam } toolButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - toolButton->setStyleSheet("QToolButton { background: url(:/icons/other/flash.png) no-repeat;\n" - "background-position: center; border: none;}\n" - "QToolButton:hover { background: url(:/icons/other/flashstart.png) no-repeat; \n" - "background-position: center; border:none;}"); toolButton->setCursor(Qt::PointingHandCursor); horizontalLayout_2->addWidget(toolButton); horizontalLayout->addWidget(frame); diff --git a/src/plugins/pluginproxy.cpp b/src/plugins/pluginproxy.cpp index 2a8637434..a5e5fc3b5 100644 --- a/src/plugins/pluginproxy.cpp +++ b/src/plugins/pluginproxy.cpp @@ -81,7 +81,7 @@ QNetworkReply* PluginProxy::createNetworkRequest(QNetworkAccessManager::Operatio void PluginProxy::c2f_loadSettings() { - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("ClickToFlash"); c2f_whitelist = settings.value("whitelist", QStringList()).toStringList(); c2f_enabled = settings.value("Enabled", true).toBool(); @@ -90,7 +90,7 @@ void PluginProxy::c2f_loadSettings() void PluginProxy::c2f_saveSettings() { - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("ClickToFlash"); settings.setValue("whitelist", c2f_whitelist); settings.setValue("Enabled", c2f_enabled); diff --git a/src/plugins/plugins.cpp b/src/plugins/plugins.cpp index 4da4c0ca9..ea1cff281 100644 --- a/src/plugins/plugins.cpp +++ b/src/plugins/plugins.cpp @@ -29,7 +29,7 @@ void Plugins::loadSettings() { m_allowedPluginFileNames.clear(); - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("Plugin-Settings"); m_pluginsEnabled = settings.value("EnablePlugins", true).toBool(); m_allowedPluginFileNames = settings.value("AllowedPlugins", QStringList()).toStringList(); @@ -44,7 +44,7 @@ void Plugins::loadPlugins() m_availablePluginFileNames.clear(); loadedPlugins.clear(); - QDir pluginsDir = QDir(mApp->DATADIR+"plugins/"); + QDir pluginsDir = QDir(mApp->PLUGINSDIR); foreach (QString fileName, pluginsDir.entryList(QDir::Files)) { m_availablePluginFileNames.append(fileName); @@ -56,7 +56,7 @@ void Plugins::loadPlugins() QObject* plugin = loader.instance(); if (plugin) { PluginInterface* iPlugin = qobject_cast(plugin); - iPlugin->init(mApp->getActiveProfil()+"plugins.ini"); + iPlugin->init(mApp->getActiveProfilPath()+"plugins.ini"); if (!iPlugin->testPlugin()) { loader.unload(); continue; @@ -72,7 +72,7 @@ void Plugins::loadPlugins() PluginInterface* Plugins::getPlugin(QString pluginFileName) { - QString path = mApp->DATADIR+"plugins/"+pluginFileName; + QString path = mApp->PLUGINSDIR + pluginFileName; if (!QFile::exists(path)) return 0; QPluginLoader loader(path); diff --git a/src/preferences/pluginslist.cpp b/src/preferences/pluginslist.cpp index bc5dbe07f..f20c6bd4e 100644 --- a/src/preferences/pluginslist.cpp +++ b/src/preferences/pluginslist.cpp @@ -34,7 +34,7 @@ PluginsList::PluginsList(QWidget* parent) : connect(ui->butLoad, SIGNAL(clicked()), this, SLOT(reloadPlugins())); connect(ui->allowAppPlugins, SIGNAL(clicked(bool)), this, SLOT(allowAppPluginsChanged(bool))); - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("Plugin-Settings"); ui->allowAppPlugins->setChecked( settings.value("EnablePlugins",true).toBool() ); settings.endGroup(); @@ -78,7 +78,7 @@ void PluginsList::removeWhitelist() void PluginsList::save() { - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("Plugin-Settings"); settings.setValue("EnablePlugins",ui->allowAppPlugins->isChecked()); settings.endGroup(); @@ -88,7 +88,7 @@ void PluginsList::save() void PluginsList::allowAppPluginsChanged(bool state) { - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("Plugin-Settings"); settings.setValue("EnablePlugins", state); settings.endGroup(); @@ -98,7 +98,7 @@ void PluginsList::allowAppPluginsChanged(bool state) void PluginsList::allowC2FChanged(bool state) { - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("ClickToFlash"); settings.setValue("Enable", state); settings.endGroup(); @@ -175,7 +175,7 @@ void PluginsList::reloadPlugins() if (ui->list->item(i)->checkState() == Qt::Checked) allowedPlugins.append(ui->list->item(i)->toolTip()); } - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("Plugin-Settings"); settings.setValue("AllowedPlugins",allowedPlugins); settings.endGroup(); diff --git a/src/preferences/preferences.cpp b/src/preferences/preferences.cpp index 3149e24dc..666c98b7f 100644 --- a/src/preferences/preferences.cpp +++ b/src/preferences/preferences.cpp @@ -34,6 +34,8 @@ #include "networkmanager.h" #include "desktopnotificationsfactory.h" #include "desktopnotification.h" +#include "navigationbar.h" +#include "thememanager.h" bool removeFile(const QString &fullFileName) { @@ -73,7 +75,7 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent) : ui->setupUi(this); m_bgLabelSize = this->sizeHint(); - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); //GENERAL URLs settings.beginGroup("Web-URL-Settings"); m_homepage = settings.value("homepage","http://qupzilla.ic.cz/search/").toString(); @@ -98,13 +100,13 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent) : connect(ui->newTabUseActual, SIGNAL(clicked()), this, SLOT(useActualNewTab())); //PROFILES - m_actProfileName = mApp->getActiveProfil(); + m_actProfileName = mApp->getActiveProfilPath(); m_actProfileName = m_actProfileName.left(m_actProfileName.length()-1); m_actProfileName = m_actProfileName.mid(m_actProfileName.lastIndexOf("/")); m_actProfileName.remove("/"); ui->startProfile->addItem(m_actProfileName); QDir profilesDir(QDir::homePath()+"/.qupzilla/profiles/"); - QStringList list_ = profilesDir.entryList(QStringList(), QDir::Dirs | QDir::NoDotAndDotDot); + QStringList list_ = profilesDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot); foreach (QString name, list_) { if (m_actProfileName == name) continue; @@ -114,31 +116,20 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent) : connect(ui->deleteProfile, SIGNAL(clicked()), this, SLOT(deleteProfile())); connect(ui->startProfile, SIGNAL(currentIndexChanged(QString)), this, SLOT(startProfileIndexChanged(QString))); - //WINDOW + //APPEREANCE + m_themesManager = new ThemeManager(ui->themesWidget); settings.beginGroup("Browser-View-Settings"); ui->showStatusbar->setChecked( settings.value("showStatusBar",true).toBool() ); ui->showBookmarksToolbar->setChecked( p_QupZilla->bookmarksToolbar()->isVisible() ); - ui->showNavigationToolbar->setChecked( p_QupZilla->navigationToolbar()->isVisible() ); + ui->showNavigationToolbar->setChecked( p_QupZilla->navigationBar()->isVisible() ); ui->showHome->setChecked( settings.value("showHomeButton",true).toBool() ); ui->showBackForward->setChecked( settings.value("showBackForwardButtons",true).toBool() ); ui->showAddTabButton->setChecked( settings.value("showAddTabButton", true).toBool() ); - if (settings.value("useTransparentBackground",false).toBool()) - ui->useTransparentBg->setChecked(true); - else - ui->useBgImage->setChecked(true); - - m_menuTextColor = settings.value("menuTextColor", QColor(Qt::black)).value(); - ui->textColor->setStyleSheet("color: "+m_menuTextColor.name()+";"); - useBgImageChanged(ui->useBgImage->isChecked()); + ui->useTransparentBg->setChecked( settings.value("useTransparentBackground",false).toBool() ); settings.endGroup(); #ifdef Q_WS_WIN ui->useTransparentBg->setEnabled(QtWin::isCompositionEnabled()); #endif - connect(ui->useBgImage, SIGNAL(toggled(bool)), this, SLOT(useBgImageChanged(bool))); - connect(ui->backgroundButton, SIGNAL(clicked()), this, SLOT(chooseBackgroundPath())); - connect(ui->resetDefaultBgButton, SIGNAL(clicked()), this, SLOT(resetBackground())); - connect(ui->textColorChooser, SIGNAL(clicked()), this, SLOT(chooseColor())); - updateBgLabel(); //TABS settings.beginGroup("Browser-Tabs-Settings"); @@ -285,7 +276,7 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent) : } ui->languages->addItem("English (en_US)"); - QDir lanDir(mApp->DATADIR+"locale"); + QDir lanDir(mApp->TRANSLATIONSDIR); QStringList list = lanDir.entryList(QStringList("*.qm")); foreach(QString name, list) { if (name.startsWith("qt_") || name == activeLanguage) @@ -350,13 +341,6 @@ void Preferences::showStackedPage(QListWidgetItem* item) delete m_notification; } } - -void Preferences::chooseColor() -{ - m_menuTextColor = QColorDialog::getColor(Qt::black, this); - ui->textColor->setStyleSheet("color: "+m_menuTextColor.name()+";"); -} - void Preferences::allowCacheChanged(bool state) { ui->cacheFrame->setEnabled(state); @@ -373,22 +357,6 @@ void Preferences::useActualNewTab() ui->newTabUrl->setText(p_QupZilla->weView()->url().toString()); } -void Preferences::resetBackground() -{ - QFile::remove(p_QupZilla->activeProfil()+"background.png"); - QFile(mApp->DATADIR+"data/default/profiles/default/background.png").copy(p_QupZilla->activeProfil()+"background.png"); - - m_menuTextColor = QColor(Qt::black); - ui->textColor->setStyleSheet("color: "+m_menuTextColor.name()+";"); - - updateBgLabel(); -} - -void Preferences::updateBgLabel() -{ - ui->bgLabel->setStyleSheet("#bgLabel {background: url("+p_QupZilla->activeProfil()+"background.png) top right;}"); -} - void Preferences::chooseDownPath() { QString userFileName = QFileDialog::getExistingDirectory(p_QupZilla, tr("Choose download location..."), QDir::homePath()); @@ -397,17 +365,6 @@ void Preferences::chooseDownPath() ui->downLoc->setText(userFileName); } -void Preferences::chooseBackgroundPath() -{ - QString file = QFileDialog::getOpenFileName(p_QupZilla, tr("Choose background location..."), QDir::homePath(), "*.png"); - if (file.isEmpty()) - return; - QFile::remove(p_QupZilla->activeProfil()+"background.png"); - QFile(file).copy(p_QupZilla->activeProfil()+"background.png"); - - updateBgLabel(); -} - void Preferences::chooseUserStyleClicked() { QString file = QFileDialog::getOpenFileName(p_QupZilla, tr("Choose stylesheet location..."), QDir::homePath(), "*.css"); @@ -424,11 +381,6 @@ void Preferences::newTabChanged() ui->newTabFrame->setVisible(false); } -void Preferences::useBgImageChanged(bool state) -{ - ui->bgLabel->setEnabled(state); -} - void Preferences::downLocChanged(bool state) { ui->downButt->setEnabled(state); @@ -562,7 +514,7 @@ void Preferences::startProfileIndexChanged(QString index) void Preferences::saveSettings() { - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); //GENERAL URLs settings.beginGroup("Web-URL-Settings"); settings.setValue("homepage",ui->homepage->text()); @@ -722,6 +674,7 @@ void Preferences::saveSettings() profileSettings.setValue("Profiles/startProfile",ui->startProfile->currentText()); m_pluginsList->save(); + m_themesManager->save(); mApp->cookieJar()->loadSettings(); mApp->history()->loadSettings(); mApp->reloadSettings(); diff --git a/src/preferences/preferences.h b/src/preferences/preferences.h index 8b367975b..dcfa2c2ca 100644 --- a/src/preferences/preferences.h +++ b/src/preferences/preferences.h @@ -33,7 +33,7 @@ class AutoFillManager; class QupZilla; class PluginsList; class DesktopNotification; - +class ThemeManager; class Preferences : public QDialog { Q_OBJECT @@ -50,11 +50,8 @@ private slots: void newTabChanged(); void chooseDownPath(); void showCookieManager(); - void chooseBackgroundPath(); void useActualHomepage(); void useActualNewTab(); - void resetBackground(); - void chooseColor(); void openSslManager(); void chooseUserStyleClicked(); @@ -64,7 +61,6 @@ private slots: void downLocChanged(bool state); void allowCacheChanged(bool state); void showPassManager(bool state); - void useBgImageChanged(bool state); void setManualProxyConfigurationEnabled(bool state); void cacheValueChanged(int value); void pageCacheValueChanged(int value); @@ -74,11 +70,11 @@ private slots: void startProfileIndexChanged(QString index); private: - void updateBgLabel(); Ui::Preferences* ui; QupZilla* p_QupZilla; AutoFillManager* m_autoFillManager; PluginsList* m_pluginsList; + ThemeManager* m_themesManager; QPointer m_notification; QColor m_menuTextColor; diff --git a/src/preferences/preferences.ui b/src/preferences/preferences.ui index 66d16aac6..69982fb8f 100644 --- a/src/preferences/preferences.ui +++ b/src/preferences/preferences.ui @@ -67,14 +67,14 @@ - Window + Appereance 1 - :/icons/preferences/gnome-window-manager.png:/icons/preferences/gnome-window-manager.png + :/icons/preferences/appereance.png:/icons/preferences/appereance.png @@ -472,192 +472,150 @@ - - - - - <b>Browser Window</b> + + + + + 0 - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - - - - - - Show StatusBar on start + + + Themes + + + + 0 - - - - - - Show Bookmarks ToolBar on start - - - - - - - Show Navigation ToolBar on start - - - - - - - Show Add Tab button - - - - - - - - - <b>Navigation ToolBar</b> - + + + + + + + + Advanced options + + + + + + <b>Browser Window</b> + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + + + Show StatusBar on start + + + + + + + Show Bookmarks ToolBar on start + + + + + + + Show Navigation ToolBar on start + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + <b>Navigation ToolBar</b> + + + + + + + Show Home button + + + + + + + Show Back / Forward buttons + + + + + + + Show Add Tab button + + + + + + + <b>Background<b/> + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Use transparent background + + + + + - - - - Show Home button - - - - - - - Show Back / Forward buttons - - - - - - - <b>Background<b/> - - - - - - - Use transparent background - - - - - - - Use background image - - - - - - - Menu text color - - - - - - - - 0 - 0 - - - - - - - - 9 - - - 0 - - - - - Reset default - - - - - - - Choose image... - - - - - - - Qt::Horizontal - - - - 0 - 0 - - - - - - - - This is text color used in Menu - - - - - - - Qt::Horizontal - - - - 0 - 0 - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -1962,13 +1920,6 @@ - - - SqueezeLabelV2 - QLabel -
squeezelabelv2.h
- - diff --git a/src/preferences/sslmanager.cpp b/src/preferences/sslmanager.cpp index 6b67e100b..7bb9aaa41 100644 --- a/src/preferences/sslmanager.cpp +++ b/src/preferences/sslmanager.cpp @@ -34,7 +34,7 @@ SSLManager::SSLManager(QWidget* parent) : connect(ui->deleteButton, SIGNAL(clicked()), this, SLOT(deleteCertificate())); connect(ui->ignoreAll, SIGNAL(clicked(bool)), this, SLOT(ignoreAll(bool))); - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("Web-Browser-Settings"); ui->ignoreAll->setChecked( settings.value("IgnoreAllSSLWarnings", false).toBool() ); settings.endGroup(); @@ -94,7 +94,7 @@ void SSLManager::deleteCertificate() void SSLManager::ignoreAll(bool state) { - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("Web-Browser-Settings"); settings.setValue("IgnoreAllSSLWarnings", state); settings.endGroup(); diff --git a/src/preferences/thememanager.cpp b/src/preferences/thememanager.cpp new file mode 100644 index 000000000..25e7f5f47 --- /dev/null +++ b/src/preferences/thememanager.cpp @@ -0,0 +1,108 @@ +#include "thememanager.h" +#include "ui_thememanager.h" +#include "mainapplication.h" + +ThemeManager::ThemeManager(QWidget* parent) + : QWidget() + , ui(new Ui::ThemeManager) +{ + ui->setupUi(parent); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); + settings.beginGroup("Themes"); + m_activeTheme = settings.value("activeTheme", "default").toString(); + settings.endGroup(); + + QDir themeDir(mApp->THEMESDIR); + QStringList list = themeDir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot); + foreach(QString name, list) { + Theme themeInfo = parseTheme(name); + if (!themeInfo.isValid) + continue; + + QListWidgetItem* item = new QListWidgetItem(ui->listWidget); + item->setText(themeInfo.name + "\n" + themeInfo.shortDescription); + item->setIcon(themeInfo.icon); + item->setData(Qt::UserRole, name); + + if (m_activeTheme == name) + ui->listWidget->setCurrentItem(item); + + ui->listWidget->addItem(item); + } + + connect(ui->listWidget, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), this, SLOT(currentChanged())); + + currentChanged(); +} + +void ThemeManager::currentChanged() +{ + QListWidgetItem* currentItem = ui->listWidget->currentItem(); + if (!currentItem) + return; + + Theme currentTheme = m_themeHash[currentItem->data(Qt::UserRole).toString()]; + + ui->name->setText(currentTheme.name); + ui->author->setText(currentTheme.author); + ui->descirption->setText(currentTheme.longDescription); +} + +ThemeManager::Theme ThemeManager::parseTheme(const QString &name) +{ + Theme info; + info.name = name; + + QString path = mApp->THEMESDIR + name + "/"; + if (!QFile(path + "main.css").exists() || !QFile(path + "theme.info").exists()) { + info.isValid = false; + return info; + } + + if (QFile(path + "theme.png").exists()) + info.icon = QIcon(path + "theme.png"); + else + info.icon = QIcon(":icons/preferences/style-default.png"); + + QFile file(path + "theme.info"); + file.open(QFile::ReadOnly); + QString theme_info = file.readAll(); + + QRegExp rx("Name:(.*)\\n"); + rx.setMinimal(true); + rx.indexIn(theme_info); + if (rx.captureCount() == 1) + info.name = rx.cap(1).trimmed(); + + rx.setPattern("Author:(.*)\\n"); + rx.indexIn(theme_info); + if (rx.captureCount() == 1) + info.author = rx.cap(1).trimmed(); + + rx.setPattern("Short Description:(.*)\\n"); + rx.indexIn(theme_info); + if (rx.captureCount() == 1) + info.shortDescription = rx.cap(1).trimmed(); + + rx.setPattern("Long Description:(.*)\\n"); + rx.indexIn(theme_info); + if (rx.captureCount() == 1) + info.longDescription = rx.cap(1).trimmed(); + + info.isValid = true; + m_themeHash.insert(name, info); + return info; +} + +void ThemeManager::save() +{ + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); + settings.beginGroup("Themes"); + settings.setValue("activeTheme", ui->listWidget->currentItem()->data(Qt::UserRole)); + settings.endGroup(); +} + +ThemeManager::~ThemeManager() +{ + delete ui; +} diff --git a/src/preferences/thememanager.h b/src/preferences/thememanager.h new file mode 100644 index 000000000..a9b24db11 --- /dev/null +++ b/src/preferences/thememanager.h @@ -0,0 +1,44 @@ +#ifndef THEMEMANAGER_H +#define THEMEMANAGER_H + +#include +#include +#include +#include +#include + +namespace Ui { + class ThemeManager; +} + +class ThemeManager : public QWidget +{ + Q_OBJECT + +public: + explicit ThemeManager(QWidget* parent); + ~ThemeManager(); + + void save(); + +private slots: + void currentChanged(); + +private: + struct Theme { + bool isValid; + QIcon icon; + QString name; + QString author; + QString shortDescription; + QString longDescription; + }; + + Theme parseTheme(const QString &name); + + Ui::ThemeManager *ui; + QString m_activeTheme; + QHash m_themeHash; +}; + +#endif // THEMEMANAGER_H diff --git a/src/preferences/thememanager.ui b/src/preferences/thememanager.ui new file mode 100644 index 000000000..a8ac79078 --- /dev/null +++ b/src/preferences/thememanager.ui @@ -0,0 +1,96 @@ + + + ThemeManager + + + + 0 + 0 + 512 + 367 + + + + + + + + + + + 0 + 0 + + + + + 4 + + + + + <b>Name:</b> + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + <b>Author:</b> + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + <b>Description:</b> + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + + + true + + + + + + + + + + true + + + + + + + + + + true + + + + + + + + + + + diff --git a/src/rss/rssmanager.cpp b/src/rss/rssmanager.cpp index 608eb1e33..799acbe1e 100644 --- a/src/rss/rssmanager.cpp +++ b/src/rss/rssmanager.cpp @@ -94,7 +94,7 @@ void RSSManager::refreshTable() ui->edit->setEnabled(false); QFrame *frame = new QFrame(); - frame->setStyleSheet("background: white;"); + frame->setObjectName("rssmanager-frame"); QVBoxLayout *verticalLayout = new QVBoxLayout(frame); QLabel *label_2 = new QLabel(frame); label_2->setPixmap(QPixmap(":/icons/menu/rss.png")); diff --git a/src/rss/rssmanager.ui b/src/rss/rssmanager.ui index 248730ec3..28cfbd99c 100644 --- a/src/rss/rssmanager.ui +++ b/src/rss/rssmanager.ui @@ -26,9 +26,6 @@ Qt::NoFocus - - QTabBar::tab{ max-width:100px;} - false @@ -103,13 +100,12 @@ PointingHandCursor - - color: blue; -text-decoration: underline; - Optimize Database + + true + diff --git a/src/rss/rssnotification.cpp b/src/rss/rssnotification.cpp index e8a19daf3..4bef810e8 100644 --- a/src/rss/rssnotification.cpp +++ b/src/rss/rssnotification.cpp @@ -21,7 +21,7 @@ #include "qupzilla.h" RSSNotification::RSSNotification(QString host, QWidget* parent) : - AnimatedWidget(AnimatedWidget::Down, parent), + AnimatedWidget(AnimatedWidget::Down, 300, parent), ui(new Ui::RSSNotification) { setAttribute(Qt::WA_DeleteOnClose); diff --git a/src/sidebar/bookmarkssidebar.ui b/src/sidebar/bookmarkssidebar.ui index 1d14dee6a..ece11b41e 100644 --- a/src/sidebar/bookmarkssidebar.ui +++ b/src/sidebar/bookmarkssidebar.ui @@ -6,7 +6,7 @@ 0 0 - 259 + 150 486 diff --git a/src/sidebar/historysidebar.ui b/src/sidebar/historysidebar.ui index 52be5248a..975672a5c 100644 --- a/src/sidebar/historysidebar.ui +++ b/src/sidebar/historysidebar.ui @@ -6,7 +6,7 @@ 0 0 - 219 + 150 457 diff --git a/src/sidebar/sidebar.cpp b/src/sidebar/sidebar.cpp index df5d12090..13aec20f5 100644 --- a/src/sidebar/sidebar.cpp +++ b/src/sidebar/sidebar.cpp @@ -22,36 +22,41 @@ #include "qupzilla.h" SideBar::SideBar(QWidget* parent) : - QDockWidget(parent) + QWidget(parent) ,m_activeWidget(None) { - setObjectName("SideBar"); - setWindowTitle(tr("SideBar")); + setObjectName("sidebar"); setAttribute(Qt::WA_DeleteOnClose); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred); + + m_layout = new QVBoxLayout(); + m_layout->setContentsMargins(0, 0, 0, 0); + m_layout->setSpacing(0); + setLayout(m_layout); + m_titleBar = new DockTitleBarWidget("", this); - setTitleBarWidget(m_titleBar); - setFeatures(0); + m_layout->addWidget(m_titleBar); } void SideBar::showBookmarks() { m_titleBar->setTitle(tr("Bookmarks")); - BookmarksSideBar* bar = new BookmarksSideBar((QupZilla*)parentWidget(), this); + BookmarksSideBar* bar = new BookmarksSideBar((QupZilla*)parentWidget()); setWidget(bar); m_activeWidget = Bookmarks; - QSettings settings(mApp->getActiveProfil() + "settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath() + "settings.ini", QSettings::IniFormat); settings.setValue("Browser-View-Settings/SideBar", "Bookmarks"); } void SideBar::showHistory() { m_titleBar->setTitle(tr("History")); - HistorySideBar* bar = new HistorySideBar((QupZilla*)parentWidget(), this); + HistorySideBar* bar = new HistorySideBar((QupZilla*)parentWidget()); setWidget(bar); m_activeWidget = History; - QSettings settings(mApp->getActiveProfil() + "settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath() + "settings.ini", QSettings::IniFormat); settings.setValue("Browser-View-Settings/SideBar", "History"); } @@ -60,10 +65,24 @@ void SideBar::showRSS() } +void SideBar::setWidget(QWidget* widget) +{ + if (m_layout->count() == 2) + delete m_layout->itemAt(1)->widget(); + + m_layout->addWidget(widget); +} + void SideBar::close() { - QSettings settings(mApp->getActiveProfil() + "settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath() + "settings.ini", QSettings::IniFormat); settings.setValue("Browser-View-Settings/SideBar", "None"); - QDockWidget::close(); + QWidget::close(); +} + +SideBar::~SideBar() +{ + delete m_titleBar; + delete m_layout; } diff --git a/src/sidebar/sidebar.h b/src/sidebar/sidebar.h index 867862fc3..342f12f92 100644 --- a/src/sidebar/sidebar.h +++ b/src/sidebar/sidebar.h @@ -18,15 +18,19 @@ #ifndef SIDEBAR_H #define SIDEBAR_H -#include +#include +#include class DockTitleBarWidget; -class SideBar : public QDockWidget +class SideBar : public QWidget { Q_OBJECT public: enum SideWidget { None = 0, Bookmarks, History, RSS }; + explicit SideBar(QWidget* parent = 0); + ~SideBar(); + void showBookmarks(); void showHistory(); void showRSS(); @@ -38,6 +42,9 @@ public slots: void close(); private: + void setWidget(QWidget* widget); + + QVBoxLayout* m_layout; DockTitleBarWidget* m_titleBar; SideWidget m_activeWidget; }; diff --git a/src/tools/animatedwidget.cpp b/src/tools/animatedwidget.cpp index 8fe67c47e..f3b0ead9b 100644 --- a/src/tools/animatedwidget.cpp +++ b/src/tools/animatedwidget.cpp @@ -18,24 +18,20 @@ #include "animatedwidget.h" #include -AnimatedWidget::AnimatedWidget(const Direction &direction, QWidget* parent) +AnimatedWidget::AnimatedWidget(const Direction &direction, int duration, QWidget* parent) : QWidget(parent) , m_widget(new QWidget(this)) , m_direction(direction) { m_positionAni = new QPropertyAnimation(m_widget, "pos"); - m_positionAni->setDuration(300); + m_positionAni->setDuration(duration); - m_minHeightAni = new QPropertyAnimation(this, "minimumHeight"); - m_minHeightAni->setDuration(300); - - m_maxHeightAni = new QPropertyAnimation(this, "maximumHeight"); - m_maxHeightAni->setDuration(300); + m_heightAni = new QPropertyAnimation(this, "fixedheight"); + m_heightAni->setDuration(duration); m_aniGroup = new QParallelAnimationGroup(); m_aniGroup->addAnimation(m_positionAni); - m_aniGroup->addAnimation(m_minHeightAni); - m_aniGroup->addAnimation(m_maxHeightAni); + m_aniGroup->addAnimation(m_heightAni); setMaximumHeight(0); } @@ -53,8 +49,7 @@ void AnimatedWidget::startAnimation() m_widget->move(QPoint(m_widget->pos().x(), Y_HIDDEN)); m_positionAni->setEndValue(QPoint(m_widget->pos().x(), Y_SHOWN)); - m_minHeightAni->setEndValue(m_widget->height()); - m_maxHeightAni->setEndValue(m_widget->height()); + m_heightAni->setEndValue(m_widget->height()); m_aniGroup->start(); } @@ -62,8 +57,7 @@ void AnimatedWidget::startAnimation() void AnimatedWidget::hide() { m_positionAni->setEndValue(QPoint(m_widget->pos().x(), Y_HIDDEN)); - m_minHeightAni->setEndValue(0); - m_maxHeightAni->setEndValue(0); + m_heightAni->setEndValue(0); m_aniGroup->start(); connect(m_aniGroup, SIGNAL(finished()), this, SLOT(close())); @@ -80,9 +74,7 @@ void AnimatedWidget::resizeEvent(QResizeEvent *event) AnimatedWidget::~AnimatedWidget() { delete m_positionAni; - delete m_minHeightAni; - delete m_maxHeightAni; + delete m_heightAni; delete m_aniGroup; - delete m_widget; } diff --git a/src/tools/animatedwidget.h b/src/tools/animatedwidget.h index c2084c168..032ca7c77 100644 --- a/src/tools/animatedwidget.h +++ b/src/tools/animatedwidget.h @@ -26,9 +26,11 @@ class AnimatedWidget : public QWidget { Q_OBJECT + Q_PROPERTY(int fixedheight READ height WRITE setFixedHeight) + public: enum Direction { Down, Up }; - explicit AnimatedWidget(const Direction &direction = Down, QWidget* parent = 0); + explicit AnimatedWidget(const Direction &direction = Down, int duration = 300, QWidget* parent = 0); ~AnimatedWidget(); QWidget* widget() { return m_widget; } @@ -41,8 +43,7 @@ private: void resizeEvent(QResizeEvent *e); QPropertyAnimation* m_positionAni; - QPropertyAnimation* m_minHeightAni; - QPropertyAnimation* m_maxHeightAni; + QPropertyAnimation* m_heightAni; QParallelAnimationGroup* m_aniGroup; QWidget* m_widget; diff --git a/src/tools/buttonwithmenu.cpp b/src/tools/buttonwithmenu.cpp index 46631d7af..ab032c852 100644 --- a/src/tools/buttonwithmenu.cpp +++ b/src/tools/buttonwithmenu.cpp @@ -1,7 +1,7 @@ #include "buttonwithmenu.h" ButtonWithMenu::ButtonWithMenu(QWidget* parent) : - QToolButton(parent) + ToolButton(parent) , m_menu(new QMenu(this)) , m_currentItem(0) { diff --git a/src/tools/buttonwithmenu.h b/src/tools/buttonwithmenu.h index 32a88b919..0978b6ba9 100644 --- a/src/tools/buttonwithmenu.h +++ b/src/tools/buttonwithmenu.h @@ -6,7 +6,9 @@ #include #include -class ButtonWithMenu : public QToolButton +#include "toolbutton.h" + +class ButtonWithMenu : public ToolButton { Q_OBJECT public: diff --git a/src/tools/clickablelabel.h b/src/tools/clickablelabel.h index 79fe02052..70ee781c3 100644 --- a/src/tools/clickablelabel.h +++ b/src/tools/clickablelabel.h @@ -24,6 +24,10 @@ class ClickableLabel : public QLabel { Q_OBJECT + Q_PROPERTY(QSize fixedsize READ size WRITE setFixedSize) + Q_PROPERTY(int fixedwidth READ width WRITE setFixedWidth) + Q_PROPERTY(int fixedheight READ height WRITE setFixedHeight) + public: explicit ClickableLabel(QWidget* parent = 0); diff --git a/src/tools/docktitlebarwidget.ui b/src/tools/docktitlebarwidget.ui index b0a40907f..57446347a 100644 --- a/src/tools/docktitlebarwidget.ui +++ b/src/tools/docktitlebarwidget.ui @@ -6,12 +6,15 @@ 0 0 - 667 + 116 24 - - + + + 0 + 0 + diff --git a/src/tools/toolbutton.cpp b/src/tools/toolbutton.cpp new file mode 100644 index 000000000..1247c468a --- /dev/null +++ b/src/tools/toolbutton.cpp @@ -0,0 +1,78 @@ +#include "toolbutton.h" + +ToolButton::ToolButton(QWidget* parent) + : QToolButton(parent) + , m_usingMultiIcon(false) +{ +} + +void ToolButton::setThemeIcon(const QString &icon) +{ + m_themeIcon = icon; + setIcon(QIcon::fromTheme(icon)); + m_usingMultiIcon = false; +} + +void ToolButton::setIcon(const QIcon &icon) +{ + if (m_usingMultiIcon) + setFixedSize(sizeHint()); + m_usingMultiIcon = false; + + QToolButton::setIcon(icon); +} + +void ToolButton::setData(const QVariant &data) +{ + m_data = data; +} + +QVariant ToolButton::data() +{ + return m_data; +} + +void ToolButton::setMultiIcon(const QPixmap &icon) +{ + int w = icon.width(); + int h = icon.height(); + + m_normalIcon = icon.copy(0, 0, w, h/4 ); + m_hoverIcon = icon.copy(0, h/4, w, h/4 ); + m_activeIcon = icon.copy(0, h/2, w, h/4 ); + m_disabledIcon = icon.copy(0, 3*h/4, w, h/4 ); + + m_usingMultiIcon = true; + + setFixedSize(m_normalIcon.size()); +} + +void ToolButton::paintEvent(QPaintEvent *e) +{ + if (!m_usingMultiIcon) { + QToolButton::paintEvent(e); + return; + } + + QPainter p(this); + + QStyleOptionToolButton opt; + opt.init(this); + + if (!isEnabled()) { + p.drawPixmap(0, 0, m_disabledIcon); + return; + } + + if (isDown()) { + p.drawPixmap(0, 0, m_activeIcon); + return; + } + + if (opt.state & QStyle::State_MouseOver) { + p.drawPixmap(0, 0, m_hoverIcon); + return; + } + + p.drawPixmap(0, 0, m_normalIcon); +} diff --git a/src/tools/toolbutton.h b/src/tools/toolbutton.h new file mode 100644 index 000000000..d2b4712ef --- /dev/null +++ b/src/tools/toolbutton.h @@ -0,0 +1,52 @@ +#ifndef TOOLBUTTON_H +#define TOOLBUTTON_H + +#include +#include +#include +#include + +class ToolButton : public QToolButton +{ + Q_OBJECT + Q_PROPERTY(QSize fixedsize READ size WRITE setFixedSize) + Q_PROPERTY(int fixedwidth READ width WRITE setFixedWidth) + Q_PROPERTY(int fixedheight READ height WRITE setFixedHeight) + Q_PROPERTY(QPixmap multiIcon READ pixmap WRITE setMultiIcon) + Q_PROPERTY(QIcon icon READ icon WRITE setIcon) + Q_PROPERTY(QString themeIcon READ themeIcon WRITE setThemeIcon) + +public: + explicit ToolButton(QWidget* parent = 0); + + void setData(const QVariant& data); + QVariant data(); + + void setMultiIcon(const QPixmap &icon); + QPixmap pixmap() { return m_normalIcon; } + + void setThemeIcon(const QString &icon); + QString themeIcon() { return m_themeIcon; } + + void setIcon(const QIcon &icon); + +signals: + +public slots: + +private: + void paintEvent(QPaintEvent *e); + + bool m_usingMultiIcon; + + QPixmap m_normalIcon; + QPixmap m_hoverIcon; + QPixmap m_activeIcon; + QPixmap m_disabledIcon; + + QString m_themeIcon; + QVariant m_data; + +}; + +#endif // TOOLBUTTON_H diff --git a/src/webview/jsalert.ui b/src/webview/jsalert.ui index a5540067d..306e4d58a 100644 --- a/src/webview/jsalert.ui +++ b/src/webview/jsalert.ui @@ -58,19 +58,15 @@ - - #frame_2 { -background-color: #f3f3f3; -border: 1px solid black; -border-top: 0px; -} - QFrame::StyledPanel QFrame::Raised + + true + @@ -166,19 +162,15 @@ border-top: 0px; - - #frame { -border: 1px solid black; -border-bottom: 0px; -background-color: white; -} - QFrame::StyledPanel QFrame::Raised + + true + 20 diff --git a/src/webview/jsconfirm.ui b/src/webview/jsconfirm.ui index ccaedc3c4..ecc698f98 100644 --- a/src/webview/jsconfirm.ui +++ b/src/webview/jsconfirm.ui @@ -19,19 +19,15 @@ - - #frame { -border: 1px solid black; -border-bottom: 0px; -background-color: white; -} - QFrame::StyledPanel QFrame::Raised + + true + 20 @@ -126,19 +122,15 @@ background-color: white; - - #frame_2 { -background-color: #f3f3f3; -border: 1px solid black; -border-top: 0px; -} - QFrame::StyledPanel QFrame::Raised + + true + 0 diff --git a/src/webview/jsprompt.ui b/src/webview/jsprompt.ui index f2e5aab67..4d8b7ffde 100644 --- a/src/webview/jsprompt.ui +++ b/src/webview/jsprompt.ui @@ -13,9 +13,6 @@ - - - 0 @@ -48,19 +45,15 @@ - - #frame { -border: 1px solid black; -border-bottom: 0px; -background-color: white; -} - QFrame::StyledPanel QFrame::Raised + + true + 20 @@ -128,19 +121,15 @@ background-color: white; - - #frame_2 { -background-color: #f3f3f3; -border: 1px solid black; -border-top: 0px; -} - QFrame::StyledPanel QFrame::Raised + + true + 0 diff --git a/src/webview/searchtoolbar.cpp b/src/webview/searchtoolbar.cpp index 5084a7e77..8db1fb28d 100644 --- a/src/webview/searchtoolbar.cpp +++ b/src/webview/searchtoolbar.cpp @@ -22,7 +22,7 @@ #include "ui_searchtoolbar.h" SearchToolBar::SearchToolBar(QupZilla* mainClass, QWidget* parent) - : AnimatedWidget(AnimatedWidget::Up, parent) + : AnimatedWidget(AnimatedWidget::Up, 300, parent) , ui(new Ui::SearchToolbar) , p_QupZilla(mainClass) , m_findFlags(0) @@ -102,14 +102,19 @@ void SearchToolBar::refreshFindFlags() void SearchToolBar::searchText(const QString &text) { bool found = p_QupZilla->weView()->findText(text, QFlags(m_findFlags)); - if (!found && !ui->lineEdit->text().isEmpty()) { - ui->lineEdit->setStyleSheet("background-color: #ff6666;"); + if (text.isEmpty()) + found = true; + + if (!found) ui->results->setText(tr("No results found.")); - } - else{ - ui->lineEdit->setStyleSheet(""); + else ui->results->clear(); - } + + + ui->lineEdit->setProperty("notfound", !found); + + ui->lineEdit->style()->unpolish(ui->lineEdit); + ui->lineEdit->style()->polish(ui->lineEdit); } SearchToolBar::~SearchToolBar() diff --git a/src/webview/tabbar.cpp b/src/webview/tabbar.cpp index b53ef7208..815c7d5da 100644 --- a/src/webview/tabbar.cpp +++ b/src/webview/tabbar.cpp @@ -25,8 +25,8 @@ TabBar::TabBar(QupZilla* mainClass, QWidget* parent) : ,p_QupZilla(mainClass) ,m_clickedTab(0) { + setObjectName("tabbar"); setContextMenuPolicy(Qt::CustomContextMenu); - setObjectName("tabBar"); setElideMode(Qt::ElideRight); setTabsClosable(true); setDocumentMode(true); @@ -37,7 +37,7 @@ TabBar::TabBar(QupZilla* mainClass, QWidget* parent) : void TabBar::loadSettings() { - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("Browser-Tabs-Settings"); setMovable( settings.value("makeTabsMovable",true).toBool() ); diff --git a/src/webview/tabwidget.cpp b/src/webview/tabwidget.cpp index 64fe1545c..f8e02a332 100644 --- a/src/webview/tabwidget.cpp +++ b/src/webview/tabwidget.cpp @@ -26,6 +26,8 @@ #include "clickablelabel.h" #include "closedtabsmanager.h" #include "progressbar.h" +#include "navigationbar.h" +#include "toolbutton.h" class NewTabButton : public QToolButton { @@ -103,10 +105,9 @@ TabWidget::TabWidget(QupZilla* mainClass, QWidget* parent) : , m_closedTabsManager(new ClosedTabsManager(this)) , m_locationBars(new QStackedWidget()) { + setObjectName("tabwidget"); m_tabBar = new TabBar(p_QupZilla); setTabBar(m_tabBar); - setObjectName("tabWidget"); - setStyleSheet("QTabBar::tab{ max-width:250px; max-height: 28px; }"); connect(this, SIGNAL(currentChanged(int)), this, SLOT(currentTabChanged(int))); connect(this, SIGNAL(currentChanged(int)), p_QupZilla, SLOT(refreshHistory())); @@ -122,25 +123,22 @@ TabWidget::TabWidget(QupZilla* mainClass, QWidget* parent) : connect(m_tabBar, SIGNAL(duplicateTab(int)), this, SLOT(duplicateTab(int))); connect(m_tabBar, SIGNAL(tabMoved(int,int)), this, SLOT(tabMoved(int,int))); - m_buttonListTabs = new TabListButton(this); + m_buttonListTabs = new ToolButton(this); + m_buttonListTabs->setObjectName("tabwidget-button-opentabs"); m_menuTabs = new QMenu(); m_buttonListTabs->setMenu(m_menuTabs); m_buttonListTabs->setPopupMode(QToolButton::InstantPopup); m_buttonListTabs->setToolTip(tr("Show list of opened tabs")); - connect(m_menuTabs, SIGNAL(aboutToShow()), this, SLOT(aboutToShowTabsMenu())); - setCornerWidget(m_buttonListTabs); + m_buttonListTabs->setAutoRaise(true); - m_buttonAddTab = new NewTabButton(this); - m_buttonAddTab->setToolTip(tr("Add Tab")); - connect(m_buttonAddTab, SIGNAL(clicked()), p_QupZilla, SLOT(addTab())); - setCornerWidget(m_buttonAddTab, Qt::TopLeftCorner); + connect(m_menuTabs, SIGNAL(aboutToShow()), this, SLOT(aboutToShowTabsMenu())); loadSettings(); } void TabWidget::loadSettings() { - QSettings settings(mApp->getActiveProfil()+"settings.ini", QSettings::IniFormat); + QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("Browser-Tabs-Settings"); m_hideCloseButtonWithOneTab = settings.value("hideCloseButtonWithOneTab",false).toBool(); m_hideTabBarWithOneTab = settings.value("hideTabsWithOneTab",false).toBool(); @@ -148,18 +146,22 @@ void TabWidget::loadSettings() settings.beginGroup("Web-URL-Settings"); m_urlOnNewTab = settings.value("newTabUrl","").toUrl(); settings.endGroup(); - settings.beginGroup("Browser-View-Settings"); - bool showAddTab = settings.value("showAddTabButton", true).toBool(); - m_buttonAddTab->setVisible(showAddTab); - if (showAddTab && !cornerWidget(Qt::TopLeftCorner)) - setCornerWidget(m_buttonAddTab, Qt::TopLeftCorner); - else if (!showAddTab && cornerWidget(Qt::TopLeftCorner)) - setCornerWidget(0, Qt::TopLeftCorner); - settings.endGroup(); m_tabBar->loadSettings(); } +void TabWidget::resizeEvent(QResizeEvent *e) +{ + QPoint posit; + posit.setY(0); + posit.setX(width() - m_buttonListTabs->width()); + m_buttonListTabs->move(posit); + + m_buttonListTabs->setVisible(getTabBar()->isVisible()); + + QTabWidget::resizeEvent(e); +} + void TabWidget::aboutToShowTabsMenu() { m_menuTabs->clear(); @@ -172,7 +174,7 @@ void TabWidget::aboutToShowTabsMenu() continue; QAction* action = new QAction(this); if (view == actView) - action->setIcon(QIcon(":/icons/menu/circle.png")); + action->setIcon(QIcon(":/icons/menu/dot.png")); else action->setIcon(_iconForUrl(view->url())); if (view->title().isEmpty()) { @@ -243,7 +245,7 @@ int TabWidget::addView(QUrl url, const QString &title, OpenUrlIn openIn, bool se connect(webView, SIGNAL(ipChanged(QString)), p_QupZilla->ipLabel(), SLOT(setText(QString))); if (url.isValid()) - webView->load(url); + webView->setUrl(url); if (selectLine) p_QupZilla->locationBar()->setFocus(); @@ -332,12 +334,10 @@ void TabWidget::currentTabChanged(int index) p_QupZilla->ipLabel()->hide(); p_QupZilla->progressBar()->setVisible(true); p_QupZilla->progressBar()->setValue(webView->getLoading()); - p_QupZilla->buttonStop()->setVisible(true); - p_QupZilla->buttonReload()->setVisible(false); + p_QupZilla->navigationBar()->showStopButton(); } else { p_QupZilla->progressBar()->setVisible(false); - p_QupZilla->buttonStop()->setVisible(false); - p_QupZilla->buttonReload()->setVisible(true); + p_QupZilla->navigationBar()->showReloadButton(); p_QupZilla->ipLabel()->show(); } @@ -394,7 +394,7 @@ void TabWidget::restoreClosedTab() QDataStream historyStream(tab.history); historyStream >> *weView(index)->history(); - weView(index)->load(tab.url); + weView(index)->setUrl(tab.url); } void TabWidget::restoreAllClosedTabs() @@ -408,7 +408,7 @@ void TabWidget::restoreAllClosedTabs() QDataStream historyStream(tab.history); historyStream >> *weView(index)->history(); - weView(index)->load(tab.url); + weView(index)->setUrl(tab.url); } m_closedTabsManager->clearList(); } @@ -464,7 +464,7 @@ void TabWidget::savePinnedTabs() } stream << tabs; stream << tabsHistory; - QFile file(mApp->getActiveProfil()+"pinnedtabs.dat"); + QFile file(mApp->getActiveProfilPath()+"pinnedtabs.dat"); file.open(QIODevice::WriteOnly); file.write(data); file.close(); @@ -472,7 +472,7 @@ void TabWidget::savePinnedTabs() void TabWidget::restorePinnedTabs() { - QFile file(mApp->getActiveProfil()+"pinnedtabs.dat"); + QFile file(mApp->getActiveProfilPath()+"pinnedtabs.dat"); file.open(QIODevice::ReadOnly); QByteArray sd = file.readAll(); file.close(); @@ -495,7 +495,7 @@ void TabWidget::restorePinnedTabs() addedIndex= addView(QUrl()); QDataStream historyStream(historyState); historyStream >> *weView(addedIndex)->history(); - weView(addedIndex)->load(url); + weView(addedIndex)->setUrl(url); } else { addedIndex = addView(url); } @@ -564,7 +564,7 @@ bool TabWidget::restoreState(const QByteArray &state) int index = addView(QUrl()); QDataStream historyStream(historyState); historyStream >> *weView(index)->history(); - weView(index)->load(url); + weView(index)->setUrl(url); } else { addView(url); } @@ -577,6 +577,5 @@ bool TabWidget::restoreState(const QByteArray &state) TabWidget::~TabWidget() { delete m_menuTabs; - delete m_buttonAddTab; delete m_buttonListTabs; } diff --git a/src/webview/tabwidget.h b/src/webview/tabwidget.h index a298aee15..25de51c98 100644 --- a/src/webview/tabwidget.h +++ b/src/webview/tabwidget.h @@ -34,6 +34,7 @@ class WebTab; class TabListButton; class NewTabButton; class ClosedTabsManager; +class ToolButton; class TabWidget : public QTabWidget { @@ -79,6 +80,7 @@ private slots: void tabMoved(int before, int after); private: + void resizeEvent(QResizeEvent *e); inline WebView* weView() { WebTab* webTab = qobject_cast(widget(currentIndex())); if (!webTab) return 0; return webTab->view(); } inline WebView* weView(int index) { WebTab* webTab = qobject_cast(widget(index)); if (!webTab) return 0; return webTab->view(); } @@ -93,8 +95,7 @@ private: TabBar* m_tabBar; QMenu* m_menuTabs; - NewTabButton* m_buttonAddTab; - TabListButton* m_buttonListTabs; + ToolButton* m_buttonListTabs; ClosedTabsManager* m_closedTabsManager; QStackedWidget* m_locationBars; diff --git a/src/webview/webview.cpp b/src/webview/webview.cpp index eeebbe520..9abde6093 100644 --- a/src/webview/webview.cpp +++ b/src/webview/webview.cpp @@ -33,6 +33,7 @@ #include "webtab.h" #include "statusbarmessage.h" #include "progressbar.h" +#include "navigationbar.h" WebView::WebView(QupZilla* mainClass, WebTab* webTab) : QWebView(webTab) @@ -119,7 +120,7 @@ void WebView::urlChanged(const QUrl &url) { if (isCurrent()) { emit showUrl(url); - p_QupZilla->refreshHistory(); + p_QupZilla->navigationBar()->refreshHistory(); } if (m_lastUrl != url) emit changed(); @@ -142,8 +143,7 @@ void WebView::setProgress(int prog) p_QupZilla->ipLabel()->hide(); p_QupZilla->progressBar()->setVisible(true); p_QupZilla->progressBar()->setValue(m_progress); - p_QupZilla->buttonStop()->setVisible(true); - p_QupZilla->buttonReload()->setVisible(false); + p_QupZilla->navigationBar()->showStopButton(); } } @@ -177,7 +177,7 @@ QLabel* WebView::animationLoading(int index, bool addMovie) QLabel* loadingAnimation = qobject_cast(tabWidget()->getTabBar()->tabButton(index, QTabBar::LeftSide)); if (!loadingAnimation) { loadingAnimation = new QLabel(); - loadingAnimation->setStyleSheet("QLabel { margin: 0px; padding: 0px; }"); + loadingAnimation->setStyleSheet("margin: 0px; padding: 0px; width: 16px; height: 16px;"); } if (addMovie && !loadingAnimation->movie()) { QMovie* movie = new QMovie(":icons/other/progress.gif", QByteArray(), loadingAnimation); @@ -232,7 +232,7 @@ void WebView::loadFinished(bool state) iconChanged(); m_lastUrl = url(); - //Fix the bug where sometimes icon is not available at the moment + //Icon is sometimes not available at the moment of finished loading if (icon().isNull()) QTimer::singleShot(1000, this, SLOT(iconChanged())); @@ -242,8 +242,7 @@ void WebView::loadFinished(bool state) if (isCurrent()) { p_QupZilla->progressBar()->setVisible(false); - p_QupZilla->buttonStop()->setVisible(false); - p_QupZilla->buttonReload()->setVisible(true); + p_QupZilla->navigationBar()->showReloadButton(); p_QupZilla->ipLabel()->show(); } @@ -265,6 +264,9 @@ void WebView::titleChanged() void WebView::iconChanged() { + if (mApp->isClosing()) + return; + // QIcon icon_ = icon(); QIcon icon_ = siteIcon(); if (!icon_.isNull()) diff --git a/translations/cs_CZ.ts b/translations/cs_CZ.ts index ca6d4ca50..1b164176b 100644 --- a/translations/cs_CZ.ts +++ b/translations/cs_CZ.ts @@ -9,7 +9,7 @@ O QupZille - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -18,7 +18,7 @@ p, li { white-space: pre-wrap; } - + Authors Autoři @@ -267,13 +267,13 @@ p, li { white-space: pre-wrap; } BookmarkIcon - - + + Bookmark this Page Přidat stránku do záložek - + Edit this bookmark Upravit záložku @@ -311,7 +311,7 @@ p, li { white-space: pre-wrap; } Přidat složku - + Optimize Database Optimalizovat databázi @@ -332,19 +332,19 @@ p, li { white-space: pre-wrap; } - - - - + + + + Bookmarks In Menu Záložky v menu - - - - + + + + Bookmarks In ToolBar Panel záložek @@ -363,40 +363,35 @@ p, li { white-space: pre-wrap; } Move bookmark to &folder Přesunout záložku do &složky - - - &Close - &Zavřít - - - + + Unsorted Bookmarks Nesetříděné záložky - + <b>Warning: </b>You already have this page bookmarked! <b>Upozornění: </b>Tuto stránku již máte v záložkách! - + Choose name and location of bookmark. Zvolte jméno a umístění záložky. - + Add New Bookmark Přidat záložku - + Choose folder for bookmarks: Zvolte složku pro záložky: - + Bookmark All Tabs Přidat všechny panely do záložek @@ -479,52 +474,42 @@ p, li { white-space: pre-wrap; } BookmarksToolbar - - Bookmarks - Záložky - - - + &Bookmark Current Page Přidat &stránku do záložek - + Bookmark &All Tabs Přidat &všechny panely do záložek - + &Organize Bookmarks Organizovat &záložky - - &Reload Toolbar - &Obnovit panel - - - + Hide Most &Visited Skrýt &Nejnavštěvovanější - + Show Most &Visited Zobrazit &Nejnavštěvovanější - + &Hide Toolbar S&krýt panel - + Most visited Nejnavštěvovanější - + Sites You visited the most Nejvíce navštěvované stránky @@ -585,7 +570,7 @@ p, li { white-space: pre-wrap; } Knihovna - + Search... Hledat... @@ -605,12 +590,12 @@ p, li { white-space: pre-wrap; } RSS - + Database Optimized Databáze optimalizována - + Database successfuly optimized.<br/><br/><b>Database Size Before: </b>%1<br/><b>Databse Size After: </b>%2 Databáze byla úspěšně optimalizována.<br/><br/><b>Velikost databáze před: </b>%1<br/><b>Velikost databáze po: </b>%2 @@ -618,62 +603,62 @@ p, li { white-space: pre-wrap; } ClearPrivateData - + Clear Recent History Vymazat nedávnou historii - + Choose what you want to delete: Vyberte co chcete smazat: - + Clear history Smazat historii - + Clear cookies Smazat cookies - + Clear cache Vyprázdnit vyrovnávací paměť - + Clear icons Smazat ikony - + Clear cookies from Adobe Flash Player Smazat cookies z Adobe Flash Playeru - + <b>Clear Recent History</b> <b>Vymazat nedávnou historii</b> - + Later Today Dnes - + Week Týden - + Month Měsíc - + All Vše @@ -681,37 +666,37 @@ p, li { white-space: pre-wrap; } ClickToFlash - + Object blocked by ClickToFlash Objekt zablokován ClickToFlash pluginem - + Show more informations about object Zobrazit více informací o objektu - + Add %1 to whitelist Přidat %1 na bílou listinu - + Flash Object Flash objekt - + <b>Attribute Name</b> <b>Jméno atributu</b> - + <b>Value</b> <b>Hodnota</b> - + No more informations available. Žádné další informace. @@ -814,11 +799,6 @@ p, li { white-space: pre-wrap; } Remove cookie Odebrat cookie - - - Del - Del - Search @@ -858,12 +838,12 @@ p, li { white-space: pre-wrap; } DownloadItem - + A Clockwork Orange.avi - + Remaining 26 minutes - 339MB of 693 MB (350kB/s) @@ -1049,7 +1029,7 @@ nebyl nalezen! Správce stahování - + Clear Vyčistit @@ -1130,7 +1110,7 @@ nebyl nalezen! Vymazat celou historii - + Optimize Database Optimalizovat databázi @@ -1150,35 +1130,30 @@ nebyl nalezen! Otevřít odkaz v novém panelu - - Close - Zavřít - - - - + + Today Dnes - - + + This Week Tento týden - - + + This Month Tento měsíc - + Confirmation Potvrzení - + Are you sure to delete all history? Opravdu chcete vymazat celou historii? @@ -1305,22 +1280,22 @@ nebyl nalezen! LocationBar - + Show informations about this page Zobrazit informace o stránce - + Add RSS from this page... Přidat RSS kanál ... - + Enter URL address or search on Google.com Zadejte internetovou adresu nebo vyhledávejte na Google.com - + .co.uk .cz Append domain name on ALT key = Should be different for every country @@ -1340,16 +1315,50 @@ nebyl nalezen! MainApplication - + Last session crashed Poslední relace spadla - + <b>QupZilla crashed :-(</b><br/>Oops, last session of QupZilla ends with its crash. We are very sorry. Would you try to restore saved state? <b>QupZilla spadla :-(</b><br/>Oops, poslední relace QupZilly skončila jejím pádem. Velice se omlouváme. Přejete si obnovit uložený stav? + + NavigationBar + + + Back + Zpět + + + + Forward + Vpřed + + + + Home + Domů + + + + New Tab + Nový panel + + + + Main Menu + Hlavní menu + + + + + Exit Fullscreen + Zrušit celou obrazovku + + NetworkManager @@ -1506,7 +1515,7 @@ nebyl nalezen! Obecné - + 1 1 @@ -1568,42 +1577,27 @@ nebyl nalezen! Použít aktuální - + <b>Navigation ToolBar</b> <b>Navigační panel</b> - + <b>Background<b/> <b>Pozadí</b> - - Use background image - Použít obrázek na pozadí - - - + Use transparent background Použít průhledné pozadí - - Choose image... - Vyberte obrázek... - - - - Reset default - Obnovit původní - - - + Maximum Maximálně - + 50 MB 50 MB @@ -1613,22 +1607,22 @@ nebyl nalezen! QupZilla - + Allow storing network cache on disk Povolit ukládání cache na disk - + <b>Cookies</b> <b>Cookies</b> - + <b>Address Bar behaviour</b> <b>Chování adresního řádku</b> - + <b>Language</b> <b>Jazyk</b> @@ -1653,12 +1647,7 @@ nebyl nalezen! Odstranit - - Window - Okno prohlížeče - - - + Show StatusBar on start Zobrazit StatusBar při startu @@ -1668,27 +1657,27 @@ nebyl nalezen! <b>Profily</b> - + Show Bookmarks ToolBar on start Zobrazit panel záložek při startu - + Show Navigation ToolBar on start Zobrazit navigační panel při startu - + Show Home button Zobrazit tlačítko Domů - + Show Back / Forward buttons Zobrazit tlačítka Zpět / Vpřed - + <b>Browser Window</b> <b>Okno prohlížeče</b> @@ -1712,286 +1701,291 @@ nebyl nalezen! Note: You cannot delete active profile. Poznámka: Nemůžete smazat aktivní profil. - - - This is text color used in Menu - Toto je text používaný v menu - - - - Menu text color - Barva menu textu - Notifications Oznámení - + Show Add Tab button Zobrazit 'Přidat panel' tlačítko - + <b>Tabs behavior</b> <b>Chování panelů</b> - + Make tabs movable Přesouvat panely přetažením - + Hide close button if there is only one tab Skrýt zavírací tlačítko při jediném panelu - + Hide tabs when if there is only one tab Skrýt seznam panelů při jediném panelu - + Activate last tab when closing active tab Aktivovat poslední panel při zavírání aktuálního - + Block PopUp windows Blokovat vyskakovací okna - + Allow DNS Prefetch Povolit DNS Prefetch - + JavaScript can access clipboard Povolit JavaScriptu přístup do schránky - + Include links in focus chain Označovat odkazy tabulátorem - + Zoom text only Přibližovat pouze text - + Print element background Tisknout pozadí objektů - + Send Do Not Track header to servers Zasílat serverům Do Not Track hlavičku - + + Appereance + Vzhled + + + + Themes + Témata + + + + Advanced options + Rozšířené možnosti + + + Ask when closing multiple tabs Ptát se při zavírání více panelů - + Mouse wheel scrolls Kolečko myši posune - + lines on page řádků na stránce - + Local Storage Lokální úložiště - + Proxy Configuration Konfigurace Proxy - + <b>Font Families</b> <b>Typy písem</b> - + Standard Standardní - + Fixed Proporcionální - + Serif Serif - + Sans Serif Sans Serif - + Cursive Kurzíva - + Default Font Základní písmo - + Fixed Font Proporcionální písmo - + Fantasy Fantasy - + <b>Font Sizes</b> <b>Velikosti písem</b> - + <b>Download Location</b> <b>Cíl stahování</b> - + Ask everytime for download location U každého souboru se dotázat kam ho uložit - + Use defined location: Uložit všechny soubory do: - - + + ... ... - + <b>Download Options</b> <b>Možnosti stahování</b> - + Use native system file dialog (may or may not cause problems with downloading SSL secured content) Použít nativní systémový dialog pro výběr souboru (může ale také nemusí dělat problémy při stahování SSL zabezpečeného obsahu) - + <b>Notifications</b> <b>Oznámení</b> - + Use OSD Notifications Používat OSD oznámení - + Use Native System Notifications (Linux only) Používat nativní systémové oznámení (pouze Linux) - + Do not use Notifications Nepoužívat oznámení - + Expiration timeout: Doba: - + seconds sekund - + <b>Note: </b>You can change position of OSD Notification by dragging it on the screen. <b>Poznámka: </b> Můžete změnit pozici OSD oznámení na obrazovce jejím přetažením. - + <b>User CSS StyleSheet</b> <b>Uživatelský CSS styl</b> - + StyleSheet automatically loaded with all websites: Styl, automaticky načítán ke všem stránkám: - + System proxy configuration Systémové nastavení proxy - + Do not use proxy Nepoužívat proxy - + Manual configuration Manuální nastavení - + Web Configuration Nastavení webu - + HTTP HTTP - + SOCKS5 SOCKS5 - + Port: Port: - + Username: Jméno: - + Password: Heslo: - + Don't use on: Nepužívat na: @@ -2001,27 +1995,27 @@ nebyl nalezen! Prohlížení - + Load images Nahrát obrázky - + Allow JAVA Povolit JAVA - + Allow JavaScript Povolit JavaScript - + Allow Plugins (Flash plugin) Povolit pluginy (Flash plugin) - + Maximum pages in cache: Maximum stránek v cache: @@ -2031,12 +2025,12 @@ nebyl nalezen! Správce hesel - + <b>AutoFill options</b> <b>Možnosti doplňování</b> - + Allow saving passwords from sites Povolit ukládání hesel ze stránek @@ -2046,47 +2040,47 @@ nebyl nalezen! Soukromí - + Filter Tracking Cookies Filtrovat sledovací cookies - + Allow storing of cookies Povolit přijímání cookies - + Delete cookies on close Vymazat cookies při zavření prohlížeče - + Match domain exactly Vyžadovat přesnou shodu domény - + <b>Warning:</b> Match domain exactly and Filter Tracking Cookies options can lead to deny some cookies from sites. If you have problems with cookies, try to disable this options first! <b>Upozornění:</b> Možnosti vyžadovat přesnou shodu domény a filtrovat sledovací cookies mohou vést k odmítnutí některých cookies. Pokud máte problémy s cookies, zkuste nejdříve tyto možnosti zakázat! - + Cookies Manager Správce cookies - + Allow storing web icons Povolit ukládání ikon - + Allow saving history Povolit ukládání historie - + Delete history on close Vymazat historii při zavření prohlížeče @@ -2096,94 +2090,89 @@ nebyl nalezen! Ostatní - + Select all text by double clicking in address bar Select all text by clicking at address bar Označit vše při dvojitém kliknutí do adresního řádku - + Add .com domain by pressing CTRL key Přidat .com doménu stisknutím CTRL klávesy - + Add .co.uk domain by pressing ALT key Přidat .cz doménu stísknutím ALT klávesy - + SSL Manager Správce certifikátů - + Available translations: Dostupné překlady: - + In order to change language, you must restart browser. Ke změně jazyka je nutný restart prohlížeče. - + OSD Notification OSD Oznámení - + Drag it on the screen to place it where You want. Přetáhněte ho na obrazovce na místo, na kterém jej chcete mít. - + Choose download location... Vyberte složku pro stahování... - - Choose background location... - - - - + Choose stylesheet location... Vyberte umístění stylu... - + New Profile Nový profil - + Enter the new profile's name: Zvolte jméno nového profilu: - - + + Error! Chyba! - + This profile already exists! Tento profil již existuje! - + Cannot create profile directory! Nemohu vytvořit složku profilu! - + Confirmation Potvrzení - + Are you sure to permanently delete "%1" profile? This action cannot be undone! Jste si jisti že chcete permanentně smazat profil "%1"? Tato akce nelze vrátit zpět! @@ -2224,443 +2213,403 @@ nebyl nalezen! QupZilla - + File Soubor - + Edit Úpravy - + Tools Nástroje - + Help Nápověda - + View Zobrazení - - + + Bookmarks Záložky - - + + History Historie - + Quit Konec - + New Tab Nový panel - + Close Tab Zavřít panel - + IP Address of current page IP Adresa aktuální stránky - + &New Window &Nové okno - + Open &File Otevřít &soubor - + &Save Page As... &Uložit stránku jako... - + &Print &Tisk - - Stop - Zastavit - - - - Reload - Obnovit - - - + &Undo &Zpět - + &Redo &Vpřed - + &Cut V&yjmout - + C&opy &Kopírovat - + &Paste V&ložit - + &Delete &Odstranit - + Select &All Vyb&rat vše - + &Find &Najít - + &Navigation Toolbar &Navigační lišta - + &Bookmarks Toolbar Panel &záložek - + Sta&tus Bar Sta&tus bar - + Toolbars Nástrojové lišty - + Sidebars Postranní lišta - + &Page Source Zdrojový &kód stránky - + &Menu Bar &Menu - + &Fullscreen &Celá obrazovka - + &Stop Z&astavit - + &Reload O&bnovit - + Character &Encoding Kó&dování znaků - + Zoom &In Zoo&m + - + Zoom &Out Z&oom - - + Reset Původní - - Back - Zpět - - - - Forward - Vpřed - - - - Home - Domů - - - + Close Window Zavřít okno - + Open Location Otevřít adresu - + Send Link... Poslat odkaz... - + Other Ostatní - + Default Defaultní - + Start Private Browsing Spustit anonymní prohlížení - - Navigation - Navigace - - - - Main Menu - Hlavní menu - - - - Exit Fullscreen - Zrušit celou obrazovku - - - + Private Browsing Enabled Soukromé prohlížení zapnuto - + Restore &Closed Tab Obnovit zavř&ený panel - + Bookmarks In ToolBar Bookmarks In Toolbar Panel záložek - - - + + + Empty Prázdný - + New tab Nový panel - + Bookmark &This Page Přidat &stránku do záložek - + Bookmark &All Tabs Přidat &všechny panely do záložek - + Organize &Bookmarks Organizovat &záložky - + &Back &Zpět - + &Forward &Vpřed - + &Home &Domů - + Show &All History Zobrazit celou &historii - + Closed Tabs Zavřené panely - + Restore All Closed Tabs Obnovit všechny zavřené panely - + Clear list Vyčistit seznam - + Report &Bug Nahlásit &bug - + About &Qt O &Qt - + &About QupZilla &O QupZille - + &Web Search Hledání na &webu - + Page &Info Informace o &stránce - + &Download Manager Správce s&tahování - + &Cookies Manager Správce coo&kies - + &AdBlock &AdBlock - + RSS &Reader &RSS čtečka - + Clear Recent &History Vymazat nedá&vnou historii - + &Private Browsing Soukromé prohlíž&ení - + Pr&eferences Předvo&lby - - + + Web Inspector Web Inspektor - + Open file... Otevřít soubor... - + Are you sure you want to turn on private browsing? Jste si jistý že chcete zapnout soukromé prohlížení? - + When private browsing is turned on, some actions concerning your privacy will be disabled: Se zapnutým soukromým prohlížením jsou některé akce týkající se soukromí vypnuty: - + Webpages are not added to the history. Stránky nejsou přidávány do historie. - + New cookies are not stored, but current cookies can be accessed. Nové cookies nejsou přijímány, ale současné cookies jsou zasílány. - + Your session won't be stored. Vaše relace nebude uložena. - + Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened. Než zavřete prohlížeč, stále můžete použít tlačítka Zpět a Vpřed k vrácení se na stránky které jste otevřeli. - + There are still %1 open tabs and your session won't be stored. Are you sure to quit? Ještě je otevřeno %1 panelů a Vaše relace nebude uložena. Opravdu chcete skončit? @@ -2673,7 +2622,7 @@ nebyl nalezen! RSS čtečka - + Empty Prázdný @@ -2686,22 +2635,22 @@ Please add some with RSS icon in navigation bar on site which offers feeds. - + Reload Obnovit - + Edit feed Upravit kanál - + Delete feed Smazat kanál - + Optimize Database Optimalizovat databázi @@ -2747,28 +2696,23 @@ Prosím přidejte si nějaký kliknutím na RSS ikonku v navigačním řádku.Otevřít odkaz v novém panelu - - Close - Zavřít - - - - + + New Tab Nový panel - + Error in fetching feed Chyba při stahování kanálu - + RSS feed duplicated Duplikovaný kanál - + You already have this feed. Tento kanál již odebíráte. @@ -2799,6 +2743,19 @@ Prosím přidejte si nějaký kliknutím na RSS ikonku v navigačním řádku.Přidat + + ReloadStopButton + + + Stop + Zastavit + + + + Reload + Obnovit + + SSLManager @@ -2860,7 +2817,7 @@ Prosím přidejte si nějaký kliknutím na RSS ikonku v navigačním řádku. SearchToolBar - + No results found. Nic nenalezeno. @@ -3380,38 +3337,51 @@ Prosím přidejte si nějaký kliknutím na RSS ikonku v navigačním řádku. TabWidget - + Show list of opened tabs Zobrazit seznam otevřených panelů - - Add Tab - Nový panel - - - + Loading... Načítám... - - + + No Named Page Bezejmenná stránka - + Actually You have %1 opened tabs Dohromady máte otevřeno %1 panelů - - + + New tab Nový panel + + ThemeManager + + + <b>Name:</b> + <b>Název:</b> + + + + <b>Author:</b> + <b>Autor:</b> + + + + <b>Description:</b> + <b>Popis:</b> + + Updater @@ -3440,82 +3410,82 @@ Prosím přidejte si nějaký kliknutím na RSS ikonku v navigačním řádku. - + Server refused the connection Server odmítl spojení - + Server closed the connection Server ukončil spojení - + Server not found Server nenalezen - + Connection timed out Spojení vypršelo - + Untrusted connection Nedůvěryhodné spojení - + AdBlocked Content AdBlock obsah - + Blocked by rule <i>%1</i> Blokováno pravidlem <i>%1</i> - + Content Access Denied Odmítnut přístup k obsahu - + Error code %1 Chybový kód %1 - + Failed loading page Chyba při načítání stránky - + QupZilla can't load page from %1. QupZilla nemůže načíst stránku ze serveru %1. - + Check the address for typing errors such as <b>ww.</b>example.com instead of <b>www.</b>example.com Zkontrolujte, zda je adresa napsána správně a neobsahuje chyby jako <b>ww.</b>server.cz místo <b>www</b>.server.cz - + If you are unable to load any pages, check your computer's network connection. Pokud se vám nezobrazují ani ostatní stránky, zkontrolujte síťové připojení svého počítače. - + If your computer or network is protected by a firewall or proxy, make sure that QupZilla is permitted to access the Web. Pokud je váš počítač chráněn firewallem a nebo proxy serverem, zkontrolujte, zda má QupZilla přístup na Internet. - + Try Again Zkusit znovu - + Choose file... Vyberte soubor... @@ -3528,134 +3498,134 @@ Prosím přidejte si nějaký kliknutím na RSS ikonku v navigačním řádku.Načítám... - + Open link in new &tab Otevřít odkaz v novém &panelu - + Open link in new &window Otevřít odkaz v novém &okně - + B&ookmark link Přidat odkaz do zá&ložek - + &Save link as... &Uložit odkaz jako... - + &Copy link address &Kopírovat adresu odkazu - + Show i&mage Zobrazit &obrázek - + Copy im&age &Kopírovat obrázek - + Copy image ad&dress Kopírovat adr&esu obrázku - + S&top &Zastavit - + Show info ab&out site Zobrazit &informace o stránce - + Show Web &Inspector Zobrazit Web &Inspektor - + Search "%1 .." on &Google Hledat "%1 .." na &Googlu - + &Save image as... &Uložit obrázek jako... - + Failed loading page Chyba při načítání stránky - + &Back &Zpět - + &Forward &Vpřed - + &Reload &Obnovit - + Book&mark page Přidat stránku do zá&ložek - + &Save page as... &Uložit stránku jako... - + Select &all Vyb&rat vše - + Show so&urce code Zobrazit zdrojový kó&d - + No Named Page Bezejmenná stránka - - - + + + New tab Nový panel - + Send link... Odeslat odkaz... - + Send image... Odeslat obrázek... - + Send page... Odeslat stránku... @@ -3663,7 +3633,7 @@ Prosím přidejte si nějaký kliknutím na RSS ikonku v navigačním řádku. jsAlert - + Prevent this page from creating additional dialogs Zabránit stránce ve vytváření dalších dialogů diff --git a/translations/sk_SK.ts b/translations/sk_SK.ts index 4e7721c09..032967f40 100644 --- a/translations/sk_SK.ts +++ b/translations/sk_SK.ts @@ -9,7 +9,7 @@ O QupZille - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -22,7 +22,7 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> - + Authors Autori @@ -271,13 +271,13 @@ p, li { white-space: pre-wrap; } BookmarkIcon - - + + Bookmark this Page Pridať stránku do záložiek - + Edit this bookmark Upraviť záložku @@ -315,7 +315,7 @@ p, li { white-space: pre-wrap; } Pridať zložku - + Optimize Database Optimalizovať databázu @@ -336,19 +336,19 @@ p, li { white-space: pre-wrap; } - - - - + + + + Bookmarks In Menu Záložky v menu - - - - + + + + Bookmarks In ToolBar Panel záložiek @@ -367,40 +367,35 @@ p, li { white-space: pre-wrap; } Move bookmark to &folder Presunúť záložku do &zložky - - - &Close - &Zavrieť - - - + + Unsorted Bookmarks Nezotriedené záložky - + <b>Warning: </b>You already have this page bookmarked! <b>Upozornenie: </b>Túto stránku máte už v záložkách! - + Choose name and location of bookmark. Zvoľte meno a umiestnenie záložky. - + Add New Bookmark Pridať záložku - + Choose folder for bookmarks: Zvoľte zložku pre záložku: - + Bookmark All Tabs Pridať všetky panely do záložiek @@ -483,52 +478,42 @@ p, li { white-space: pre-wrap; } BookmarksToolbar - - Bookmarks - Záložky - - - + &Bookmark Current Page Pridať &stránku do záložiek - + Bookmark &All Tabs Pridať &všetky panely do záložiek - + &Organize Bookmarks &Organizovať záložky - - &Reload Toolbar - O&bnoviť panel - - - + Hide Most &Visited Skryť &Najnavštevovanejšie - + Show Most &Visited Zobraziť &Najnavštevovanejšie - + &Hide Toolbar Skr&yť panel - + Most visited Najnavštevovanejšie - + Sites You visited the most Najnavštívenejšie stránky @@ -589,7 +574,7 @@ p, li { white-space: pre-wrap; } Knižnica - + Search... Hľadať... @@ -609,12 +594,12 @@ p, li { white-space: pre-wrap; } RSS - + Database Optimized Databáza optimalizovaná - + Database successfuly optimized.<br/><br/><b>Database Size Before: </b>%1<br/><b>Databse Size After: </b>%2 Databáza bola úspešne optimalizovaná.<br/><br/><b>Veľkosť databáze pred: </b>%1<br/><b>Veľkosť databáze por: </b>%2 @@ -622,62 +607,62 @@ p, li { white-space: pre-wrap; } ClearPrivateData - + Clear Recent History Vymazať nedávnu históriu - + Choose what you want to delete: Vyberte, čo chcete zmazať: - + Clear history Zmazať históriu - + Clear cookies Zmazať cookies - + Clear cache Zmazať vyrovnávaciu pamäť - + Clear icons Zmazať ikony - + Clear cookies from Adobe Flash Player Zmazať cookies z Adobe Flash Playeru - + <b>Clear Recent History</b> <b>Vymazať nedávnu históriu</b> - + Later Today Deň - + Week Týždeň - + Month Mesiac - + All Všetko @@ -685,37 +670,37 @@ p, li { white-space: pre-wrap; } ClickToFlash - + Object blocked by ClickToFlash Objekt zablokovaný ClickToFlash pluginom - + Show more informations about object Zobraziť viac informácií o projekte - + Add %1 to whitelist Pridať %1 na bielu listinu - + Flash Object Flash objekt - + <b>Attribute Name</b> <b>Názov atribúty</b> - + <b>Value</b> <b>Hodnota</b> - + No more informations available. Žiadne ďalšie informácie. @@ -817,11 +802,6 @@ p, li { white-space: pre-wrap; } Remove cookie Odstrániť cookie - - - Del - Del - Search @@ -861,12 +841,12 @@ p, li { white-space: pre-wrap; } DownloadItem - + A Clockwork Orange.avi - + Remaining 26 minutes - 339MB of 693 MB (350kB/s) @@ -1052,7 +1032,7 @@ p, li { white-space: pre-wrap; } Správca sťahovania - + Clear Vyčistiť @@ -1133,7 +1113,7 @@ p, li { white-space: pre-wrap; } Vymazať celú históriu - + Optimize Database Optimalizovať databázu @@ -1153,35 +1133,30 @@ p, li { white-space: pre-wrap; } Otvoriť odkaz na novom panely - - Close - Zavrieť - - - - + + Today Dnes - - + + This Week Tento týždeň - - + + This Month Tento mesiac - + Confirmation Potvrdenie - + Are you sure to delete all history? Skutočne chcete vymazať celú históriu? @@ -1308,22 +1283,22 @@ p, li { white-space: pre-wrap; } LocationBar - + Show informations about this page Zobraziť informácie o tejto stránke - + Add RSS from this page... Pridať RSS kanál... - + Enter URL address or search on Google.com Zadajte URL adresu alebo vyhľadajte na Google.com - + .co.uk Append domain name on ALT key = Should be different for every country .sk @@ -1342,16 +1317,50 @@ p, li { white-space: pre-wrap; } MainApplication - + Last session crashed Posledná relácia spadla - + <b>QupZilla crashed :-(</b><br/>Oops, last session of QupZilla ends with its crash. We are very sorry. Would you try to restore saved state? <b>QupZilla spadla :-(</b><br/>Oops, posledná relácia QupZilly skončila chybou. Prepáčte. Chcete obnoviť uložený stav? + + NavigationBar + + + Back + Späť + + + + Forward + Dopredu + + + + Home + Domov + + + + New Tab + Nový panel + + + + Main Menu + Hlavné menu + + + + + Exit Fullscreen + Ukončiť režím Fullscreen + + NetworkManager @@ -1508,7 +1517,7 @@ p, li { white-space: pre-wrap; } Hlavné - + 1 1 @@ -1599,62 +1608,57 @@ p, li { white-space: pre-wrap; } <b>Hlavné</b> - - Window - Okno prehliadača - - - + Show StatusBar on start Zobraziť StatusBar pri štarte - + Show Bookmarks ToolBar on start Zobraziť panel záložiek pri štarte - + Show Navigation ToolBar on start Zobraziť navigačný panel pri štarte - + <b>Navigation ToolBar</b> <b>Navigačný panel</b> - + Allow storing network cache on disk Povoliť ukladanie sieťovej cache na disk - + <b>Cookies</b> <b>Cookies</b> - + <b>Address Bar behaviour</b> <b>Chovanie adresového riadku</b> - + <b>Language</b> <b>Jazyk</b> - + Show Home button Zobraziť tlačidlo domov - + Show Back / Forward buttons Zobraziť tlačidlo Späť / Dopredu - + <b>Browser Window</b> <b>Okno prehliadača</b> @@ -1670,78 +1674,63 @@ p, li { white-space: pre-wrap; } Použiť aktuálny - + <b>Background<b/> <b>Pozadie<b/> - - Use background image - Použiť pozadie - - - + Use transparent background Použiť priehľadné pozadie - - Choose image... - Zvoľte obrázok... - - - - Reset default - Obnoviť povodné - - - + <b>Tabs behavior</b> <b>Chovanie panelov</b> - + Make tabs movable Presunúť panely pretiahnutím - + Hide close button if there is only one tab Skryť zavieracie tlačidlo pri jednom panely - + Hide tabs when if there is only one tab Skryť zoznam panelov pri jednom panely - + Web Configuration Nastavenie Webu - + Maximum Maximálne - + 50 MB 50 MB - + Ask everytime for download location Pri každom súbore sa spýtať kde ho uložiť - + Use defined location: Uložiť všetky súbory do: - - + + ... ... @@ -1751,27 +1740,27 @@ p, li { white-space: pre-wrap; } Prehliadanie - + Load images Nahrať obrázky - + Allow JAVA Povoliť JAVA - + Allow JavaScript Povoliť JavaScript - + Allow Plugins (Flash plugin) Povoliť pluginy (Flash plugin) - + Maximum pages in cache: Maximum stránok v cache: @@ -1781,12 +1770,12 @@ p, li { white-space: pre-wrap; } Správca hesiel - + <b>AutoFill options</b> <b>Možnosťi doplňovania</b> - + Allow saving passwords from sites Povoliť ukladanie hesiel zo stránok @@ -1805,290 +1794,295 @@ p, li { white-space: pre-wrap; } Note: You cannot delete active profile. Poznámka: Nemôžete zmazať aktívny profil. - - - This is text color used in Menu - Toto je text používaný v menu - - - - Menu text color - Farba menu textu - Notifications Oznámenie - + Show Add Tab button Zobraziť Pridať panel tlačítko - + Activate last tab when closing active tab Aktivovať posledný panel pri zatváraní aktuálneho - + Block PopUp windows Blokovať vyskakovacie okna - + Allow DNS Prefetch Povoliť DNS Prefetch - + JavaScript can access clipboard Povoliť JavaScriptu prístup do schránky - + Include links in focus chain Označovať odkazy tabulátorom - + Zoom text only Približovať len text - + Print element background Tlačiť pozadie objektu - + Send Do Not Track header to servers Zasielať serverom Do Not Track hlavičku - + + Appereance + Vzhľad + + + + Themes + Témy + + + + Advanced options + Pokročilé naastavenia + + + Ask when closing multiple tabs Pýtať sa pri zavieraní viacerých panelov - + Mouse wheel scrolls Koliečko myši posunie - + lines on page riadky na stránke - + Local Storage Lokálne úložisko - + Proxy Configuration Nastavenie proxy - + <b>Font Families</b> <b>Typy písmen</b> - + Standard Štandardné - + Fixed Proporcionálne - + Serif Serif - + Sans Serif Sans Serif - + Cursive Cursive - + Default Font Základné písmo - + Fixed Font Proporcionálne písmo - + Fantasy Fantasy - + <b>Font Sizes</b> <b>Veľkosti písmen</b> - + <b>Download Location</b> <b>Cieľ sťahovania</b> - + <b>Download Options</b> <b>Možnosti sťahovania</b> - + Use native system file dialog (may or may not cause problems with downloading SSL secured content) Použiť natívny systémový dialóg pre výber súboru (môže ale aj nemusí robiť problémy pri sťahovaní SSL zabezpečeného obsahu) - + Filter Tracking Cookies Filtrovať sledovacie cookies - + Allow storing of cookies Povoliť prijímanie cookies - + Delete cookies on close Vymazať cookies pri zavrení prehliadača - + Match domain exactly Požadovať presnú zhodu domény - + <b>Warning:</b> Match domain exactly and Filter Tracking Cookies options can lead to deny some cookies from sites. If you have problems with cookies, try to disable this options first! <b>Upozornenie:</b> Možnosti požadovanie presnej zhody domény a filtrovať sledovacie cookies môžú viesť k odmietnutiu niektorých cookies zo stránok. Ak máte problémy s cookies, skuste tieto možnosti najskôr zakázať! - + Cookies Manager Správca cookies - + <b>Notifications</b> <b>Oznámenia</b> - + Use OSD Notifications Použiť OSD oznámenia - + Use Native System Notifications (Linux only) Používať natívne systémové oznámenie (len pre Linux) - + Do not use Notifications Nepoužívať oznámenia - + Expiration timeout: Doba: - + seconds sekúnd - + <b>Note: </b>You can change position of OSD Notification by dragging it on the screen. <b>Poznámka: </b>Pretiahnutím oznámenia na obrazovke môžete zmeniť pozíciu jeho OSD. - + <b>User CSS StyleSheet</b> <b>Užívateľský CSS štýl</b> - + StyleSheet automatically loaded with all websites: Štýl automaticky načítať na všetky stránky: - + System proxy configuration Systémové nastavenia proxy - + Do not use proxy Nepoužívať prosy - + Manual configuration Ručné nastavenia - + HTTP HTTP - + SOCKS5 SOCKS5 - + Port: Port: - + Username: Meno: - + Password: Heslo: - + Don't use on: Nepoužívať na: - + Allow storing web icons Povoliť ukládanie ikon - + Allow saving history Povoliť ukladanie histórie - + Delete history on close Vymazať históriu pri zavretí prehliadača @@ -2098,94 +2092,89 @@ p, li { white-space: pre-wrap; } Ostatné - + Select all text by double clicking in address bar Select all text by clicking at address bar Označiť všetko pri dvojtom kliknutí do adresného riadku - + Add .com domain by pressing CTRL key Pridať .com doménu stlačením CTRL klávesy - + Add .co.uk domain by pressing ALT key Pridať .sk doménu stlačením ALT klávesy - + SSL Manager Správca SSL - + Available translations: Dostupné preklady: - + In order to change language, you must restart browser. K zmene jazyku je potrebný reštart prehliadača. - + OSD Notification OSD Oznámenie - + Drag it on the screen to place it where You want. Pretiahnete ho na obrazovke na miesto, na ktorom ho chcete mať. - + Choose download location... Vyberte zložku pre sťahovanie... - - Choose background location... - Zvoľte lokáciu pozadia... - - - + Choose stylesheet location... Vyberte umiestnenie štýlu... - + New Profile Nový profil - + Enter the new profile's name: Zadajte nové meno profilu: - - + + Error! Chyba! - + This profile already exists! Tento profil už existuje! - + Cannot create profile directory! Nemožno vytvoriť zložku profilu! - + Confirmation Potvrdenie - + Are you sure to permanently delete "%1" profile? This action cannot be undone! Ste si istý, že chcete permanentne zmazať profil "%1"? Táto akcia sa nebude dať vrátiť späť! @@ -2226,442 +2215,402 @@ p, li { white-space: pre-wrap; } QupZilla - + File Súbor - + Edit Upraviť - + Tools Nástroje - + Help Pomocník - + View Zobraziť - - + + Bookmarks Záložky - - + + History História - + Quit Koniec - + New Tab Nový panel - + Close Tab Zavriet panel - + IP Address of current page IP Adresa aktuálnej stránky - + &New Window &Nové okno - + Open &File Otvoriť &súbor - + &Save Page As... &Uložiť stránku ako... - + &Print &Tlačiť - - Stop - Zastaviť - - - - Reload - Obnoviť - - - + &Undo &Späť - + &Redo &Dopredu - + &Cut &Vystrihnúť - + C&opy &Kopírovať - + &Paste &Prilepiť - + &Delete &Odstrániť - + Select &All Vybrať vš&etko - + &Find &Hľadať - + &Navigation Toolbar &Navigačná lišta - + &Bookmarks Toolbar Panel &záložiek - + Sta&tus Bar Status &bar - + Toolbars Nástrojové lišty - + Sidebars Bočné lišty - + &Page Source Zdrojový &kód stránky - + &Menu Bar &Menu - + &Fullscreen &Celá obrazovka - + &Stop Zasta&viť - + &Reload &Obnoviť - + Character &Encoding Kódovan&ie znakov - + Zoom &In Prib&lížiť - + Zoom &Out Od&dialiť - + Reset Resetovať - - Back - Späť - - - - Forward - Dopredu - - - - Home - Domov - - - + Close Window Zavrieť okno - + Open Location Otvoriť adresu - + Send Link... Poslať odkaz... - + Other Ostatné - + Default Základné - + Start Private Browsing Spustiť anonymné prehliadanie - - Navigation - Navigácia - - - - Main Menu - Hlavné menu - - - - Exit Fullscreen - Ukončiť režím Fullscreen - - - + Private Browsing Enabled Súkromné prehliadanie je zapnuté - + Restore &Closed Tab Obnoviť zavretý pan&el - + Bookmarks In ToolBar Panel záložiek - - - + + + Empty Prázdny - + New tab Nový panel - + Bookmark &This Page Pridať &stránku do záložiek - + Bookmark &All Tabs Pridať &všetky panely do záložiek - + Organize &Bookmarks &Organizovať záložky - + &Back &Späť - + &Forward &Dopredu - + &Home Do&mov - + Show &All History Zobraziť celú &históriu - + Closed Tabs Zatvorené panely - + Restore All Closed Tabs Obnoviť všetky zatvorené panely - + Clear list Vyčistiť list - + Report &Bug Nahlásiť &chybu - + About &Qt O &Qt - + &About QupZilla &O QupZille - + &Web Search Hladať na &webu - + Page &Info &Informácie o stránke - + &Download Manager Správca &sťahovania - + &Cookies Manager Správca &cookies - + &AdBlock &AdBlock - + RSS &Reader &RSS čítač - + Clear Recent &History Vymazať nedávnu &históriu - + &Private Browsing Súkromné prehlia&danie - + Pr&eferences Pr&edvoľby - - + + Web Inspector Web inšpektor - + Open file... Otvoriť súbor... - + Are you sure you want to turn on private browsing? Ste si istý, že chcete zapnúť súkromné prehliadanie? - + When private browsing is turned on, some actions concerning your privacy will be disabled: So zapnutým súkromným prehliadaním sú niektoré akcie týkajúce sa súkromia vypnuté: - + Webpages are not added to the history. Stránky nie sú pridávané do histórie. - + New cookies are not stored, but current cookies can be accessed. Nové cookies nie sú prijímané, ale súčasné cookies sú zasielané. - + Your session won't be stored. Vaša relácia nebude uložená. - + Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened. Dokiaľ nezavriete prehliadač, tak stále môžete používať tlačidla Späť a Dopredu k vráteniu sa na stránky, ktoré ste mali otvorené. - + There are still %1 open tabs and your session won't be stored. Are you sure to quit? Stále sú otvorené %1 panely a Vaša relácia nebude uložená. Skutočne chcete skončiť? @@ -2674,7 +2623,7 @@ p, li { white-space: pre-wrap; } RSS čítačka - + Empty Prázdny @@ -2687,22 +2636,22 @@ Please add some with RSS icon in navigation bar on site which offers feeds. - + Reload Obnoviť - + Edit feed Upraviť kanál - + Delete feed Zmazať kanál - + Optimize Database Optimalizovať databázu @@ -2748,28 +2697,23 @@ Prosím pridajte si nejaký kliknutím na RSS ikonku v navigačnom riadku.Otvoriť odkaz na novom panely - - Close - Zavrieť - - - - + + New Tab Nový panel - + Error in fetching feed Chyba pri sťahovaní kanálu - + RSS feed duplicated Duplikovaný kanál - + You already have this feed. Tento kanál už odoberáte. @@ -2800,6 +2744,19 @@ Prosím pridajte si nejaký kliknutím na RSS ikonku v navigačnom riadku.Pridať + + ReloadStopButton + + + Stop + Zastaviť + + + + Reload + Obnoviť + + SSLManager @@ -2861,7 +2818,7 @@ Prosím pridajte si nejaký kliknutím na RSS ikonku v navigačnom riadku. SearchToolBar - + No results found. Žiadny výsledok. @@ -3380,38 +3337,51 @@ Prosím pridajte si nejaký kliknutím na RSS ikonku v navigačnom riadku. TabWidget - + Show list of opened tabs Zobraziť zoznam otvorených panelov - - Add Tab - Pridať panel - - - + Loading... Nahrávam... - - + + No Named Page Stránka bez mena - + Actually You have %1 opened tabs Momentálne otvorených %1 panelov - - + + New tab Nový panel + + ThemeManager + + + <b>Name:</b> + <b>Meno:</b> + + + + <b>Author:</b> + <b>Autor:</b> + + + + <b>Description:</b> + <b>Popis:</b> + + Updater @@ -3440,82 +3410,82 @@ Prosím pridajte si nejaký kliknutím na RSS ikonku v navigačnom riadku. - + Server refused the connection Server odmietol spojenie - + Server closed the connection Server ukončil spojenie - + Server not found Server nebol nájdený - + Connection timed out Spojenie vypršalo - + Untrusted connection Nedôveryhodné spojenie - + AdBlocked Content AdBlock obsah - + Blocked by rule <i>%1</i> Blokováno pravidlom <i>%1</i> - + Content Access Denied Odmietnuť prístup k obsahu - + Error code %1 Chybový kód %1 - + Failed loading page Chyba pri načítaní stránky - + QupZilla can't load page from %1. QupZilla nemôže načítať stránku zo serveru %1. - + Check the address for typing errors such as <b>ww.</b>example.com instead of <b>www.</b>example.com Skontrolujte, či je adresa napísaná správne a neobsahuje chyby ako <b>ww.</b>server.sk miesto <b>www.</b>server.sk - + If you are unable to load any pages, check your computer's network connection. Pokiaľ sa vám nezobrazujú ani ostatné stránky, tak skontrolujte sieťové pripojenie svojho počítača. - + If your computer or network is protected by a firewall or proxy, make sure that QupZilla is permitted to access the Web. Pokiaľ je váš počítač chránený firewallom alebo proxy severom, tak skontrolujte či má QupZilla prístup na internet. - + Try Again Skúsiť znova - + Choose file... Zvoľte súbor... @@ -3528,134 +3498,134 @@ Prosím pridajte si nejaký kliknutím na RSS ikonku v navigačnom riadku.Načítavam... - + Open link in new &tab Otvoriť odkaz na &novom panely - + Open link in new &window Otvoriť odkaz v novom &okne - + B&ookmark link Pridať odkaz do &záložiek - + &Save link as... &Uložiť odkaz... - + &Copy link address &Kopírovať adresu odkazu - + Show i&mage Zobraziť o&brázok - + Copy im&age &Kopírovať obrázok - + Copy image ad&dress Kopírovať adres&u obrázku - + S&top &Zastaviť - + Show info ab&out site Zobraziť &informácie o stránke - + Show Web &Inspector Zobraziť Web inšpe&ktora - + Search "%1 .." on &Google Hľadať "%1 .." na &Googli - + &Save image as... &Uložiť obrázok ako... - + Failed loading page Chyba pri načítaní stránky - + &Back &Späť - + &Forward &Dopredu - + &Reload &Obnoviť - + Book&mark page Pridať s&tránku do záložiek - + &Save page as... &Uložiť stránku ako... - + Select &all Vybrať vš&etko - + Show so&urce code Zobraziť zdro&jový kód - + No Named Page Stránka bez mena - - - + + + New tab Nový panel - + Send link... Odoslať odkaz... - + Send image... Odoslať obrázok... - + Send page... Odoslať stránku... @@ -3663,7 +3633,7 @@ Prosím pridajte si nejaký kliknutím na RSS ikonku v navigačnom riadku. jsAlert - + Prevent this page from creating additional dialogs Zabrániť stránke vo vytváraní ďaľších dialógov