From a13fd68e4e3484c7f8a7080fd517d9f84d7ecd96 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 8 Dec 2013 22:11:16 +0100 Subject: Fix && uniform UI width --- src/settings/settings_advanced.ui | 79 +++++-- src/settings/settings_appearance.ui | 452 ++++++++++++++++++++++-------------- src/settings/settings_general.ui | 34 ++- src/settings/settings_privacy.ui | 192 ++++++++------- src/settings/settings_tabs.ui | 53 ++++- src/settings/settings_webkit.ui | 33 ++- 6 files changed, 541 insertions(+), 302 deletions(-) (limited to 'src') diff --git a/src/settings/settings_advanced.ui b/src/settings/settings_advanced.ui index 611636c6..c34d24d6 100644 --- a/src/settings/settings_advanced.ui +++ b/src/settings/settings_advanced.ui @@ -6,8 +6,8 @@ 0 0 - 515 - 538 + 570 + 473 @@ -19,32 +19,34 @@ + + + 0 + 0 + + - 250 + 0 0 - Rekonq is using your system's proxy settings + Rekonq is using system proxy settings + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - Qt::Horizontal - - + + - 60 - 20 + 300 + 0 - - - - Change proxy settings @@ -63,21 +65,18 @@ Custom Style Sheet - - - QFormLayout::ExpandingFieldsGrow - - + + - + 0 0 - 250 + 0 0 @@ -85,12 +84,24 @@ Path to custom CSS file: - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - + + + + 0 + 0 + + + + + 300 + 0 + + *.css @@ -157,16 +168,34 @@ + + + 0 + 0 + + Middle click should: - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0 + 0 + + + + + 300 + 0 + + Auto-scroll diff --git a/src/settings/settings_appearance.ui b/src/settings/settings_appearance.ui index 4246a92c..1a5d7a47 100644 --- a/src/settings/settings_appearance.ui +++ b/src/settings/settings_appearance.ui @@ -6,7 +6,7 @@ 0 0 - 417 + 502 558 @@ -19,160 +19,234 @@ Fonts - - - - - - - - 0 - 0 - - - - - 200 - 0 - - - - Standard font: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 200 - 0 - - - - Fixed font: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 200 - 0 - - - - Serif font: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - 0 - 0 - - - - - 200 - 0 - - - - Sans Serif font: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - - - - - - 0 - 0 - - - - - 200 - 0 - - - - Cursive font: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - 0 - 0 - - - - - 200 - 0 - - - - Fantasy font: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Standard font: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 300 + 0 + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Fixed font: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 300 + 0 + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Serif font: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 300 + 0 + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Sans Serif font: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 300 + 0 + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Cursive font: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 300 + 0 + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Fantasy font: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 300 + 0 + + + @@ -186,14 +260,14 @@ - + 0 0 - 200 + 0 0 @@ -205,20 +279,17 @@ - - - - + 0 0 - 200 + 0 0 @@ -231,7 +302,24 @@ - + + + + 300 + 0 + + + + + + + + + 300 + 0 + + + @@ -245,14 +333,14 @@ - + 0 0 - 200 + 0 0 @@ -265,7 +353,20 @@ - + + + + 0 + 0 + + + + + 300 + 0 + + + @@ -279,14 +380,14 @@ - + 0 0 - 200 + 0 0 @@ -299,7 +400,20 @@ - + + + + 0 + 0 + + + + + 300 + 0 + + + diff --git a/src/settings/settings_general.ui b/src/settings/settings_general.ui index 66424fa6..e0aea007 100644 --- a/src/settings/settings_general.ui +++ b/src/settings/settings_general.ui @@ -23,14 +23,14 @@ - + 0 0 - 150 + 0 0 @@ -48,7 +48,7 @@ - + 0 0 @@ -73,11 +73,17 @@ true - + 0 0 + + + 300 + 0 + + @@ -107,11 +113,17 @@ - + 0 0 + + + 300 + 0 + + Open the Home Page @@ -148,14 +160,14 @@ - + 0 0 - 150 + 0 0 @@ -167,11 +179,17 @@ - + 0 0 + + + 300 + 0 + + diff --git a/src/settings/settings_privacy.ui b/src/settings/settings_privacy.ui index d864fecf..fd0e60ba 100644 --- a/src/settings/settings_privacy.ui +++ b/src/settings/settings_privacy.ui @@ -50,96 +50,37 @@ - - - - History - - - - - - - - Remove history items: - - - - - - - - Never - - - - - Every 3 months - - - - - Every month - - - - - Every day - - - - - At application exit - - - - - Do not even store them - - - - - - - - - Passwords - + - - - - - Remember passwords for sites - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Manage Exceptions - - - - + + + + 0 + 0 + + + + Remember passwords for sites + + + + + + + + 300 + 0 + + + + Manage Exceptions + + @@ -164,6 +105,12 @@ + + + 150 + 0 + + Manage Cookies @@ -212,6 +159,12 @@ + + + 150 + 0 + + Manage Cache @@ -240,6 +193,77 @@ + + + + History + + + + + + + 0 + 0 + + + + Remove history items: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 300 + 0 + + + + + Never + + + + + Every 3 months + + + + + Every month + + + + + Every day + + + + + At application exit + + + + + Do not even store them + + + + + + + diff --git a/src/settings/settings_tabs.ui b/src/settings/settings_tabs.ui index 51546635..6acc06d8 100644 --- a/src/settings/settings_tabs.ui +++ b/src/settings/settings_tabs.ui @@ -19,15 +19,18 @@ New Tab Behavior - - - QFormLayout::ExpandingFieldsGrow - + + + + 0 + 0 + + - 150 + 0 0 @@ -45,11 +48,17 @@ true - + 0 0 + + + 300 + 0 + + New Tab Page @@ -69,9 +78,15 @@ + + + 0 + 0 + + - 150 + 0 0 @@ -89,11 +104,17 @@ true - + 0 0 + + + 300 + 0 + + Favorites @@ -134,9 +155,15 @@ + + + 0 + 0 + + - 150 + 0 0 @@ -154,11 +181,17 @@ true - + 0 0 + + + 300 + 0 + + Tab Preview diff --git a/src/settings/settings_webkit.ui b/src/settings/settings_webkit.ui index 3d03561c..aa34a4dc 100644 --- a/src/settings/settings_webkit.ui +++ b/src/settings/settings_webkit.ui @@ -96,21 +96,21 @@ Plugins - - + + true - + 0 0 - 150 + 0 0 @@ -122,14 +122,20 @@ - + - + 0 0 + + + 300 + 0 + + Autoload Plugins @@ -181,13 +187,28 @@ + + + 0 + 0 + + Offline web application quota + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 300 + 0 + + 0 -- cgit v1.2.1