From a65f146578f927898321f1bc0dcb224317245931 Mon Sep 17 00:00:00 2001 From: Richard Maudsley Date: Wed, 15 Jan 2014 15:30:09 +0000 Subject: Improved highlight editor gui layout. Change-Id: I95d2d3de764f01a44d64a5f2846c4809cf46574a diff --git a/Swift/QtUI/QtHighlightEditor.cpp b/Swift/QtUI/QtHighlightEditor.cpp index d22756a..5ac2857 100644 --- a/Swift/QtUI/QtHighlightEditor.cpp +++ b/Swift/QtUI/QtHighlightEditor.cpp @@ -4,6 +4,12 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ +/* + * Copyright (c) 2014 Kevin Smith and Remko Tronçon + * Licensed under the GNU General Public License v3. + * See Documentation/Licenses/GPLv3.txt for more information. + */ + #include #include diff --git a/Swift/QtUI/QtHighlightEditor.h b/Swift/QtUI/QtHighlightEditor.h index 4aa42ae..c4c008d 100644 --- a/Swift/QtUI/QtHighlightEditor.h +++ b/Swift/QtUI/QtHighlightEditor.h @@ -4,6 +4,12 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ +/* + * Copyright (c) 2014 Kevin Smith and Remko Tronçon + * Licensed under the GNU General Public License v3. + * See Documentation/Licenses/GPLv3.txt for more information. + */ + #pragma once #include diff --git a/Swift/QtUI/QtHighlightEditor.ui b/Swift/QtUI/QtHighlightEditor.ui index d0ea682..474d384 100644 --- a/Swift/QtUI/QtHighlightEditor.ui +++ b/Swift/QtUI/QtHighlightEditor.ui @@ -6,8 +6,8 @@ 0 0 - 403 - 779 + 742 + 677 @@ -16,237 +16,148 @@ - 20 - 200 - 376 - 364 + 380 + 230 + 371 + 201 Rule conditions - - - QFormLayout::ExpandingFieldsGrow - - - - - Choose when this rule should be applied. -If you want to provide more than one sender or keyword, input them in separate lines. - - - true - - - - - - - Qt::Horizontal - - - - - - - &Apply to: - - - applyTo - - - - - - - - - - Sender: - - - - - - - &Keywords: - - - keywords - - - - - - - - - - Treat &nick as a keyword (in MUC) - - - - - - - Match whole &words - - - - - - - Match &case - - - - - - - - - - - - 20 - 570 - 376 - 142 - - - - Actions + + false - - - - - &Highlight text - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 28 - 20 - - - - - - - - false - - - Custom c&olors: - - - - - - - false - - - &Foreground - - - Qt::ToolButtonTextBesideIcon - - - - - - - false - - - &Background - - - Qt::ToolButtonTextBesideIcon - - - - - - - - - &Play sound - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 28 - 20 - - - - - - - - false - - - Custom soun&d: - - - - - - - false - - - true - - - - - - - false - - - ... - - - - - - + + + + 0 + 120 + 351 + 74 + + + + + + + Messages that mention my nickname + + + + + + + Match keyword within longer words + + + + + + + Keyword is case sensitive + + + + + + + + + 0 + 30 + 351 + 22 + + + + + + + Apply to: + + + + + + + Chats + + + + + + + Rooms + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + 0 + 60 + 351 + 25 + + + + + + + Sender name: + + + + + + + + + + + + 0 + 90 + 351 + 25 + + + + + + + Keyword: + + + + + + + + - 120 - 740 - 271 + 480 + 640 + 251 27 @@ -258,9 +169,9 @@ If you want to provide more than one sender or keyword, input them in separate l 10 - 710 - 381 - 31 + 621 + 721 + 20 @@ -272,8 +183,8 @@ If you want to provide more than one sender or keyword, input them in separate l 10 10 - 381 - 181 + 721 + 191 @@ -304,33 +215,53 @@ If you want to provide more than one sender or keyword, input them in separate l - New + + + + + + - Delete + + + + + + - Move up + + + + + + - Move down + + + + + + - + Qt::Vertical @@ -348,6 +279,266 @@ If you want to provide more than one sender or keyword, input them in separate l + + + + 380 + 430 + 371 + 91 + + + + Highlight Action + + + + + 0 + 30 + 351 + 22 + + + + + + + No Highlight + + + true + + + + + + + Default Color + + + + + + + Custom Color + + + + + + + + + 0 + 60 + 351 + 23 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + false + + + &Foreground + + + Qt::ToolButtonTextBesideIcon + + + + + + + false + + + &Background + + + Qt::ToolButtonTextBesideIcon + + + + + + + + + + 380 + 520 + 371 + 91 + + + + Sound Action + + + + + 0 + 30 + 351 + 22 + + + + + + + No Sound + + + true + + + + + + + Default Sound + + + + + + + Custom Sound + + + + + + + + + 0 + 60 + 351 + 25 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + false + + + true + + + + + + + false + + + ... + + + + + + + + + + 10 + 200 + 721 + 31 + + + + Qt::Horizontal + + + + + + 10 + 360 + 361 + 261 + + + + Example Highlights + + + + + 0 + 30 + 361 + 221 + + + + + + + + 10 + 230 + 361 + 131 + + + + Example Highlights + + + + + 0 + 30 + 361 + 91 + + + + <!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; } +</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This rule will match messages either in chats or in rooms if the sender is called 'Admin', and the message contains 'Urgent' (not case sensitive) as a part of any word.</p></body></html> + + + -- cgit v0.10.2-6-g49f6