From 79da84574c2e95ec37894b869668d6b6ffc71c59 Mon Sep 17 00:00:00 2001 From: Michael Groh Date: Wed, 2 Dec 2009 07:35:10 +0100 Subject: [PATCH] correct tab order for the settingspages --- .../settingspages/appearancesettingspage.ui | 18 + .../settingspages/bufferviewsettingspage.ui | 15 + .../settingspages/chatmonitorsettingspage.ui | 9 + .../settingspages/chatviewsettingspage.ui | 1 + .../settingspages/connectionsettingspage.ui | 9 + src/qtui/settingspages/coreaccounteditdlg.ui | 15 + src/qtui/settingspages/createidentitydlg.ui | 72 +-- src/qtui/settingspages/identityeditwidget.ui | 496 +++++++++--------- src/qtui/settingspages/ignorelisteditdlg.ui | 20 +- .../settingspages/inputwidgetsettingspage.ui | 1 + .../settingspages/itemviewsettingspage.ui | 2 +- src/qtui/settingspages/networkadddlg.ui | 140 ++--- .../settingspages/networkssettingspage.ui | 469 +++++++++-------- src/qtui/settingspages/servereditdlg.ui | 228 ++++---- .../settingspages/topicwidgetsettingspage.ui | 5 + 15 files changed, 831 insertions(+), 669 deletions(-) diff --git a/src/qtui/settingspages/appearancesettingspage.ui b/src/qtui/settingspages/appearancesettingspage.ui index 2e883240..4d611315 100644 --- a/src/qtui/settingspages/appearancesettingspage.ui +++ b/src/qtui/settingspages/appearancesettingspage.ui @@ -343,6 +343,24 @@ + + styleComboBox + languageComboBox + useCustomStyleSheet + customStyleSheetPath + chooseStyleSheet + useSystemTrayIcon + minimizeOnClose + userNoticesInDefaultBuffer + userNoticesInStatusBuffer + userNoticesInCurrentBuffer + serverNoticesInDefaultBuffer + serverNoticesInStatusBuffer + serverNoticesInCurrentBuffer + errorMsgsInDefaultBuffer + errorMsgsInStatusBuffer + errorMsgsInCurrentBuffer + diff --git a/src/qtui/settingspages/bufferviewsettingspage.ui b/src/qtui/settingspages/bufferviewsettingspage.ui index 8ad2beef..6ec07d6a 100644 --- a/src/qtui/settingspages/bufferviewsettingspage.ui +++ b/src/qtui/settingspages/bufferviewsettingspage.ui @@ -224,6 +224,21 @@ In this mode no separate status buffer is displayed.
settingspages/previewbufferview.h
+ + bufferViewList + renameBufferView + addBufferView + deleteBufferView + networkSelector + onlyStatusBuffers + onlyChannelBuffers + onlyQueryBuffers + hideInactiveBuffers + addNewBuffersAutomatically + sortAlphabetically + minimumActivitySelector + bufferViewPreview + diff --git a/src/qtui/settingspages/chatmonitorsettingspage.ui b/src/qtui/settingspages/chatmonitorsettingspage.ui index cec87941..e69524ac 100644 --- a/src/qtui/settingspages/chatmonitorsettingspage.ui +++ b/src/qtui/settingspages/chatmonitorsettingspage.ui @@ -167,6 +167,15 @@ p, li { white-space: pre-wrap; }
bufferview.h
+ + operationMode + availableBuffers + deactivateBuffer + activateBuffer + activeBuffers + showHighlights + showOwnMessages + diff --git a/src/qtui/settingspages/chatviewsettingspage.ui b/src/qtui/settingspages/chatviewsettingspage.ui index 5e87bb48..378c6513 100644 --- a/src/qtui/settingspages/chatviewsettingspage.ui +++ b/src/qtui/settingspages/chatviewsettingspage.ui @@ -763,6 +763,7 @@ timestampFormat + customChatViewFont allowMircColors showWebPreview useCustomColors diff --git a/src/qtui/settingspages/connectionsettingspage.ui b/src/qtui/settingspages/connectionsettingspage.ui index 00fb3c1f..484454c3 100644 --- a/src/qtui/settingspages/connectionsettingspage.ui +++ b/src/qtui/settingspages/connectionsettingspage.ui @@ -259,6 +259,15 @@ + + pingTimeoutEnabled + pingInterval + maxPingCount + autoWhoEnabled + autoWhoInterval + autoWhoNickLimit + autoWhoDelay + diff --git a/src/qtui/settingspages/coreaccounteditdlg.ui b/src/qtui/settingspages/coreaccounteditdlg.ui index 9477c082..379b6f23 100644 --- a/src/qtui/settingspages/coreaccounteditdlg.ui +++ b/src/qtui/settingspages/coreaccounteditdlg.ui @@ -298,6 +298,21 @@ + + accountName + hostName + port + user + password + rememberPassword + useProxy + proxyType + proxyHostName + proxyPort + proxyUser + proxyPassword + buttonBox + diff --git a/src/qtui/settingspages/createidentitydlg.ui b/src/qtui/settingspages/createidentitydlg.ui index 522f09f0..d713ed8b 100644 --- a/src/qtui/settingspages/createidentitydlg.ui +++ b/src/qtui/settingspages/createidentitydlg.ui @@ -1,10 +1,11 @@ - + + CreateIdentityDlg - - + + Qt::WindowModal - + 0 0 @@ -12,50 +13,50 @@ 135 - + Create New Identity - + - + - - + + Identity name: - + - - + + Create blank identity - + true - + - - + + Duplicate: - - + + false - - + + 0 0 @@ -66,10 +67,10 @@ - + Qt::Vertical - + 20 40 @@ -78,17 +79,24 @@ - - + + Qt::Horizontal - - QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + identityName + createBlankIdentity + duplicateIdentity + identityList + buttonBox + @@ -97,11 +105,11 @@ CreateIdentityDlg accept() - + 222 127 - + 157 134 @@ -113,11 +121,11 @@ CreateIdentityDlg reject() - + 290 127 - + 286 134 @@ -129,11 +137,11 @@ identityList setEnabled(bool) - + 55 80 - + 166 84 diff --git a/src/qtui/settingspages/identityeditwidget.ui b/src/qtui/settingspages/identityeditwidget.ui index 52489a4d..d8449908 100644 --- a/src/qtui/settingspages/identityeditwidget.ui +++ b/src/qtui/settingspages/identityeditwidget.ui @@ -1,7 +1,8 @@ - + + IdentityEditWidget - - + + 0 0 @@ -9,93 +10,93 @@ 422 - + - - + + 0 - + 0 - - - 0 + + + 2 - - + + General - + - + - - + + Real Name: - - - The "Real Name" is shown in /whois. + + + The "Real Name" is shown in /whois. - - + + Nicknames - + - - - + + + 1 0 - + true - + false - + QAbstractItemView::NoDragDrop - + QAbstractItemView::SelectRows - + - - - + + + 0 0 - + Add Nickname - + &Add... - + :/16x16/actions/oxygen/16x16/actions/list-add.png:/16x16/actions/oxygen/16x16/actions/list-add.png - + 16 16 @@ -104,53 +105,53 @@ - - - + + + 0 0 - + Remove Nickname - + Remove - + :/16x16/actions/oxygen/16x16/actions/edit-delete.png:/16x16/actions/oxygen/16x16/actions/edit-delete.png - - - + + + 0 0 - + Rename Identity - + Re&name... - + :/16x16/actions/oxygen/16x16/actions/edit-rename.png:/16x16/actions/oxygen/16x16/actions/edit-rename.png - + - + Qt::Horizontal - + 0 20 @@ -159,28 +160,28 @@ - - + + Move upwards in list - + ... - + :/16x16/actions/oxygen/16x16/actions/go-up.png:/16x16/actions/oxygen/16x16/actions/go-up.png - - + + Move downwards in list - + ... - + :/16x16/actions/oxygen/16x16/actions/go-down.png:/16x16/actions/oxygen/16x16/actions/go-down.png @@ -188,10 +189,10 @@ - + Qt::Horizontal - + 0 20 @@ -203,10 +204,10 @@ - + Qt::Vertical - + 124 76 @@ -221,49 +222,49 @@ - - + + A&way - + - - + + Default Away Settings - + - - - - + + + + false - + Nick to be used when being away - - - + + + true - + Default away reason - - - + + + Away Nick: - - - + + + Away Reason: @@ -274,31 +275,31 @@ - - + + Set away when all clients have detached from the core - + Away On Detach - + true - + false - + - + - - + + Away Reason: - + @@ -306,48 +307,48 @@ - - + + false - + Not implemented yet - + Away On Idle - + true - + false - + - + - - + + Set away after - + - - + + minutes of being idle - + Qt::Horizontal - + 40 20 @@ -358,17 +359,17 @@ - - - - + + + + Away Reason: - - - + + + false @@ -380,10 +381,10 @@ - + Qt::Vertical - + 20 40 @@ -393,63 +394,63 @@ - - + + Advanced - + - + - - + + Ident: - - - The "ident" is part of your hostmask and, together with your host, uniquely identifies you within the IRC network. + + + The "ident" is part of your hostmask and, together with your host, uniquely identifies you within the IRC network. - - + + Messages - + - - - - + + + + Part Reason: - - + + - - + + - - - + + + Quit Reason: - - + + - - - + + + Kick Reason: @@ -460,36 +461,36 @@ - - - + + + - + 0 - + 0 - - - + + + 0 - - + + - + - - + + You need an SSL Capable Client to edit your Cores SSL Key and Certificate - + Qt::AlignCenter - + true @@ -499,39 +500,39 @@ - - - + + + 0 - - + + - + - - + + Warning: you are not connected with a secured connection to the Quassel Core! Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificate! - + Qt::AlignCenter - + true - + - - + + Qt::Horizontal - + 40 20 @@ -540,18 +541,18 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat - - + + Continue - - + + Qt::Horizontal - + 40 20 @@ -566,51 +567,51 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat - - - + + + 0 - + 0 - - - + + + - + Use SSL Key - + false - + false - + - + - - + + Key Type: - - + + No Key loaded - - + + Qt::Horizontal - + 40 20 @@ -619,8 +620,8 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat - - + + Load @@ -631,44 +632,44 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat - - + + Use SSL Certificate - - + + 0 - - + + 0 - - + + 8 - - + + Organisation: - - + + No Certificate loaded - - + + Qt::Horizontal - + 40 20 @@ -679,30 +680,30 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat - - + + 8 - - + + CommonName: - - + + No Certificate loaded - - + + Qt::Horizontal - + 40 20 @@ -715,20 +716,20 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat - + - - + + Load - - + + Qt::Vertical - + 20 40 @@ -746,11 +747,11 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat - - + + Qt::Vertical - + 20 40 @@ -764,6 +765,31 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat + + tabWidget + realName + nicknameList + addNick + deleteNick + renameNick + nickUp + nickDown + awayNick + awayReason + detachAwayEnabled + detachAwayReason + autoAwayEnabled + autoAwayTime + autoAwayReasonEnabled + autoAwayReason + ident + kickReason + partReason + quitReason + continueUnsecured + clearOrLoadKeyButton + clearOrLoadCertButton + diff --git a/src/qtui/settingspages/ignorelisteditdlg.ui b/src/qtui/settingspages/ignorelisteditdlg.ui index 990162af..014604f3 100644 --- a/src/qtui/settingspages/ignorelisteditdlg.ui +++ b/src/qtui/settingspages/ignorelisteditdlg.ui @@ -15,7 +15,7 @@ Configure Ignore Rule - + :/icons/oxygen/16x16/actions/configure.png:/icons/oxygen/16x16/actions/configure.png @@ -154,13 +154,13 @@ Whenever you disable/delete the ignore rule, the messages are shown again.</p - + Network - + @@ -228,6 +228,20 @@ For dynamic rules, disabling actually shows the filtered messages again.</p&g + + dynamicStrictnessButton + permanentStrictnessButton + senderTypeButton + messageTypeButton + ignoreRuleLineEdit + isRegExCheckBox + scopeRuleTextEdit + globalScopeButton + networkScopeButton + channelScopeButton + isActiveCheckBox + buttonBox + diff --git a/src/qtui/settingspages/inputwidgetsettingspage.ui b/src/qtui/settingspages/inputwidgetsettingspage.ui index d7b998ce..c1ceb123 100644 --- a/src/qtui/settingspages/inputwidgetsettingspage.ui +++ b/src/qtui/settingspages/inputwidgetsettingspage.ui @@ -236,6 +236,7 @@ customFont enableSpellCheck showNickSelector + groupBox maxNumLines enableScrollBars completionSuffix diff --git a/src/qtui/settingspages/itemviewsettingspage.ui b/src/qtui/settingspages/itemviewsettingspage.ui index c2649dcd..b1088be1 100644 --- a/src/qtui/settingspages/itemviewsettingspage.ui +++ b/src/qtui/settingspages/itemviewsettingspage.ui @@ -411,10 +411,10 @@ unreadBufferColor highlightedBufferColor activeBufferColor + bufferViewPreview useNickViewColors onlineNickColor awayNickColor - bufferViewPreview diff --git a/src/qtui/settingspages/networkadddlg.ui b/src/qtui/settingspages/networkadddlg.ui index 58ff11f7..a04492e2 100644 --- a/src/qtui/settingspages/networkadddlg.ui +++ b/src/qtui/settingspages/networkadddlg.ui @@ -1,7 +1,8 @@ - + + NetworkAddDlg - - + + 0 0 @@ -9,26 +10,26 @@ 275 - + Add Network - + - + - - + + Use preset: - + true - - - + + + 0 0 @@ -36,11 +37,11 @@ - - + + Qt::Horizontal - + 40 20 @@ -51,73 +52,73 @@ - - + + Manually specify network settings - - + + false - + Manual Settings - + - - - - + + + + Network name: - - + + - - - + + + Server address: - - + + - - - + + + Port: - - - + + + 0 - + 65535 - + 6667 - - - + + + Server password: - - - + + + QLineEdit::Password @@ -125,8 +126,8 @@ - - + + Use secure connection @@ -135,11 +136,11 @@ - - + + Qt::Vertical - + 20 31 @@ -148,17 +149,28 @@ - - + + Qt::Horizontal - + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + usePreset + presetList + useManual + networkName + serverAddress + port + serverPassword + useSSL + buttonBox + @@ -167,11 +179,11 @@ NetworkAddDlg accept() - + 248 254 - + 157 274 @@ -183,11 +195,11 @@ NetworkAddDlg reject() - + 316 260 - + 286 274 @@ -199,11 +211,11 @@ presetList setEnabled(bool) - + 53 18 - + 132 17 @@ -215,11 +227,11 @@ groupBox setEnabled(bool) - + 46 47 - + 59 84 @@ -231,11 +243,11 @@ networkName setFocus() - + 26 45 - + 153 113 diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui index cf7274c9..a86dfe09 100644 --- a/src/qtui/settingspages/networkssettingspage.ui +++ b/src/qtui/settingspages/networkssettingspage.ui @@ -1,7 +1,8 @@ - + + NetworksSettingsPage - - + + 0 0 @@ -9,65 +10,65 @@ 453 - + Form - + - + - + - - - + + + 1 10 - + QAbstractItemView::SelectRows - + true - + - - - + + + 0 0 - + Re&name... - + :/16x16/actions/oxygen/16x16/actions/edit-rename.png:/16x16/actions/oxygen/16x16/actions/edit-rename.png - - - + + + 0 0 - + &Add... - + :/16x16/actions/oxygen/16x16/actions/list-add.png:/16x16/actions/oxygen/16x16/actions/list-add.png - + 16 16 @@ -76,28 +77,28 @@ - - - + + + 0 0 - + De&lete - + :/16x16/actions/oxygen/16x16/actions/edit-delete.png:/16x16/actions/oxygen/16x16/actions/edit-delete.png - - + + Qt::Vertical - + 20 40 @@ -112,30 +113,30 @@ - - - + + + 10 0 - + Network Details - + - + - - + + Identity: - - - + + + 0 0 @@ -143,18 +144,18 @@ - - + + ... - - + + Qt::Horizontal - + 40 20 @@ -165,37 +166,37 @@ - - + + true - - + + 0 0 - + - - 0 + + 4 - - + + true - + Servers - + Manage servers for this network - + - - - + + + 1 0 @@ -203,19 +204,19 @@ - + - - - + + + 0 0 - + &Edit... - + @@ -223,47 +224,47 @@ - - - + + + 0 0 - + &Add... - + :/16x16/actions/oxygen/16x16/actions/list-add.png:/16x16/actions/oxygen/16x16/actions/list-add.png - - - + + + 0 0 - + De&lete - + :/16x16/actions/oxygen/16x16/actions/edit-delete.png:/16x16/actions/oxygen/16x16/actions/edit-delete.png - + - + Qt::Horizontal - + 0 20 @@ -272,28 +273,28 @@ - - + + Move upwards in list - + ... - + :/16x16/actions/oxygen/16x16/actions/go-up.png:/16x16/actions/oxygen/16x16/actions/go-up.png - - + + Move downwards in list - + ... - + :/16x16/actions/oxygen/16x16/actions/go-down.png:/16x16/actions/oxygen/16x16/actions/go-down.png @@ -301,10 +302,10 @@ - + Qt::Horizontal - + 0 20 @@ -316,10 +317,10 @@ - + Qt::Vertical - + 20 40 @@ -331,121 +332,121 @@ - - + + Commands - + Configure automatic identification or misc. commands to be executed after connecting to a server - + - - + + Commands to execute on connect: - - + + true - - + + 0 0 - + Specify a list of IRC commands to be executed upon connect. Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here! - + QTextEdit::NoWrap - - + + Connection - + - - + + true - + Control automatic reconnect to the network - + Automatic Reconnect - + true - + - - - - + + + + Interval: - - - + + + s - + 10 - + 3600 - + 30 - - - + + + Retries: - - - + + + 1 - + 999 - + 10 - - - + + + Unlimited - - - + + + Qt::Horizontal - + 40 20 @@ -456,14 +457,14 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne - - + + true - + Rejoin all channels on reconnect - + true @@ -472,11 +473,11 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne - - + + Qt::Vertical - + 20 79 @@ -486,59 +487,59 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne - - + + Auto Identify - + - - + + true - + Auto Identify - + true - + true - - - - + + + + true - + NickServ - - - + + + true - + QLineEdit::Password - - - + + + Service: - - - + + + true - + Password: @@ -547,11 +548,11 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne - - + + Qt::Vertical - + 20 40 @@ -561,110 +562,110 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne - - + + Encodings - + Configure advanced settings such as message encodings and automatic reconnect - + - - + + true - + Control encodings for in- and outgoing messages - + Use Custom Encodings - + true - + - - - - + + + + Specify which encoding your messages will be sent in. UTF-8 should be a sane choice for most networks. - + Send messages in: - - - + + + true - - + + 0 0 - + Specify which encoding your messages will be sent in. UTF-8 should be a sane choice for most networks. - + QComboBox::InsertAlphabetically - - - + + + Incoming messages encoded in Utf8 will always be treated as such. This setting defines the encoding for messages that are not Utf8. - + Receive fallback: - - - + + + true - - + + 0 0 - + Incoming messages encoded in Utf8 will always be treated as such. This setting defines the encoding for messages that are not Utf8. - + QComboBox::InsertAlphabetically - - - + + + This specifies how control messages, nicks and servernames are encoded. Unless you *really* know what you do, leave this as ISO-8859-1! - + Server encoding: - - - + + + true - + This specifies how control messages, nicks and servernames are encoded. Unless you *really* know what you do, leave this as ISO-8859-1! @@ -676,11 +677,11 @@ Unless you *really* know what you do, leave this as ISO-8859-1! - - + + Qt::Vertical - + 20 79 @@ -697,6 +698,34 @@ Unless you *really* know what you do, leave this as ISO-8859-1! + + networkList + renameNetwork + addNetwork + deleteNetwork + identityList + editIdentities + tabWidget + serverList + editServer + addServer + deleteServer + upServer + downServer + performEdit + autoReconnect + reconnectInterval + reconnectRetries + unlimitedRetries + rejoinOnReconnect + autoIdentify + autoIdentifyService + autoIdentifyPassword + useCustomEncodings + sendEncoding + recvEncoding + serverEncoding + @@ -705,11 +734,11 @@ Unless you *really* know what you do, leave this as ISO-8859-1! reconnectRetries setDisabled(bool) - + 173 296 - + 118 294 diff --git a/src/qtui/settingspages/servereditdlg.ui b/src/qtui/settingspages/servereditdlg.ui index ec5f0ff7..da9f7a5a 100644 --- a/src/qtui/settingspages/servereditdlg.ui +++ b/src/qtui/settingspages/servereditdlg.ui @@ -1,7 +1,8 @@ - + + ServerEditDlg - - + + 0 0 @@ -9,62 +10,54 @@ 346 - + Dialog - + - - + + - + 0 - + false - - - - 0 - 0 - 356 - 243 - - - + + Server Info - + - - - - + + + + Server address: - - - + + + Port: - - + + - - - + + + 1 - + 65535 - + 6667 @@ -72,20 +65,20 @@ - + - - + + Password: - - + + true - + QLineEdit::Password @@ -93,25 +86,25 @@ - - + + true - + Use SSL - + :/16x16/actions/oxygen/16x16/actions/document-encrypt.png:/16x16/actions/oxygen/16x16/actions/document-encrypt.png - - + + Qt::Vertical - + 20 40 @@ -121,27 +114,19 @@ - - - - 0 - 0 - 356 - 243 - - - + + Advanced - + - + - - + + Qt::Horizontal - + 40 20 @@ -150,29 +135,29 @@ - - + + SSL Version: - - + + Do not change unless you're going to connect to a server not supporting SSLv3! - + SSLv3 (default) - + SSLv2 - + TLSv1 @@ -181,38 +166,38 @@ - - + + Use a Proxy - + false - + true - + false - + - + - - + + Proxy Type: - + - + Socks 5 - + HTTP @@ -221,37 +206,37 @@ - + - - + + Proxy Host: - - + + localhost - - + + Port: - - + + 1 - + 65535 - + 8080 @@ -259,27 +244,27 @@ - - - - + + + + Proxy Username: - - + + - - - + + + Proxy Password: - - - + + + QLineEdit::Password @@ -294,11 +279,11 @@ - - + + Qt::Vertical - + 20 17 @@ -307,17 +292,32 @@ - - + + Qt::Horizontal - + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + tabWidget + host + port + password + useSSL + sslVersion + useProxy + proxyType + proxyHost + proxyPort + proxyUsername + proxyPassword + buttonBox + @@ -326,11 +326,11 @@ ServerEditDlg accept() - + 248 254 - + 157 274 @@ -342,11 +342,11 @@ ServerEditDlg reject() - + 316 260 - + 286 274 diff --git a/src/qtui/settingspages/topicwidgetsettingspage.ui b/src/qtui/settingspages/topicwidgetsettingspage.ui index 4282f65c..c4de886c 100644 --- a/src/qtui/settingspages/topicwidgetsettingspage.ui +++ b/src/qtui/settingspages/topicwidgetsettingspage.ui @@ -119,6 +119,11 @@ 1 + + customFont + dynamicResize + resizeOnHover + -- 2.20.1