From be5b9feef292531c3b92f9f115bd5a55f436bc97 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Wed, 12 Aug 2009 20:50:29 +0200 Subject: [PATCH] s/Buffer/Chat/g This removes the mention of "Buffer" from the UI, as it was confuzzling users and making our Usability Queen unhappy. It has been replaced by "Chat", which might not always be as precise, but should make more sense for users. A "Buffer View" is now a "Chat List", and in some cases, "Window" has been used (e.g. the "Status Buffer" is now a "Status Window" - which, again, isn't really the correct term, but probably makes more sense to people not used to cli-based chat clients. Obviously, within the code and the DB everything is still a Buffer (and it'll stay that way). --- src/client/client.cpp | 2 +- src/client/networkmodel.cpp | 2 +- src/qtui/mainwin.cpp | 6 +- src/qtui/settingspages/backlogsettingspage.ui | 18 +- src/qtui/settingspages/buffervieweditdlg.ui | 41 ++--- .../settingspages/bufferviewsettingspage.cpp | 8 +- .../settingspages/bufferviewsettingspage.ui | 162 +++++++++--------- .../settingspages/chatmonitorsettingspage.ui | 99 +++++------ src/qtui/settingspages/generalsettingspage.ui | 4 +- src/qtui/ui/bufferviewwidget.ui | 34 ++-- 10 files changed, 188 insertions(+), 188 deletions(-) diff --git a/src/client/client.cpp b/src/client/client.cpp index c25f1939..e6f7f05a 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -359,7 +359,7 @@ void Client::requestInitialBacklog() { void Client::createDefaultBufferView() { if(bufferViewManager()->bufferViewConfigs().isEmpty()) { BufferViewConfig config(-1); - config.setBufferViewName(tr("All Buffers")); + config.setBufferViewName(tr("All Chats")); config.initSetBufferList(networkModel()->allBufferIdsSorted()); bufferViewManager()->requestCreateBufferView(config.toVariantMap()); } diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 87801d42..fbf84c4f 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -827,7 +827,7 @@ NetworkModel::NetworkModel(QObject *parent) QListNetworkModel::defaultHeader() { QList data; - data << tr("Buffer") << tr("Topic") << tr("Nick Count"); + data << tr("Chat") << tr("Topic") << tr("Nick Count"); return data; } diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index ea94561d..59ad97fa 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -287,7 +287,7 @@ void MainWin::setupActions() { this, SLOT(quit()), tr("Ctrl+Q"))); // View - coll->addAction("ConfigureBufferViews", new Action(tr("&Configure Buffer Views..."), coll, + coll->addAction("ConfigureBufferViews", new Action(tr("&Configure Chat Lists..."), coll, this, SLOT(on_actionConfigureViews_triggered()))); QAction *lockAct = coll->addAction("LockLayout", new Action(tr("&Lock Layout"), coll)); @@ -324,7 +324,7 @@ void MainWin::setupActions() { QtUi::style(), SLOT(reload()), QKeySequence::Refresh)); // Navigation - coll->addAction("JumpHotBuffer", new Action(tr("Jump to hot buffer"), coll, + coll->addAction("JumpHotBuffer", new Action(tr("Jump to hot chat"), coll, this, SLOT(on_jumpHotBuffer_triggered()), QKeySequence(Qt::META + Qt::Key_A))); } @@ -351,7 +351,7 @@ void MainWin::setupMenus() { _fileMenu->addAction(coll->action("Quit")); _viewMenu = menuBar()->addMenu(tr("&View")); - _bufferViewsMenu = _viewMenu->addMenu(tr("&Buffer Views")); + _bufferViewsMenu = _viewMenu->addMenu(tr("&Chat Lists")); _bufferViewsMenu->addAction(coll->action("ConfigureBufferViews")); _toolbarMenu = _viewMenu->addMenu(tr("&Toolbars")); _viewMenu->addSeparator(); diff --git a/src/qtui/settingspages/backlogsettingspage.ui b/src/qtui/settingspages/backlogsettingspage.ui index f50e6c59..56e9cc20 100644 --- a/src/qtui/settingspages/backlogsettingspage.ui +++ b/src/qtui/settingspages/backlogsettingspage.ui @@ -72,7 +72,7 @@ - Backlog Request Method: + Backlog request method: @@ -80,17 +80,17 @@ - Fixed Amount per Buffer + Fixed amount per chat - Unread Messages per Buffer + Unread messages per chat - Global Unread Messages + Globally unread messages @@ -120,7 +120,7 @@ - The simplest Requester. It fetches a fixed amount of lines for each buffer from the Backlog. + The simplest requester. It fetches a fixed amount of lines for each chat window from the backlog. Qt::PlainText @@ -196,7 +196,7 @@ - This requester fetches unread messages for each buffer individually. The amount of lines can be limited per buffer. + This requester fetches unread messages for each chat window individually. The amount of lines can be limited per chat. You can also choose to fetch additional older chatlines to provide a better context. @@ -309,12 +309,12 @@ You can also choose to fetch additional older chatlines to provide a better cont - This requester fetches all messages newer than the oldest unread message for all buffers. + This requester fetches all messages newer than the oldest unread message for all chats. -Note: this requester is not recommended if you use hidden buffer or have inactive buffers (i.e.: no stale queries or channels). +Note: This requester is not recommended if you use hidden chat windows or have inactive chats (i.e.: no stale queries or channels). It is useful to limit the total amount of the backlog and is probably the fastest. -You can also chose to fetch additional older chatlines to provide a better context similar. +You can also chose to fetch additional older chatlines to provide a better context. Qt::PlainText diff --git a/src/qtui/settingspages/buffervieweditdlg.ui b/src/qtui/settingspages/buffervieweditdlg.ui index 3237df83..5f610a88 100644 --- a/src/qtui/settingspages/buffervieweditdlg.ui +++ b/src/qtui/settingspages/buffervieweditdlg.ui @@ -1,7 +1,8 @@ - + + BufferViewEditDlg - - + + 0 0 @@ -9,28 +10,28 @@ 131 - + Dialog - + - + - - - Please enter a name for the buffer view: + + + Please enter a name for the chat list: - + - + Qt::Vertical - + 20 40 @@ -39,12 +40,12 @@ - - + + Qt::Horizontal - - QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -60,11 +61,11 @@ BufferViewEditDlg accept() - + 248 254 - + 157 274 @@ -76,11 +77,11 @@ BufferViewEditDlg reject() - + 316 260 - + 286 274 diff --git a/src/qtui/settingspages/bufferviewsettingspage.cpp b/src/qtui/settingspages/bufferviewsettingspage.cpp index c23e6af7..7c32403e 100644 --- a/src/qtui/settingspages/bufferviewsettingspage.cpp +++ b/src/qtui/settingspages/bufferviewsettingspage.cpp @@ -33,7 +33,7 @@ #include "util.h" BufferViewSettingsPage::BufferViewSettingsPage(QWidget *parent) - : SettingsPage(tr("Appearance"), tr("Buffer Views"), parent), + : SettingsPage(tr("Misc"), tr("Custom Chat Lists"), parent), _ignoreWidgetChanges(false), _useBufferViewHint(false), _bufferViewHint(0) @@ -339,8 +339,8 @@ void BufferViewSettingsPage::on_deleteBufferView_clicked() { QListWidgetItem *currentItem = ui.bufferViewList->item(ui.bufferViewList->currentRow()); QString viewName = currentItem->text(); int viewId = bufferView(ui.bufferViewList->currentRow())->bufferViewId(); - int ret = QMessageBox::question(this, tr("Delete Buffer View?"), - tr("Do you really want to delete the buffer view \"%1\"?").arg(viewName), + int ret = QMessageBox::question(this, tr("Delete Chat List?"), + tr("Do you really want to delete the chat list \"%1\"?").arg(viewName), QMessageBox::Yes|QMessageBox::No, QMessageBox::No); if(ret == QMessageBox::Yes) { @@ -517,7 +517,7 @@ BufferViewEditDlg::BufferViewEditDlg(const QString &old, const QStringList &exis if(old.isEmpty()) { // new buffer - setWindowTitle(tr("Add Buffer View")); + setWindowTitle(tr("Add Chat List")); on_bufferViewEdit_textChanged(""); // disable ok button } else { ui.bufferViewEdit->setText(old); diff --git a/src/qtui/settingspages/bufferviewsettingspage.ui b/src/qtui/settingspages/bufferviewsettingspage.ui index a7e5d3d8..8ad2beef 100644 --- a/src/qtui/settingspages/bufferviewsettingspage.ui +++ b/src/qtui/settingspages/bufferviewsettingspage.ui @@ -1,7 +1,8 @@ - + + BufferViewSettingsPage - - + + 0 0 @@ -9,48 +10,48 @@ 529 - + Form - + - + - + - - - + + + 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 @@ -59,17 +60,17 @@ - - - + + + 0 0 - + De&lete - + :/16x16/actions/oxygen/16x16/actions/edit-delete.png:/16x16/actions/oxygen/16x16/actions/edit-delete.png @@ -78,24 +79,24 @@ - - - Buffer View Settings + + + Chat List Settings - + - + - - + + Network: - + - + All @@ -104,86 +105,77 @@ - - - Restrict Buffers to: - - - - - - This option is not available when all Networks are visible. + + + This option is not available when all Networks are visible. In this mode no separate status buffer is displayed. - - - Status Buffers - - - - - - - Channel Buffers - - - - - - - Query Buffers - - - - + + + Show status window + - - - Hide inactive Buffers + + + Show channels - - - Add new Buffers automatically + + + Show queries - - + + + Hide inactive chats + + + + + + + Add new chats automatically + + + + + + Sort alphabetically - - + + Minimum Activity: - + - + No Activity - + Other Activity - + New Message - + Highlight @@ -191,10 +183,10 @@ In this mode no separate status buffer is displayed. - + Qt::Vertical - + 20 40 @@ -206,16 +198,20 @@ In this mode no separate status buffer is displayed. - + - - + + Preview: - + + + true + + diff --git a/src/qtui/settingspages/chatmonitorsettingspage.ui b/src/qtui/settingspages/chatmonitorsettingspage.ui index bd892709..cec87941 100644 --- a/src/qtui/settingspages/chatmonitorsettingspage.ui +++ b/src/qtui/settingspages/chatmonitorsettingspage.ui @@ -1,7 +1,8 @@ - + + ChatMonitorSettingsPage - - + + 0 0 @@ -9,38 +10,38 @@ 444 - + Form - + - + - - + + Operation Mode: - - - <!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"> + + + <!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:'DejaVu Sans'; font-size:9pt; 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;"><span style=" font-weight:600;">Operation modes:</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"><span style=" font-weight:400; text-decoration: underline;">Opt-In:</span> <span style=" font-weight:400;">Only buffers on the right side are shown in chatmonitor</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Opt-Out:</span> Buffers on the right side will be ignored in chatmonitor</p></body></html> +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; 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;"><span style=" font-weight:600;">Operation modes:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"><span style=" font-weight:400; text-decoration: underline;">Opt-In:</span> <span style=" font-weight:400;">Only buffers on the right side are shown in chatmonitor</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Opt-Out:</span> Buffers on the right side will be ignored in chatmonitor</p></body></html> - - + + Qt::Horizontal - + 40 20 @@ -51,29 +52,29 @@ p, li { white-space: pre-wrap; } - + - + - - - Available Buffers: + + + Available: - + - + - - + + Qt::Vertical - + 20 40 @@ -82,39 +83,39 @@ p, li { white-space: pre-wrap; } - - + + Move selected buffers to the left - + - + :/16x16/actions/oxygen/16x16/actions/go-previous.png:/16x16/actions/oxygen/16x16/actions/go-previous.png - - + + Move selected buffers to the right - + - + :/16x16/actions/oxygen/16x16/actions/go-next.png:/16x16/actions/oxygen/16x16/actions/go-next.png - - + + Qt::Vertical - + 20 40 @@ -125,34 +126,34 @@ p, li { white-space: pre-wrap; } - + - - + + Show: - + - - + + Show highlights in chatmonitor even if the originating buffer is ignored - + Always show highlighted messages - - + + Show own messages diff --git a/src/qtui/settingspages/generalsettingspage.ui b/src/qtui/settingspages/generalsettingspage.ui index 41931dcb..cca69d40 100644 --- a/src/qtui/settingspages/generalsettingspage.ui +++ b/src/qtui/settingspages/generalsettingspage.ui @@ -125,14 +125,14 @@ - Status Buffer + Status Window - Current Buffer + Current Chat diff --git a/src/qtui/ui/bufferviewwidget.ui b/src/qtui/ui/bufferviewwidget.ui index c1efab78..db6a062a 100644 --- a/src/qtui/ui/bufferviewwidget.ui +++ b/src/qtui/ui/bufferviewwidget.ui @@ -1,7 +1,8 @@ - + + BufferViewWidget - - + + 0 0 @@ -9,33 +10,34 @@ 183 - - - 5 - 5 + + 0 0 - + 100 100 - + BufferView - - - 4 - - + + 0 + + 4 + - - + + + true + + true -- 2.20.1